From 8816a3157d04888a6494290e13398117940295c6 Mon Sep 17 00:00:00 2001 From: Tad Hardesty Date: Wed, 11 Apr 2018 03:14:39 -0700 Subject: [PATCH 1/2] Fix double-fullstop in the jukebox's description (#37088) --- code/game/machinery/dance_machine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 64eaa3db2cb1..3f5c2078f749 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -1,6 +1,6 @@ /obj/machinery/jukebox name = "jukebox" - desc = "A classic music player.." + desc = "A classic music player." icon = 'icons/obj/stationobjs.dmi' icon_state = "jukebox" anchored = TRUE From 1aab02d1f320eff6b22143767bfa3cf694277074 Mon Sep 17 00:00:00 2001 From: Grandmother of 50 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com> Date: Wed, 11 Apr 2018 06:15:55 -0400 Subject: [PATCH 2/2] Provides more control over uplink surplus chances. (#36983) Cant wait for the epic balance prs that people will fight in --- code/modules/cargo/packs.dm | 3 +-- code/modules/uplink/uplink_items.dm | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 30a14873423f..35edf7282c0a 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -159,8 +159,7 @@ var/category = pick(uplink_items) var/item = pick(uplink_items[category]) var/datum/uplink_item/I = uplink_items[category][item] - - if(!I.surplus || prob(100 - I.surplus)) + if(!I.surplus_nullcrates || prob(100 - I.surplus_nullcrates)) continue if(crate_value < I.cost) continue diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 1607fcc969f3..fe39f38883ca 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -64,6 +64,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) var/refund_amount = 0 // specified refund amount in case there needs to be a TC penalty for refunds. var/refundable = FALSE var/surplus = 100 // Chance of being included in the surplus crate. + var/surplus_nullcrates //Chance of being included in null crates. null = pull from surplus var/cant_discount = FALSE var/limited_stock = -1 //Setting this above zero limits how many times this item can be bought by the same traitor in a round, -1 is unlimited var/list/include_modes = list() // Game modes to allow this item in. @@ -72,6 +73,11 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) var/player_minimum //The minimum crew size needed for this item to be added to uplinks. var/purchase_log_vis = TRUE // Visible in the purchase log? +/datum/uplink_item/New() + . = ..() + if(isnull(surplus_nullcrates)) + surplus_nullcrates = surplus + /datum/uplink_item/proc/get_discount() return pick(4;0.75,2;0.5,1;0.25)