From 3559a77d0f56a1a6e3557f4b7ff863b03aa424ad Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 19 Mar 2019 04:35:03 -0700 Subject: [PATCH 01/35] Uplink improvements --- code/datums/uplink_item.dm | 25 +++++++++++++------ .../effects/spawners/random_spawners.dm | 2 +- code/game/objects/items/devices/uplinks.dm | 7 ++++-- .../items/weapons/storage/uplink_kits.dm | 19 +++++++++++--- nano/templates/uplink.tmpl | 2 +- 5 files changed, 39 insertions(+), 16 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index a22bdd371a6..e745ceaa0ba 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -90,7 +90,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) if(hijack_only) if(!(locate(/datum/objective/hijack) in usr.mind.objectives)) - to_chat(usr, "The Syndicate lacks resources to provide you with this item.") + to_chat(usr, "The Syndicate will only issue this extremely dangerous item to agents assigned the Hijack objective.") return if(item) @@ -910,7 +910,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) You can wrench the bomb down to prevent removal. The crew may attempt to defuse the bomb." reference = "SB" item = /obj/item/radio/beacon/syndicate/bomb - cost = 11 + hijack_only = TRUE + cost = 10 /datum/uplink_item/explosives/syndicate_minibomb name = "Syndicate Minibomb" @@ -960,12 +961,20 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) gamemodes = list(/datum/game_mode/nuclear) surplus = 0 -/datum/uplink_item/explosives/atmosgrenades - name = "Atmos Grenades" - desc = "A box of two (2) grenades that wreak havoc with the atmosphere of the target area. Capable of engulfing a large area in lit plasma, or N2O. Deploy with extreme caution!" - reference = "AGG" - item = /obj/item/storage/box/syndie_kit/atmosgasgrenades - cost = 11 +/datum/uplink_item/explosives/atmosn2ogrenades + name = "Knockout Gas Grenades" + desc = "A box of two (2) grenades that spread knockout gas over a large area. Equip internals before using one of these." + reference = "ANG" + item = /obj/item/storage/box/syndie_kit/atmosn2ogrenades + cost = 8 + +/datum/uplink_item/explosives/atmosfiregrenades + name = "Plasma Fire Grenades" + desc = "A box of two (2) grenades that cause large plasma fires. Can be used to deny access to a large area. Most useful if you have an atmospherics hardsuit." + reference = "APG" + item = /obj/item/storage/box/syndie_kit/atmosfiregrenades + hijack_only = TRUE + cost = 12 surplus = 0 /datum/uplink_item/explosives/emp diff --git a/code/game/objects/effects/spawners/random_spawners.dm b/code/game/objects/effects/spawners/random_spawners.dm index 18392256fb8..510e5b90380 100644 --- a/code/game/objects/effects/spawners/random_spawners.dm +++ b/code/game/objects/effects/spawners/random_spawners.dm @@ -279,7 +279,7 @@ /obj/item/clothing/glasses/thermal = 1, /obj/item/chameleon = 1, /obj/item/reagent_containers/hypospray/autoinjector/stimulants = 1, - /obj/item/storage/box/syndie_kit/atmosgasgrenades = 1, + /obj/item/storage/box/syndie_kit/atmosn2ogrenades = 1, /obj/item/grenade/plastic/x4 = 1) diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 247b5fb1a0d..1a6a881942d 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -72,7 +72,10 @@ var/list/world_uplinks = list() if(I.job && I.job.len) if(!(I.job.Find(job))) continue - dat += "[I.name] ([I.cost])
" + dat += "[I.name] ([I.cost])" + if(I.hijack_only) + dat += " (HIJACK ONLY)" + dat += "
" category_items++ dat += "Random Item (??)
" @@ -95,7 +98,7 @@ var/list/world_uplinks = list() if(I.job && I.job.len) if(!(I.job.Find(job))) continue - nano[nano.len]["items"] += list(list("Name" = sanitize(I.name), "Description" = sanitize(I.description()),"Cost" = I.cost, "obj_path" = I.reference)) + nano[nano.len]["items"] += list(list("Name" = sanitize(I.name), "Description" = sanitize(I.description()),"Cost" = I.cost, "hijack_only" = I.hijack_only, "obj_path" = I.reference)) reference[I.reference] = I var/datum/nano_item_lists/result = new diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index cac42bfced7..c96271d6ddd 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -262,13 +262,24 @@ new /obj/item/spellbook/oneuse/mime/greaterwall(src) new /obj/item/spellbook/oneuse/mime/fingergun(src) -/obj/item/storage/box/syndie_kit/atmosgasgrenades - name = "Atmos Grenades" -/obj/item/storage/box/syndie_kit/atmosgasgrenades/New() +/obj/item/storage/box/syndie_kit/atmosn2ogrenades + name = "Atmos N2O Grenades" + +/obj/item/storage/box/syndie_kit/atmosn2ogrenades/New() + ..() + new /obj/item/grenade/clusterbuster/n2o(src) + new /obj/item/grenade/clusterbuster/n2o(src) + + +/obj/item/storage/box/syndie_kit/atmosfiregrenades + name = "Plasma Fire Grenades" + +/obj/item/storage/box/syndie_kit/atmosfiregrenades/New() ..() new /obj/item/grenade/clusterbuster/plasma(src) - new /obj/item/grenade/clusterbuster/n2o(src) + new /obj/item/grenade/clusterbuster/plasma(src) + /obj/item/storage/box/syndie_kit/missionary_set name = "Missionary Starter Kit" diff --git a/nano/templates/uplink.tmpl b/nano/templates/uplink.tmpl index c67dbca9c61..3058bb10bbb 100644 --- a/nano/templates/uplink.tmpl +++ b/nano/templates/uplink.tmpl @@ -46,7 +46,7 @@ Used In File(s): \code\game\objects\items\devices\uplinks.dm {{for value.items :itemValue:itemIndex}}
- {{:helper.link( itemValue.Name, 'gear', {'buy_item' : itemValue.obj_path, 'cost' : itemValue.Cost}, itemValue.Cost > data.crystals ? 'disabled' : null, null)}} - {{:itemValue.Cost}} + {{:helper.link( itemValue.Name, 'gear', {'buy_item' : itemValue.obj_path, 'cost' : itemValue.Cost}, itemValue.Cost > data.crystals ? 'disabled' : null, null)}} - {{:itemValue.Cost}} {{if itemValue.hijack_only}}(HIJACK AGENTS ONLY){{/if}}
{{/for}} From 5db5b3055b5bdce2158a73b051573f2cbfff6b2c Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 19 Mar 2019 06:00:00 -0700 Subject: [PATCH 02/35] made hijack_only bomb/firegren nosurplus/nodiscount --- code/datums/uplink_item.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index e745ceaa0ba..a35dccd7b25 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -912,6 +912,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) item = /obj/item/radio/beacon/syndicate/bomb hijack_only = TRUE cost = 10 + surplus = 0 + cant_discount = TRUE /datum/uplink_item/explosives/syndicate_minibomb name = "Syndicate Minibomb" @@ -976,6 +978,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) hijack_only = TRUE cost = 12 surplus = 0 + cant_discount = TRUE /datum/uplink_item/explosives/emp name = "EMP Grenades and Implanter Kit" From b4ee075b398c8c6aaf75a8589bcd4a8dba655dd3 Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 19 Mar 2019 09:48:34 -0700 Subject: [PATCH 03/35] makes syndi bomb not hijack only again --- code/datums/uplink_item.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index a35dccd7b25..787ac5e4463 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -910,7 +910,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) You can wrench the bomb down to prevent removal. The crew may attempt to defuse the bomb." reference = "SB" item = /obj/item/radio/beacon/syndicate/bomb - hijack_only = TRUE cost = 10 surplus = 0 cant_discount = TRUE From 04f780fc4eca8903658dd37071d786740ff4a12f Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 19 Mar 2019 09:50:09 -0700 Subject: [PATCH 04/35] cost --- code/datums/uplink_item.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 787ac5e4463..2f8c41dd379 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -910,7 +910,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) You can wrench the bomb down to prevent removal. The crew may attempt to defuse the bomb." reference = "SB" item = /obj/item/radio/beacon/syndicate/bomb - cost = 10 + cost = 11 surplus = 0 cant_discount = TRUE From 1e388140e7011ab848ef88b5a16c77ee924a72d7 Mon Sep 17 00:00:00 2001 From: Dovixx Date: Tue, 26 Mar 2019 18:59:53 +0200 Subject: [PATCH 05/35] Change it --- code/game/objects/structures/statues.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index 88adc9643ba..6f531f5c14c 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -256,18 +256,18 @@ /obj/structure/statue/diamond hardness = 10 material_drop_type = /obj/item/stack/sheet/mineral/diamond - desc = "This is a very expensive diamond statue" + desc = "This is a very expensive diamond statue." /obj/structure/statue/diamond/captain - name = "statue of THE captain." + name = "statue of THE captain" icon_state = "cap" /obj/structure/statue/diamond/ai1 - name = "statue of the AI hologram." + name = "statue of the AI hologram" icon_state = "ai1" /obj/structure/statue/diamond/ai2 - name = "statue of the AI core." + name = "statue of the AI core" icon_state = "ai2" /obj/structure/statue/bananium From d52f4c188197d9aa56998e019c6894272e8d37f2 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Wed, 27 Mar 2019 12:11:29 +0100 Subject: [PATCH 06/35] Cloners now only clone a person once max --- code/game/machinery/computer/cloning.dm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index c134747cd41..7b9f74edbd6 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -36,12 +36,25 @@ if(scanner.occupant && can_autoprocess()) scan_mob(scanner.occupant) - + + if(!length(records)) + return + var/list/toClone = records.Copy() + var/datum/dna2/record/lastEntry = toClone[length(toClone)] // Most recently added record + // Prevent double cloning + for(var/obj/machinery/clonepod/pod in pods) + if(pod.occupant) + for(var/datum/soullink/soulhook/hook in pod.sharedSoulhooks) //Check the soul hooks to see if the to be cloned person is in here + if(hook.soulowner.ckey == lastEntry.ckey) + toClone.Remove(lastEntry) // Fucker is getting cloned. No two bodies greedy shit + break + for(var/obj/machinery/clonepod/pod in pods) if(!(pod.occupant || pod.mess) && (pod.efficiency > 5)) - for(var/datum/dna2/record/R in src.records) + for(var/datum/dna2/record/R in toClone) if(!(pod.occupant || pod.mess)) if(pod.growclone(R)) + toClone.Remove(R) records.Remove(R) /obj/machinery/computer/cloning/proc/updatemodules() From 82096b5338621d657edfba8cd8d430b8a164b256 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Wed, 27 Mar 2019 12:23:12 +0100 Subject: [PATCH 07/35] also supports the directly put in body thing --- code/game/machinery/computer/cloning.dm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 7b9f74edbd6..8c7599a3189 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -44,10 +44,14 @@ // Prevent double cloning for(var/obj/machinery/clonepod/pod in pods) if(pod.occupant) - for(var/datum/soullink/soulhook/hook in pod.sharedSoulhooks) //Check the soul hooks to see if the to be cloned person is in here - if(hook.soulowner.ckey == lastEntry.ckey) - toClone.Remove(lastEntry) // Fucker is getting cloned. No two bodies greedy shit - break + if(pod.occupant.ckey == null) // Uses soulhooks + for(var/datum/soullink/soulhook/hook in pod.sharedSoulhooks) //Check the soul hooks to see if the to be cloned person is in here + if(hook.soulowner.ckey == lastEntry.ckey) + toClone.Remove(lastEntry) // Guy is getting cloned so remove the entry + break + else if(pod.occupant.ckey == lastEntry.ckey) // Directly put in body + toClone.Remove(lastEntry) // Guy is getting cloned so remove the entry + break for(var/obj/machinery/clonepod/pod in pods) if(!(pod.occupant || pod.mess) && (pod.efficiency > 5)) From 7fabbe4a1ccd6cb948ac7919acf746a55c7f67cc Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Thu, 28 Mar 2019 22:22:51 -0400 Subject: [PATCH 08/35] New Crit Balance Tweaks--Blobs and Stands --- code/game/gamemodes/blob/blobs/blob_mobs.dm | 17 ++++++++++------- .../gamemodes/miniantags/guardian/guardian.dm | 4 ++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm index a96b3e18620..16383256a09 100644 --- a/code/game/gamemodes/blob/blobs/blob_mobs.dm +++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm @@ -65,15 +65,17 @@ /mob/living/simple_animal/hostile/blob/blobspore/Life(seconds, times_fired) if(!is_zombie && isturf(src.loc)) - for(var/mob/living/carbon/human/H in oview(src,1)) //Only for corpse right next to/on same tile - if(H.stat == DEAD) + for(var/mob/living/carbon/human/H in oview(src, 1)) //Only for corpse right next to/on same tile + if(H.stat == DEAD || (!H.check_death_method() && H.health <= HEALTH_THRESHOLD_DEAD)) Zombify(H) break ..() -/mob/living/simple_animal/hostile/blob/blobspore/proc/Zombify(var/mob/living/carbon/human/H) +/mob/living/simple_animal/hostile/blob/blobspore/proc/Zombify(mob/living/carbon/human/H) + if(!H.check_death_method()) + H.death() var/obj/item/organ/external/head/head_organ = H.get_organ("head") - is_zombie = 1 + is_zombie = TRUE if(H.wear_suit) var/obj/item/clothing/suit/armor/A = H.wear_suit if(A.armor && A.armor["melee"]) @@ -87,14 +89,15 @@ icon = H.icon speak_emote = list("groans") icon_state = "zombie2_s" - head_organ.h_style = null + if(head_organ) + head_organ.h_style = null H.update_hair() human_overlays = H.overlays update_icons() - H.loc = src + H.forceMove(src) pressure_resistance = 20 //5 kPa difference required to push lowered throw_pressure_limit = 30 //15 kPa difference required to throw lowered - loc.visible_message("The corpse of [H.name] suddenly rises!") + visible_message("The corpse of [H.name] suddenly rises!") /mob/living/simple_animal/hostile/blob/blobspore/death(gibbed) // Only execute the below if we successfuly died diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm index f339be06b88..cee4d92008a 100644 --- a/code/game/gamemodes/miniantags/guardian/guardian.dm +++ b/code/game/gamemodes/miniantags/guardian/guardian.dm @@ -60,9 +60,9 @@ /mob/living/simple_animal/hostile/guardian/Life(seconds, times_fired) //Dies if the summoner dies ..() if(summoner) - if(summoner.stat == DEAD) + if(summoner.stat == DEAD || (!summoner.check_death_method() && summoner.health <= HEALTH_THRESHOLD_DEAD)) to_chat(src, "Your summoner has died!") - visible_message("The [src] dies along with its user!") + visible_message("[src] dies along with its user!") ghostize() qdel(src) snapback() From 5020c3a162d415d84772416a9d19e7c12eff90be Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Fri, 29 Mar 2019 09:15:48 +0100 Subject: [PATCH 09/35] Check in scan instead --- code/game/machinery/computer/cloning.dm | 29 ++++++++++++------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 8c7599a3189..9aa66bade29 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -39,26 +39,12 @@ if(!length(records)) return - var/list/toClone = records.Copy() - var/datum/dna2/record/lastEntry = toClone[length(toClone)] // Most recently added record - // Prevent double cloning - for(var/obj/machinery/clonepod/pod in pods) - if(pod.occupant) - if(pod.occupant.ckey == null) // Uses soulhooks - for(var/datum/soullink/soulhook/hook in pod.sharedSoulhooks) //Check the soul hooks to see if the to be cloned person is in here - if(hook.soulowner.ckey == lastEntry.ckey) - toClone.Remove(lastEntry) // Guy is getting cloned so remove the entry - break - else if(pod.occupant.ckey == lastEntry.ckey) // Directly put in body - toClone.Remove(lastEntry) // Guy is getting cloned so remove the entry - break for(var/obj/machinery/clonepod/pod in pods) if(!(pod.occupant || pod.mess) && (pod.efficiency > 5)) - for(var/datum/dna2/record/R in toClone) + for(var/datum/dna2/record/R in records) if(!(pod.occupant || pod.mess)) if(pod.growclone(R)) - toClone.Remove(R) records.Remove(R) /obj/machinery/computer/cloning/proc/updatemodules() @@ -409,6 +395,19 @@ SSnanoui.update_uis(src) return + for(var/obj/machinery/clonepod/pod in pods) + if(pod.occupant) + if(pod.occupant.ckey == null) // Uses soulhooks + for(var/datum/soullink/soulhook/hook in pod.sharedSoulhooks) //Check the soul hooks to see if the to be cloned person is in here + if(hook.soulowner.ckey == subject.ckey) + scantemp = "Subject already getting cloned." + SSnanoui.update_uis(src) + return + else if(pod.occupant.ckey == subject.ckey) // Directly put in body + scantemp = "Subject already getting cloned." + SSnanoui.update_uis(src) + return + subject.dna.check_integrity() var/datum/dna2/record/R = new /datum/dna2/record() From a5401b40f114b602260b74d5e14f0dc8a579e886 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sat, 30 Mar 2019 17:30:19 +0100 Subject: [PATCH 10/35] github suggestions --- code/game/machinery/computer/cloning.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 9aa66bade29..7bb4b17930e 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -37,7 +37,7 @@ if(scanner.occupant && can_autoprocess()) scan_mob(scanner.occupant) - if(!length(records)) + if(!LAZYLEN(records)) return for(var/obj/machinery/clonepod/pod in pods) @@ -403,10 +403,6 @@ scantemp = "Subject already getting cloned." SSnanoui.update_uis(src) return - else if(pod.occupant.ckey == subject.ckey) // Directly put in body - scantemp = "Subject already getting cloned." - SSnanoui.update_uis(src) - return subject.dna.check_integrity() From 451253dc5bfc695d58282175e747d8cdd0ffa77d Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sat, 30 Mar 2019 17:31:54 +0100 Subject: [PATCH 11/35] one if --- code/game/machinery/computer/cloning.dm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 7bb4b17930e..cbc3ebe7f67 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -396,13 +396,12 @@ return for(var/obj/machinery/clonepod/pod in pods) - if(pod.occupant) - if(pod.occupant.ckey == null) // Uses soulhooks - for(var/datum/soullink/soulhook/hook in pod.sharedSoulhooks) //Check the soul hooks to see if the to be cloned person is in here - if(hook.soulowner.ckey == subject.ckey) - scantemp = "Subject already getting cloned." - SSnanoui.update_uis(src) - return + if(pod.occupant && pod.occupant.ckey == null) + for(var/datum/soullink/soulhook/hook in pod.sharedSoulhooks) //Check the soul hooks to see if the to be cloned person is in here + if(hook.soulowner.ckey == subject.ckey) + scantemp = "Subject already getting cloned." + SSnanoui.update_uis(src) + return subject.dna.check_integrity() From f65bfef89ecad0cf5319370388edc57acf7ef3be Mon Sep 17 00:00:00 2001 From: Twinmold Date: Sun, 31 Mar 2019 16:45:43 -0500 Subject: [PATCH 12/35] Fixes Sending Faxes Using Toner As the code currently stands, whenever you send a fax to Central Command or the Syndicate, it makes a non-existant copy of the fax using toner from your own machine. This fix removes unnecessary code and no longer requires toner to send a fax. Fixes: #11172 :cl: Twinmold Fix: No longer costs toner to send a fax to Central Command /:cl: --- code/modules/paperwork/faxmachine.dm | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index f4808f46d53..c5bb36b3dc2 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -283,34 +283,26 @@ var/global/list/fax_blacklist = list() use_power(200) - var/obj/item/rcvdcopy - if(istype(copyitem, /obj/item/paper)) - rcvdcopy = copy(copyitem) - else if(istype(copyitem, /obj/item/photo)) - rcvdcopy = photocopy(copyitem) - else if(istype(copyitem, /obj/item/paper_bundle)) - rcvdcopy = bundlecopy(copyitem) + if((istype(copyitem, /obj/item/paper))||(istype(copyitem, /obj/item/photo))||(istype(copyitem, /obj/item/paper_bundle))) else visible_message("[src] beeps, \"Error transmitting message.\"") return - rcvdcopy.loc = null //hopefully this shouldn't cause trouble - var/datum/fax/admin/A = new /datum/fax/admin() - A.name = rcvdcopy.name + A.name = copyitem.name A.from_department = department A.to_department = destination A.origin = src - A.message = rcvdcopy + A.message = copyitem A.sent_by = sender A.sent_at = world.time //message badmins that a fax has arrived switch(destination) if("Central Command") - message_admins(sender, "CENTCOM FAX", destination, rcvdcopy, "#006100") + message_admins(sender, "CENTCOM FAX", destination, copyitem, "#006100") if("Syndicate") - message_admins(sender, "SYNDICATE FAX", destination, rcvdcopy, "#DC143C") + message_admins(sender, "SYNDICATE FAX", destination, copyitem, "#DC143C") for(var/obj/machinery/photocopier/faxmachine/F in allfaxes) if(F.department == destination) F.receivefax(copyitem) From 37a8d796a6e6fccd6569acf03b74dd482e79c671 Mon Sep 17 00:00:00 2001 From: Twinmold Date: Sun, 31 Mar 2019 17:39:40 -0500 Subject: [PATCH 13/35] One Less Line All this does is turns the sanity check into a not check rather than an empty positive check. --- code/modules/paperwork/faxmachine.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index c5bb36b3dc2..8bad3f9bf6e 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -283,8 +283,7 @@ var/global/list/fax_blacklist = list() use_power(200) - if((istype(copyitem, /obj/item/paper))||(istype(copyitem, /obj/item/photo))||(istype(copyitem, /obj/item/paper_bundle))) - else + if((!istype(copyitem, /obj/item/paper))&&(!istype(copyitem, /obj/item/photo))&&(!istype(copyitem, /obj/item/paper_bundle))) visible_message("[src] beeps, \"Error transmitting message.\"") return From c845e9860f36e193dbd8c811948161c2d598c5a9 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Tue, 2 Apr 2019 17:54:39 +0200 Subject: [PATCH 14/35] uses clonemind instead --- code/game/machinery/computer/cloning.dm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index cbc3ebe7f67..22d74f9d814 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -396,12 +396,10 @@ return for(var/obj/machinery/clonepod/pod in pods) - if(pod.occupant && pod.occupant.ckey == null) - for(var/datum/soullink/soulhook/hook in pod.sharedSoulhooks) //Check the soul hooks to see if the to be cloned person is in here - if(hook.soulowner.ckey == subject.ckey) - scantemp = "Subject already getting cloned." - SSnanoui.update_uis(src) - return + if(pod.occupant && pod.occupant.ckey == null && pod.clonemind == subject.mind) + scantemp = "Subject already getting cloned." + SSnanoui.update_uis(src) + return subject.dna.check_integrity() From 9bb2cab1a0cb204bfb7d85a1bc1875ad8c9f2520 Mon Sep 17 00:00:00 2001 From: Twinmold Date: Wed, 3 Apr 2019 00:35:22 -0500 Subject: [PATCH 15/35] Less Parenthesis Simple, right? --- code/modules/paperwork/faxmachine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 8bad3f9bf6e..875cd9c46d4 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -283,7 +283,7 @@ var/global/list/fax_blacklist = list() use_power(200) - if((!istype(copyitem, /obj/item/paper))&&(!istype(copyitem, /obj/item/photo))&&(!istype(copyitem, /obj/item/paper_bundle))) + if(!istype(copyitem, /obj/item/paper)&&!istype(copyitem, /obj/item/photo)&&!istype(copyitem, /obj/item/paper_bundle)) visible_message("[src] beeps, \"Error transmitting message.\"") return From 08e2512e6f3efb90310799c3c63fe7367f393739 Mon Sep 17 00:00:00 2001 From: Twinmold Date: Wed, 3 Apr 2019 00:45:39 -0500 Subject: [PATCH 16/35] KasparoVy Change Just took his line. Works. --- code/modules/paperwork/faxmachine.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 875cd9c46d4..14d53dd40bb 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -283,7 +283,6 @@ var/global/list/fax_blacklist = list() use_power(200) - if(!istype(copyitem, /obj/item/paper)&&!istype(copyitem, /obj/item/photo)&&!istype(copyitem, /obj/item/paper_bundle)) visible_message("[src] beeps, \"Error transmitting message.\"") return From d5a4db247c82dfb55ebb5b94dc91a26940c75b9b Mon Sep 17 00:00:00 2001 From: Twinmold Date: Wed, 3 Apr 2019 00:46:43 -0500 Subject: [PATCH 17/35] KasparoVy Change (It didn't take the first time... ?) For whatever reason, first time it didn't actually take. --- code/modules/paperwork/faxmachine.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 14d53dd40bb..13d85941a79 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -283,6 +283,7 @@ var/global/list/fax_blacklist = list() use_power(200) + if(!(istype(copyitem, /obj/item/paper) || istype(copyitem, /obj/item/paper_bundle) || istype(copyitem, /obj/item/photo))) visible_message("[src] beeps, \"Error transmitting message.\"") return From 530ff1353f205d292c7a5cb801b907f4ff5d2d52 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Wed, 3 Apr 2019 09:31:25 +0200 Subject: [PATCH 18/35] no more ckey check required --- code/game/machinery/computer/cloning.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 22d74f9d814..acdbc1110f3 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -396,7 +396,7 @@ return for(var/obj/machinery/clonepod/pod in pods) - if(pod.occupant && pod.occupant.ckey == null && pod.clonemind == subject.mind) + if(pod.occupant && pod.clonemind == subject.mind) scantemp = "Subject already getting cloned." SSnanoui.update_uis(src) return From d948e4e37c8654ac6653f7e096a4b210093d99fe Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Wed, 3 Apr 2019 11:38:27 -0400 Subject: [PATCH 19/35] Fixes Clonepods --- code/game/machinery/cloning.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 3c24a5064c0..4f028fac2d1 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -34,7 +34,7 @@ var/obj/effect/countdown/clonepod/countdown - var/list/brine_types = list("corazone", "salbutamol", "epinephrine", "salglu_solution") //stops heart attacks, heart failure, shock, and keeps their O2 levels normal + var/list/brine_types = list("corazone", "perfluorodecalin", "epinephrine", "salglu_solution") //stops heart attacks, heart failure, shock, and keeps their O2 levels normal var/list/missing_organs var/organs_number = 0 @@ -341,7 +341,7 @@ check_brine() //Also heal some oxyloss ourselves just in case!! - occupant.adjustOxyLoss(-4) + occupant.adjustOxyLoss(-10) use_power(7500) //This might need tweaking. @@ -476,6 +476,10 @@ for(var/i in missing_organs) qdel(i) missing_organs.Cut() + occupant.SetLoseBreath(0) // Stop friggin' dying, gosh damn + occupant.setOxyLoss(0) + for(var/datum/disease/critical/crit in occupant.viruses) + crit.cure() occupant.forceMove(get_turf(src)) occupant.update_body() domutcheck(occupant) //Waiting until they're out before possible notransform. From 9929a9468d5f68b6a12c1343596ad9a5ff4bddb6 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Wed, 3 Apr 2019 13:37:16 -0400 Subject: [PATCH 20/35] Fixes Teslium Being Unmakeable --- code/modules/reagents/chemistry/recipes/toxins.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/recipes/toxins.dm b/code/modules/reagents/chemistry/recipes/toxins.dm index 1a073eae598..cdc10bcbcc5 100644 --- a/code/modules/reagents/chemistry/recipes/toxins.dm +++ b/code/modules/reagents/chemistry/recipes/toxins.dm @@ -139,7 +139,7 @@ required_reagents = list("plasma" = 1, "silver" = 1, "blackpowder" = 1) result_amount = 3 mix_message = "A jet of sparks flies from the mixture as it merges into a flickering slurry." - min_temp = T0C + 130 + min_temp = T0C + 50 mix_sound = null /datum/chemical_reaction/teslium/on_reaction(datum/reagents/holder, created_volume) From f08cc1bb8f6012c790ba59869e52ef43ad488869 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 3 Apr 2019 14:32:24 -0400 Subject: [PATCH 21/35] Automatic changelog generation for PR #11146 [ci skip] --- html/changelogs/AutoChangeLog-pr-11146.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11146.yml diff --git a/html/changelogs/AutoChangeLog-pr-11146.yml b/html/changelogs/AutoChangeLog-pr-11146.yml new file mode 100644 index 00000000000..4d2a14ce69f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11146.yml @@ -0,0 +1,5 @@ +author: "farie82" +delete-after: True +changes: + - bugfix: "Auto cloning now doesn't clone a person more than once." + - tweak: "A person in the cloning scanner won't be scanned if he's already being cloned" From c7a6465f11e4930d155dc32774e4d55acd88668d Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 3 Apr 2019 14:34:34 -0400 Subject: [PATCH 22/35] Automatic changelog generation for PR #11160 [ci skip] --- html/changelogs/AutoChangeLog-pr-11160.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11160.yml diff --git a/html/changelogs/AutoChangeLog-pr-11160.yml b/html/changelogs/AutoChangeLog-pr-11160.yml new file mode 100644 index 00000000000..b1ca726884b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11160.yml @@ -0,0 +1,6 @@ +author: "Fox McCloud" +delete-after: True +changes: + - tweak: "Blobspores will additionally zomify all players who have 200 damage or more" + - tweak: "Holoparasites will additionally die once their host has 200 damage or more" + - bugfix: "Fixes blob zombies who infect players who have no head being invisible" From ae0ba5f90e9b6af41b5e61b6d2de112dd49bee54 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 3 Apr 2019 20:25:14 +0000 Subject: [PATCH 23/35] Automatic changelog compile, [ci skip] --- html/changelog.html | 5 +++++ html/changelogs/.all_changelog.yml | 7 +++++++ html/changelogs/AutoChangeLog-pr-11146.yml | 5 ----- html/changelogs/AutoChangeLog-pr-11160.yml | 6 ------ 4 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-11146.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-11160.yml diff --git a/html/changelog.html b/html/changelog.html index a86cfa42a28..b81214a498e 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -60,10 +60,15 @@

