From 886b2ad8d9657abe3c43fae04f1ecc5544e307f7 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Fri, 23 Mar 2018 17:35:15 +0000 Subject: [PATCH 1/5] nanocalcium reagent restriction --- code/_globalvars/lists/reagents.dm | 2 +- code/modules/reagents/chemistry/reagents/medicine.dm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/_globalvars/lists/reagents.dm b/code/_globalvars/lists/reagents.dm index 7042cbe932a..30809943a8a 100644 --- a/code/_globalvars/lists/reagents.dm +++ b/code/_globalvars/lists/reagents.dm @@ -55,7 +55,7 @@ var/global/list/blocked_chems = list("polonium", "initropidril", "concentrated_i "syndicate_nanites", "ripping_tendrils", "boiling_oil", "envenomed_filaments", "lexorin_jelly", "kinetic", "cryogenic_liquid", "dark_matter", "b_sorium", - "reagent", "life","dragonsbreath") + "reagent", "life","dragonsbreath", "nanocalcium") var/global/list/safe_chem_list = list("antihol", "charcoal", "epinephrine", "insulin", "teporone","silver_sulfadiazine", "salbutamol", "omnizine", "stimulants", "synaptizine", "potass_iodide", "oculine", "mannitol", "styptic_powder", diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm index 0e53f7fdc39..c92dc44cfaa 100644 --- a/code/modules/reagents/chemistry/reagents/medicine.dm +++ b/code/modules/reagents/chemistry/reagents/medicine.dm @@ -1042,6 +1042,7 @@ description = "Highly advanced nanites equipped with calcium payloads designed to repair bones. Nanomachines son." color = "#9b3401" metabolization_rate = 0.5 + can_synth = FALSE /datum/reagent/medicine/nanocalcium/on_mob_life(mob/living/carbon/human/M) switch(current_cycle) From c466f0e98ed3c3cac920dc908e08f36ac16213d0 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Fri, 23 Mar 2018 18:32:58 +0000 Subject: [PATCH 2/5] adds admin notification for black powder reaction --- code/modules/reagents/chemistry/recipes/pyrotechnics.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index 74a9b740c62..860234fd72d 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -129,10 +129,11 @@ mix_sound = null /datum/chemical_reaction/blackpowder_explosion/on_reaction(datum/reagents/holder, created_volume) - var/location = get_turf(holder.my_atom) + var/turf/location = get_turf(holder.my_atom) var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread s.set_up(2, 1, location) s.start() + message_admins("Black Powder explosion imminment at [location.x] [location.y] [location.z] [ADMIN_JMP(location)] with volume [created_volume]") sleep(rand(20,30)) blackpowder_detonate(holder, created_volume) From 2b24f1b27866c89b63a79a3e0413dd858df2cb0f Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Fri, 23 Mar 2018 18:48:36 +0000 Subject: [PATCH 3/5] cyborgs now correctly remove diagnostic hud --- code/modules/mob/living/silicon/silicon.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 7469c2cca73..8a4df553508 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -224,10 +224,11 @@ /mob/living/silicon/proc/remove_med_sec_hud() var/datum/atom_hud/secsensor = huds[sec_hud] var/datum/atom_hud/medsensor = huds[med_hud] - var/datum/atom_hud/diagsensor = huds[d_hud] + for(var/datum/atom_hud/data/diagnostic/diagsensor in huds) + diagsensor.remove_hud_from(src) secsensor.remove_hud_from(src) medsensor.remove_hud_from(src) - diagsensor.remove_hud_from(src) + /mob/living/silicon/proc/add_sec_hud() var/datum/atom_hud/secsensor = huds[sec_hud] From 18a43b8039a3ae36ae51f13665d25a18ff848fce Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Mon, 26 Mar 2018 22:33:54 +0100 Subject: [PATCH 4/5] Revert "adds admin notification for black powder reaction" This reverts commit c466f0e98ed3c3cac920dc908e08f36ac16213d0. --- code/modules/reagents/chemistry/recipes/pyrotechnics.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index 860234fd72d..74a9b740c62 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -129,11 +129,10 @@ mix_sound = null /datum/chemical_reaction/blackpowder_explosion/on_reaction(datum/reagents/holder, created_volume) - var/turf/location = get_turf(holder.my_atom) + var/location = get_turf(holder.my_atom) var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread s.set_up(2, 1, location) s.start() - message_admins("Black Powder explosion imminment at [location.x] [location.y] [location.z] [ADMIN_JMP(location)] with volume [created_volume]") sleep(rand(20,30)) blackpowder_detonate(holder, created_volume) From b334bc4a88d1612376dab50bb18a92282a2269b3 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Fri, 30 Mar 2018 13:12:44 +0100 Subject: [PATCH 5/5] defibrillator no longer yields infinite paddles --- code/game/objects/items/weapons/defib.dm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 85e24757517..e8196d7311a 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -17,7 +17,7 @@ "Vox" = 'icons/mob/species/vox/back.dmi' ) - var/on = 0 //if the paddles are equipped (1) or on the defib (0) + var/paddles_on_defib = TRUE //if the paddles are on the defib (TRUE) var/safety = 1 //if you can zap people with the defibs on harm mode var/powered = 0 //if there's a cell in the defib with enough power for a revive, blocks paddles from reviving otherwise var/obj/item/weapon/twohanded/shockpaddles/paddles @@ -53,7 +53,7 @@ /obj/item/weapon/defibrillator/proc/update_overlays() overlays.Cut() - if(!on) + if(paddles_on_defib) overlays += "[icon_state]-paddles" if(powered) overlays += "[icon_state]-powered" @@ -130,18 +130,18 @@ /obj/item/weapon/defibrillator/verb/toggle_paddles() set name = "Toggle Paddles" set category = "Object" - on = !on var/mob/living/carbon/human/user = usr - if(on) + + if(paddles_on_defib) //Detach the paddles into the user's hands if(!usr.put_in_hands(paddles)) - on = 0 to_chat(user, "You need a free hand to hold the paddles!") update_icon() return paddles.loc = user - else + paddles_on_defib = FALSE + else if(user.is_in_active_hand(paddles)) //Remove from their hands and back onto the defib unit remove_paddles(user) @@ -163,15 +163,16 @@ if(slot == slot_back) return 1 -/obj/item/weapon/defibrillator/proc/remove_paddles(mob/user) +/obj/item/weapon/defibrillator/proc/remove_paddles(mob/user) // from your hands var/mob/living/carbon/human/M = user if(paddles in get_both_hands(M)) M.unEquip(paddles) + paddles_on_defib = TRUE update_icon() return /obj/item/weapon/defibrillator/Destroy() - if(on) + if(!paddles_on_defib) var/M = get(paddles, /mob) remove_paddles(M) QDEL_NULL(paddles) @@ -288,7 +289,7 @@ if(istype(O)) O.unwield() to_chat(user, "The paddles snap back into the main unit.") - defib.on = 0 + defib.paddles_on_defib = TRUE loc = defib defib.update_icon() update_icon()