Fox McCloud updated:

  • Dramatically improves human life performance (sorry, doesn't fix your actual crappy real life)
    • +
  • Blobspores will additionally zomify all players who have 200 damage or more
    • +
  • Holoparasites will additionally die once their host has 200 damage or more
    • +
  • Fixes blob zombies who infect players who have no head being invisible

farie82 updated:

  • Death nettle can be picked up again
    • +
  • Auto cloning now doesn't clone a person more than once.
    • +
  • A person in the cloning scanner won't be scanned if he's already being cloned

02 April 2019

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 3e59c050561..13190f55004 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -9665,5 +9665,12 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Fox McCloud: - bugfix: Dramatically improves human life performance (sorry, doesn't fix your actual crappy real life) + - tweak: Blobspores will additionally zomify all players who have 200 damage or + more + - tweak: Holoparasites will additionally die once their host has 200 damage or more + - bugfix: Fixes blob zombies who infect players who have no head being invisible farie82: - bugfix: Death nettle can be picked up again + - bugfix: Auto cloning now doesn't clone a person more than once. + - tweak: A person in the cloning scanner won't be scanned if he's already being + cloned diff --git a/html/changelogs/AutoChangeLog-pr-11146.yml b/html/changelogs/AutoChangeLog-pr-11146.yml deleted file mode 100644 index 4d2a14ce69f..00000000000 --- a/html/changelogs/AutoChangeLog-pr-11146.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "farie82" -delete-after: True -changes: - - bugfix: "Auto cloning now doesn't clone a person more than once." - - tweak: "A person in the cloning scanner won't be scanned if he's already being cloned" diff --git a/html/changelogs/AutoChangeLog-pr-11160.yml b/html/changelogs/AutoChangeLog-pr-11160.yml deleted file mode 100644 index b1ca726884b..00000000000 --- a/html/changelogs/AutoChangeLog-pr-11160.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "Fox McCloud" -delete-after: True -changes: - - tweak: "Blobspores will additionally zomify all players who have 200 damage or more" - - tweak: "Holoparasites will additionally die once their host has 200 damage or more" - - bugfix: "Fixes blob zombies who infect players who have no head being invisible" From 6b81eb3842f0e2057983878cc6f81a2259994fca Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 3 Apr 2019 21:30:58 -0400 Subject: [PATCH 24/35] Automatic changelog generation for PR #11081 [ci skip] --- html/changelogs/AutoChangeLog-pr-11081.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11081.yml diff --git a/html/changelogs/AutoChangeLog-pr-11081.yml b/html/changelogs/AutoChangeLog-pr-11081.yml new file mode 100644 index 00000000000..bac4ffe884b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11081.yml @@ -0,0 +1,6 @@ +author: "Kyep" +delete-after: True +changes: + - tweak: "Improved the interface for Syndicate Uplinks. They now clearly mark which items are hijack-only and which are not. If you attempt to purchase a hijack-only item without hijack, they will explain why you can't." + - tweak: "Atmos Gas Grenades (the uplink grenade kit) are now split into Knockout grenades (2 N2O grenades, 8 TC, available to all agents), and Plasma Fire grenades (2 plasma fire grenades, 12 TC, only available if you have hijack). This both makes knockout grenades more useful for normal traitors, and also prevents non-hijackers using a plasma fire grenade to cause massive casualties/damage." + - tweak: "Plasma Grenades and the Syndicate Bomb can no longer show up in surplus crates, or be discounted. This means while you can buy one if you intend to, you're not randomly encouraged to bomb your target." From aa44ffa74ee657a6ed902a262e37fdd30ee3cca1 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Thu, 4 Apr 2019 03:32:52 +0000 Subject: [PATCH 25/35] Automatic changelog compile, [ci skip] --- html/changelog.html | 8 ++++++++ html/changelogs/.all_changelog.yml | 13 +++++++++++++ html/changelogs/AutoChangeLog-pr-11081.yml | 6 ------ 3 files changed, 21 insertions(+), 6 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-11081.yml diff --git a/html/changelog.html b/html/changelog.html index b81214a498e..af410acc732 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,14 @@ -->
+

04 April 2019

+

Kyep updated:

+
    +
  • Improved the interface for Syndicate Uplinks. They now clearly mark which items are hijack-only and which are not. If you attempt to purchase a hijack-only item without hijack, they will explain why you can't.
    • +
  • Atmos Gas Grenades (the uplink grenade kit) are now split into Knockout grenades (2 N2O grenades, 8 TC, available to all agents), and Plasma Fire grenades (2 plasma fire grenades, 12 TC, only available if you have hijack). This both makes knockout grenades more useful for normal traitors, and also prevents non-hijackers using a plasma fire grenade to cause massive casualties/damage.
    • +
  • Plasma Grenades and the Syndicate Bomb can no longer show up in surplus crates, or be discounted. This means while you can buy one if you intend to, you're not randomly encouraged to bomb your target.
    • +
+

03 April 2019

Fox McCloud updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 13190f55004..748a8e97b2b 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -9674,3 +9674,16 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: Auto cloning now doesn't clone a person more than once. - tweak: A person in the cloning scanner won't be scanned if he's already being cloned +2019-04-04: + Kyep: + - tweak: Improved the interface for Syndicate Uplinks. They now clearly mark which + items are hijack-only and which are not. If you attempt to purchase a hijack-only + item without hijack, they will explain why you can't. + - tweak: Atmos Gas Grenades (the uplink grenade kit) are now split into Knockout + grenades (2 N2O grenades, 8 TC, available to all agents), and Plasma Fire grenades + (2 plasma fire grenades, 12 TC, only available if you have hijack). This both + makes knockout grenades more useful for normal traitors, and also prevents non-hijackers + using a plasma fire grenade to cause massive casualties/damage. + - tweak: Plasma Grenades and the Syndicate Bomb can no longer show up in surplus + crates, or be discounted. This means while you can buy one if you intend to, + you're not randomly encouraged to bomb your target. diff --git a/html/changelogs/AutoChangeLog-pr-11081.yml b/html/changelogs/AutoChangeLog-pr-11081.yml deleted file mode 100644 index bac4ffe884b..00000000000 --- a/html/changelogs/AutoChangeLog-pr-11081.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "Kyep" -delete-after: True -changes: - - tweak: "Improved the interface for Syndicate Uplinks. They now clearly mark which items are hijack-only and which are not. If you attempt to purchase a hijack-only item without hijack, they will explain why you can't." - - tweak: "Atmos Gas Grenades (the uplink grenade kit) are now split into Knockout grenades (2 N2O grenades, 8 TC, available to all agents), and Plasma Fire grenades (2 plasma fire grenades, 12 TC, only available if you have hijack). This both makes knockout grenades more useful for normal traitors, and also prevents non-hijackers using a plasma fire grenade to cause massive casualties/damage." - - tweak: "Plasma Grenades and the Syndicate Bomb can no longer show up in surplus crates, or be discounted. This means while you can buy one if you intend to, you're not randomly encouraged to bomb your target." From 7d5e09d97df86431d9f7793a358154e3930e78bd Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Fri, 5 Apr 2019 02:22:10 -0400 Subject: [PATCH 26/35] Fixes Reagents Not Updating --- .../reagents/chemistry/reagents/alcohol.dm | 6 +++--- .../reagents/chemistry/reagents/drink_cold.dm | 2 +- code/modules/reagents/chemistry/reagents/food.dm | 5 +---- .../reagents/chemistry/reagents/medicine.dm | 16 ++++++++++------ code/modules/reagents/chemistry/reagents/misc.dm | 2 +- .../reagents/chemistry/reagents/paradise_pop.dm | 2 +- .../reagents/chemistry/reagents/toxins.dm | 8 ++++++-- 7 files changed, 23 insertions(+), 18 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index d2fb4eec567..6c22360face 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -765,7 +765,7 @@ /datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/M) if(M.bodytemperature < 360) M.bodytemperature = min(360, M.bodytemperature + (50 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 - ..() + return ..() /datum/reagent/consumable/ethanol/devilskiss name = "Devils Kiss" @@ -819,7 +819,7 @@ /datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/M) if(M.bodytemperature > 270) M.bodytemperature = max(270, M.bodytemperature - (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 - ..() + return ..() /datum/reagent/consumable/ethanol/grog name = "Grog" @@ -1178,7 +1178,7 @@ if(prob(25)) holder.remove_reagent(id, 15) M.fakevomit() - ..() + return ..() /datum/reagent/consumable/ethanol/synthanol/reaction_mob(mob/living/M, method=TOUCH, volume) if(M.isSynthetic()) diff --git a/code/modules/reagents/chemistry/reagents/drink_cold.dm b/code/modules/reagents/chemistry/reagents/drink_cold.dm index 8e902f014f3..707aab07b54 100644 --- a/code/modules/reagents/chemistry/reagents/drink_cold.dm +++ b/code/modules/reagents/chemistry/reagents/drink_cold.dm @@ -42,7 +42,7 @@ /datum/reagent/consumable/drink/cold/ice/on_mob_life(mob/living/M) M.bodytemperature = max(M.bodytemperature - 5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0) - ..() + return ..() /datum/reagent/consumable/drink/cold/space_cola name = "Cola" diff --git a/code/modules/reagents/chemistry/reagents/food.dm b/code/modules/reagents/chemistry/reagents/food.dm index 3f21593a44e..9b1aca91f8d 100644 --- a/code/modules/reagents/chemistry/reagents/food.dm +++ b/code/modules/reagents/chemistry/reagents/food.dm @@ -448,7 +448,7 @@ /datum/reagent/consumable/egg/on_mob_life(mob/living/M) if(prob(3)) M.reagents.add_reagent("cholesterol", rand(1,2)) - ..() + return ..() /datum/reagent/consumable/corn_starch name = "Corn Starch" @@ -643,9 +643,6 @@ color = "#684435" taste_message = "burritos" -/datum/reagent/consumable/beans/on_mob_life(mob/living/M) - return ..() - /datum/reagent/consumable/bread name = "Bread" id = "bread" diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm index 7d711cbadb1..d9c1591a4dc 100644 --- a/code/modules/reagents/chemistry/reagents/medicine.dm +++ b/code/modules/reagents/chemistry/reagents/medicine.dm @@ -5,6 +5,7 @@ /datum/reagent/medicine/on_mob_life(mob/living/M) current_cycle++ holder.remove_reagent(id, (metabolization_rate / M.metabolism_efficiency) * M.digestion_ratio) //medicine reagents stay longer if you have a better metabolism + return STATUS_UPDATE_NONE /datum/reagent/medicine/hydrocodone name = "Hydrocodone" @@ -526,6 +527,7 @@ taste_message = "a delightful numbing" /datum/reagent/medicine/morphine/on_mob_life(mob/living/M) + var/update_flags = STATUS_UPDATE_NONE M.AdjustJitter(-25) switch(current_cycle) if(1 to 15) @@ -534,9 +536,9 @@ if(16 to 35) M.Drowsy(20) if(36 to INFINITY) - M.Paralyse(15) + update_flags |= M.Paralyse(15, FALSE) M.Drowsy(20) - ..() + return ..() | update_flags /datum/reagent/medicine/oculine name = "Oculine" @@ -759,7 +761,7 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M H.update_mutations() - ..() + return ..() /datum/reagent/medicine/antihol name = "Antihol" @@ -857,6 +859,7 @@ /datum/reagent/medicine/insulin/on_mob_life(mob/living/M) M.reagents.remove_reagent("sugar", 5) + return ..() /datum/reagent/medicine/teporone name = "Teporone" @@ -873,7 +876,7 @@ M.bodytemperature = max(310, M.bodytemperature - (40 * TEMPERATURE_DAMAGE_COEFFICIENT)) else if(M.bodytemperature < 311) M.bodytemperature = min(310, M.bodytemperature + (40 * TEMPERATURE_DAMAGE_COEFFICIENT)) - ..() + return ..() /datum/reagent/medicine/haloperidol name = "Haloperidol" @@ -916,6 +919,7 @@ taste_message = "sleepiness" /datum/reagent/medicine/ether/on_mob_life(mob/living/M) + var/update_flags = STATUS_UPDATE_NONE M.AdjustJitter(-25) switch(current_cycle) if(1 to 30) @@ -924,9 +928,9 @@ if(31 to 40) M.Drowsy(20) if(41 to INFINITY) - M.Paralyse(15) + update_flags |= M.Paralyse(15, FALSE) M.Drowsy(20) - ..() + return ..() | update_flags /datum/reagent/medicine/syndicate_nanites //Used exclusively by Syndicate medical cyborgs name = "Restorative Nanites" diff --git a/code/modules/reagents/chemistry/reagents/misc.dm b/code/modules/reagents/chemistry/reagents/misc.dm index 9277ba33fd9..7d92080ae6b 100644 --- a/code/modules/reagents/chemistry/reagents/misc.dm +++ b/code/modules/reagents/chemistry/reagents/misc.dm @@ -162,7 +162,7 @@ if(!H.dna.species.exotic_blood && !(NO_BLOOD in H.dna.species.species_traits)) if(H.blood_volume < BLOOD_VOLUME_NORMAL) H.blood_volume += 0.8 - ..() + return ..() /datum/reagent/iron/reaction_mob(mob/living/M, method=TOUCH, volume) if(M.has_bane(BANE_IRON) && holder && holder.chem_temp < 150) //If the target is weak to cold iron, then poison them. diff --git a/code/modules/reagents/chemistry/reagents/paradise_pop.dm b/code/modules/reagents/chemistry/reagents/paradise_pop.dm index 204848e1fe9..2294088e54a 100644 --- a/code/modules/reagents/chemistry/reagents/paradise_pop.dm +++ b/code/modules/reagents/chemistry/reagents/paradise_pop.dm @@ -31,7 +31,7 @@ var/turf/simulated/T = get_turf(M) goonchem_vortex(T, 1, 0) to_chat(M, "You briefly feel super-massive, like a black hole. Probably just your imagination...") - ..() + return ..() //Berry Banned: This one is tasty and safe to drink, might have a low chance of healing a random damage type? /datum/reagent/consumable/drink/berry_banned diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm index 76be206f35f..d337d2a421b 100644 --- a/code/modules/reagents/chemistry/reagents/toxins.dm +++ b/code/modules/reagents/chemistry/reagents/toxins.dm @@ -1156,12 +1156,16 @@ M.apply_effect(2, IRRADIATE, 0, negate_armor = 1) if(!M.dna) return + var/did_mutation = FALSE if(prob(15)) randmutb(M) + did_mutation = TRUE if(prob(3)) randmutg(M) - domutcheck(M, null) - M.UpdateAppearance() + did_mutation = TRUE + if(did_mutation) + domutcheck(M, null) + M.UpdateAppearance() return ..() /datum/reagent/ants From 75d9852d33902bf6096e238ec8aec57023d5433d Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Fri, 5 Apr 2019 09:35:43 +0200 Subject: [PATCH 27/35] Perps no longer need glasses to be set --- code/modules/mob/living/carbon/human/examine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 03726353022..aa714f0d527 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -363,7 +363,7 @@ for(var/datum/data/record/R in data_core.security) if(R.fields["id"] == E.fields["id"]) criminal = R.fields["criminal"] - var/criminal_status = hasHUD(user, "read_only_security") ? "\[[criminal]\]" : "\[[criminal]\]" + var/criminal_status = hasHUD(user, "read_only_security") ? "\[[criminal]\]" : "\[[criminal]\]" msg += "Criminal status: [criminal_status]\n" msg += "Security records: \[View\] \[Add comment\]\n" From c349ca0d20a594224cd80cf40ae5aad1b90b15fc Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Sat, 6 Apr 2019 03:14:59 -0400 Subject: [PATCH 28/35] Automatic changelog generation for PR #11140 [ci skip] --- html/changelogs/AutoChangeLog-pr-11140.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11140.yml diff --git a/html/changelogs/AutoChangeLog-pr-11140.yml b/html/changelogs/AutoChangeLog-pr-11140.yml new file mode 100644 index 00000000000..e440faec6ad --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11140.yml @@ -0,0 +1,4 @@ +author: "dovydas12345" +delete-after: True +changes: + - spellcheck: "Fixed diamond statue names and description." From 2d6591d15ac41b5eefee5dc81cf82d95a8e90f92 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Sat, 6 Apr 2019 03:15:55 -0400 Subject: [PATCH 29/35] Automatic changelog generation for PR #11195 [ci skip] --- html/changelogs/AutoChangeLog-pr-11195.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11195.yml diff --git a/html/changelogs/AutoChangeLog-pr-11195.yml b/html/changelogs/AutoChangeLog-pr-11195.yml new file mode 100644 index 00000000000..ef4141dc8ac --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11195.yml @@ -0,0 +1,4 @@ +author: "Twinmold" +delete-after: True +changes: + - bugfix: "No longer costs toner to send a fax to Central Command" From 5cc0cacb24fd8d67c5e05a31d85cbda2693ff9b6 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Sat, 6 Apr 2019 03:23:10 -0400 Subject: [PATCH 30/35] Automatic changelog generation for PR #11237 [ci skip] --- html/changelogs/AutoChangeLog-pr-11237.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11237.yml diff --git a/html/changelogs/AutoChangeLog-pr-11237.yml b/html/changelogs/AutoChangeLog-pr-11237.yml new file mode 100644 index 00000000000..a4b17130401 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11237.yml @@ -0,0 +1,4 @@ +author: "Fox McCloud" +delete-after: True +changes: + - bugfix: "Fixes some reagents not causing status updates" From 3d67bf0d5d113bcd6858da7a838dfaba63e551ff Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Sat, 6 Apr 2019 03:25:36 -0400 Subject: [PATCH 31/35] Automatic changelog generation for PR #11222 [ci skip] --- html/changelogs/AutoChangeLog-pr-11222.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11222.yml diff --git a/html/changelogs/AutoChangeLog-pr-11222.yml b/html/changelogs/AutoChangeLog-pr-11222.yml new file mode 100644 index 00000000000..1f67292fd17 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11222.yml @@ -0,0 +1,4 @@ +author: "Fox McCloud" +delete-after: True +changes: + - bugfix: "Fixes people popping out of cloning taking tons of damage" From 249308a8a63643d15ee88691a528da99292d919c Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Sat, 6 Apr 2019 03:25:58 -0400 Subject: [PATCH 32/35] Automatic changelog generation for PR #11223 [ci skip] --- html/changelogs/AutoChangeLog-pr-11223.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11223.yml diff --git a/html/changelogs/AutoChangeLog-pr-11223.yml b/html/changelogs/AutoChangeLog-pr-11223.yml new file mode 100644 index 00000000000..1e0a22603db --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11223.yml @@ -0,0 +1,4 @@ +author: "Fox McCloud" +delete-after: True +changes: + - bugfix: "Fixes Teslium recipe" From 253ce38356661a037499a2cd730f726444eca560 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Sat, 6 Apr 2019 09:15:02 +0000 Subject: [PATCH 33/35] Automatic changelog compile, [ci skip] --- html/changelog.html | 16 ++++++++++++++++ html/changelogs/.all_changelog.yml | 9 +++++++++ html/changelogs/AutoChangeLog-pr-11140.yml | 4 ---- html/changelogs/AutoChangeLog-pr-11195.yml | 4 ---- html/changelogs/AutoChangeLog-pr-11222.yml | 4 ---- html/changelogs/AutoChangeLog-pr-11223.yml | 4 ---- html/changelogs/AutoChangeLog-pr-11237.yml | 4 ---- 7 files changed, 25 insertions(+), 20 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-11140.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-11195.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-11222.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-11223.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-11237.yml diff --git a/html/changelog.html b/html/changelog.html index af410acc732..89a5466fe95 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,22 @@ -->
    +

    06 April 2019

    +

    Fox McCloud updated:

    +
      +
    • Fixes people popping out of cloning taking tons of damage
      • +
    • Fixes Teslium recipe
      • +
    • Fixes some reagents not causing status updates
      • +
    +

    Twinmold updated:

    +
      +
    • No longer costs toner to send a fax to Central Command
      • +
    +

    dovydas12345 updated:

    +
      +
    • Fixed diamond statue names and description.
      • +
    +

    04 April 2019

    Kyep updated:

      diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 748a8e97b2b..65462b036f5 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -9687,3 +9687,12 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - tweak: Plasma Grenades and the Syndicate Bomb can no longer show up in surplus crates, or be discounted. This means while you can buy one if you intend to, you're not randomly encouraged to bomb your target. +2019-04-06: + Fox McCloud: + - bugfix: Fixes people popping out of cloning taking tons of damage + - bugfix: Fixes Teslium recipe + - bugfix: Fixes some reagents not causing status updates + Twinmold: + - bugfix: No longer costs toner to send a fax to Central Command + dovydas12345: + - spellcheck: Fixed diamond statue names and description. diff --git a/html/changelogs/AutoChangeLog-pr-11140.yml b/html/changelogs/AutoChangeLog-pr-11140.yml deleted file mode 100644 index e440faec6ad..00000000000 --- a/html/changelogs/AutoChangeLog-pr-11140.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "dovydas12345" -delete-after: True -changes: - - spellcheck: "Fixed diamond statue names and description." diff --git a/html/changelogs/AutoChangeLog-pr-11195.yml b/html/changelogs/AutoChangeLog-pr-11195.yml deleted file mode 100644 index ef4141dc8ac..00000000000 --- a/html/changelogs/AutoChangeLog-pr-11195.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Twinmold" -delete-after: True -changes: - - bugfix: "No longer costs toner to send a fax to Central Command" diff --git a/html/changelogs/AutoChangeLog-pr-11222.yml b/html/changelogs/AutoChangeLog-pr-11222.yml deleted file mode 100644 index 1f67292fd17..00000000000 --- a/html/changelogs/AutoChangeLog-pr-11222.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Fox McCloud" -delete-after: True -changes: - - bugfix: "Fixes people popping out of cloning taking tons of damage" diff --git a/html/changelogs/AutoChangeLog-pr-11223.yml b/html/changelogs/AutoChangeLog-pr-11223.yml deleted file mode 100644 index 1e0a22603db..00000000000 --- a/html/changelogs/AutoChangeLog-pr-11223.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Fox McCloud" -delete-after: True -changes: - - bugfix: "Fixes Teslium recipe" diff --git a/html/changelogs/AutoChangeLog-pr-11237.yml b/html/changelogs/AutoChangeLog-pr-11237.yml deleted file mode 100644 index a4b17130401..00000000000 --- a/html/changelogs/AutoChangeLog-pr-11237.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Fox McCloud" -delete-after: True -changes: - - bugfix: "Fixes some reagents not causing status updates" From c4d6fdaf1826d7a50aef059ac2b623afa1dcf0e0 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Sat, 6 Apr 2019 13:17:10 -0400 Subject: [PATCH 34/35] Automatic changelog generation for PR #11239 [ci skip] --- html/changelogs/AutoChangeLog-pr-11239.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11239.yml diff --git a/html/changelogs/AutoChangeLog-pr-11239.yml b/html/changelogs/AutoChangeLog-pr-11239.yml new file mode 100644 index 00000000000..260963bd57b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11239.yml @@ -0,0 +1,4 @@ +author: "farie82" +delete-after: True +changes: + - bugfix: "Sec huds work again. No longer does the perp need glasses to be set to arrest. Cool does not equal arrest now" From 2657f56a56c596f8886daf25f735ddbbcbe88576 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Sat, 6 Apr 2019 18:13:42 +0000 Subject: [PATCH 35/35] Automatic changelog compile, [ci skip] --- html/changelog.html | 4 ++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-11239.yml | 4 ---- 3 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-11239.yml diff --git a/html/changelog.html b/html/changelog.html index 89a5466fe95..a4f7fd50102 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -71,6 +71,10 @@
      • Fixed diamond statue names and description.
      +

      farie82 updated:

      +
        +
      • Sec huds work again. No longer does the perp need glasses to be set to arrest. Cool does not equal arrest now
        • +

      04 April 2019

      Kyep updated:

      diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 65462b036f5..e8299057623 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -9696,3 +9696,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: No longer costs toner to send a fax to Central Command dovydas12345: - spellcheck: Fixed diamond statue names and description. + farie82: + - bugfix: Sec huds work again. No longer does the perp need glasses to be set to + arrest. Cool does not equal arrest now diff --git a/html/changelogs/AutoChangeLog-pr-11239.yml b/html/changelogs/AutoChangeLog-pr-11239.yml deleted file mode 100644 index 260963bd57b..00000000000 --- a/html/changelogs/AutoChangeLog-pr-11239.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "farie82" -delete-after: True -changes: - - bugfix: "Sec huds work again. No longer does the perp need glasses to be set to arrest. Cool does not equal arrest now"