From ca07f531bb3dc9654a41489c55fd5298be80930f Mon Sep 17 00:00:00 2001 From: blah Date: Thu, 11 Aug 2016 14:29:14 +0100 Subject: [PATCH 1/5] Fixes the gulag teleporter and removes two /var in proc decelerations --- code/game/area/areas.dm | 4 +--- code/game/gamemodes/antag_hud.dm | 2 +- code/game/machinery/gulag_teleporter.dm | 8 +++++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 5032ea6ec26..fbdc4be4e8a 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -5,7 +5,7 @@ // the same logical /area have the parent /area object... well, you would be mistaken. If you // want to find machines, mobs, etc, in the same logical area, you will need to check all the // related areas. This returns a master contents list to assist in that. -/proc/area_contents(var/area/A) +/proc/area_contents(area/A) if(!istype(A)) return null var/list/contents = list() for(var/area/LSA in A.related) @@ -48,8 +48,6 @@ blend_mode = BLEND_MULTIPLY // Putting this in the constructor so that it stops the icons being screwed up in the map editor. - - /area/proc/poweralert(state, obj/source) if (state != poweralm) poweralm = state diff --git a/code/game/gamemodes/antag_hud.dm b/code/game/gamemodes/antag_hud.dm index 3592fbc4e00..b2863c4777f 100644 --- a/code/game/gamemodes/antag_hud.dm +++ b/code/game/gamemodes/antag_hud.dm @@ -41,7 +41,7 @@ //MIND PROCS //these are called by mind.transfer_to() -/datum/mind/proc/transfer_antag_huds(var/datum/atom_hud/antag/newhud) +/datum/mind/proc/transfer_antag_huds(datum/atom_hud/antag/newhud) leave_all_huds() ticker.mode.set_antag_hud(current, antag_hud_icon_state) if(newhud) diff --git a/code/game/machinery/gulag_teleporter.dm b/code/game/machinery/gulag_teleporter.dm index 8a1ae3a9378..d918604e6d8 100644 --- a/code/game/machinery/gulag_teleporter.dm +++ b/code/game/machinery/gulag_teleporter.dm @@ -132,7 +132,13 @@ The console is located at computer/gulag_teleporter.dm if(istype(W, /obj/item/weapon/restraints/handcuffs)) W.forceMove(get_turf(src)) continue - if(istype(W, /obj/item/weapon/implant/storage)) + if(istype(W, /obj/item/weapon/implant)) + continue + if(istype(W, /obj/item/clothing/suit/space/eva/plasmaman)) + continue + if(istype(W, /obj/item/clothing/head/helmet/space/plasmaman)) + continue + if(istype(W, /obj/item/weapon/tank/internals/plasmaman)) continue if(linked_reclaimer) linked_reclaimer.stored_items[occupant] += W From 93c0f9ea08254c49b305100631a57b6f86152a3d Mon Sep 17 00:00:00 2001 From: blah Date: Thu, 11 Aug 2016 14:40:04 +0100 Subject: [PATCH 2/5] Missed a item --- code/game/machinery/gulag_teleporter.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/machinery/gulag_teleporter.dm b/code/game/machinery/gulag_teleporter.dm index d918604e6d8..20558087bff 100644 --- a/code/game/machinery/gulag_teleporter.dm +++ b/code/game/machinery/gulag_teleporter.dm @@ -140,6 +140,8 @@ The console is located at computer/gulag_teleporter.dm continue if(istype(W, /obj/item/weapon/tank/internals/plasmaman)) continue + if(istype(W, /obj/item/clothing/under/plasmaman)) + continue if(linked_reclaimer) linked_reclaimer.stored_items[occupant] += W linked_reclaimer.contents += W From eea98a5b3cb074e07194352e630d1394f1673759 Mon Sep 17 00:00:00 2001 From: blah Date: Thu, 11 Aug 2016 15:22:32 +0100 Subject: [PATCH 3/5] Revert "Fixes the gulag teleporter and removes two /var in proc decelerations" This reverts commit ca07f531bb3dc9654a41489c55fd5298be80930f. --- code/game/area/areas.dm | 4 +++- code/game/gamemodes/antag_hud.dm | 2 +- code/game/machinery/gulag_teleporter.dm | 10 +--------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index fbdc4be4e8a..5032ea6ec26 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -5,7 +5,7 @@ // the same logical /area have the parent /area object... well, you would be mistaken. If you // want to find machines, mobs, etc, in the same logical area, you will need to check all the // related areas. This returns a master contents list to assist in that. -/proc/area_contents(area/A) +/proc/area_contents(var/area/A) if(!istype(A)) return null var/list/contents = list() for(var/area/LSA in A.related) @@ -48,6 +48,8 @@ blend_mode = BLEND_MULTIPLY // Putting this in the constructor so that it stops the icons being screwed up in the map editor. + + /area/proc/poweralert(state, obj/source) if (state != poweralm) poweralm = state diff --git a/code/game/gamemodes/antag_hud.dm b/code/game/gamemodes/antag_hud.dm index b2863c4777f..3592fbc4e00 100644 --- a/code/game/gamemodes/antag_hud.dm +++ b/code/game/gamemodes/antag_hud.dm @@ -41,7 +41,7 @@ //MIND PROCS //these are called by mind.transfer_to() -/datum/mind/proc/transfer_antag_huds(datum/atom_hud/antag/newhud) +/datum/mind/proc/transfer_antag_huds(var/datum/atom_hud/antag/newhud) leave_all_huds() ticker.mode.set_antag_hud(current, antag_hud_icon_state) if(newhud) diff --git a/code/game/machinery/gulag_teleporter.dm b/code/game/machinery/gulag_teleporter.dm index 20558087bff..8a1ae3a9378 100644 --- a/code/game/machinery/gulag_teleporter.dm +++ b/code/game/machinery/gulag_teleporter.dm @@ -132,15 +132,7 @@ The console is located at computer/gulag_teleporter.dm if(istype(W, /obj/item/weapon/restraints/handcuffs)) W.forceMove(get_turf(src)) continue - if(istype(W, /obj/item/weapon/implant)) - continue - if(istype(W, /obj/item/clothing/suit/space/eva/plasmaman)) - continue - if(istype(W, /obj/item/clothing/head/helmet/space/plasmaman)) - continue - if(istype(W, /obj/item/weapon/tank/internals/plasmaman)) - continue - if(istype(W, /obj/item/clothing/under/plasmaman)) + if(istype(W, /obj/item/weapon/implant/storage)) continue if(linked_reclaimer) linked_reclaimer.stored_items[occupant] += W From 8639c606797ace95f6811ae1810912a71757c10b Mon Sep 17 00:00:00 2001 From: blah Date: Sun, 21 Aug 2016 19:54:59 +0100 Subject: [PATCH 4/5] One line fix to prevent this admin chem from being seriously duplicated. --- code/modules/reagents/chemistry/reagents/medicine_reagents.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index df4a732fd52..b81330a3099 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -31,6 +31,7 @@ id = "adminordrazine" description = "It's magic. We don't have to explain it." color = "#C8A5DC" // rgb: 200, 165, 220 + can_synth = 0 /datum/reagent/medicine/adminordrazine/on_mob_life(mob/living/carbon/M) M.reagents.remove_all_type(/datum/reagent/toxin, 5*REM, 0, 1) From b78cf51016b2045f169dd4ac0972b7272c2a3b24 Mon Sep 17 00:00:00 2001 From: blah Date: Sun, 21 Aug 2016 20:43:03 +0100 Subject: [PATCH 5/5] Adds other ones to the blacklist --- code/modules/reagents/chemistry/reagents/blob_reagents.dm | 1 + code/modules/reagents/chemistry/reagents/other_reagents.dm | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/code/modules/reagents/chemistry/reagents/blob_reagents.dm b/code/modules/reagents/chemistry/reagents/blob_reagents.dm index 51b50bb9397..7db4cb3c752 100644 --- a/code/modules/reagents/chemistry/reagents/blob_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/blob_reagents.dm @@ -11,6 +11,7 @@ var/blobbernaut_message = "slams" //blobbernaut attack verb var/message = "The blob strikes you" //message sent to any mob hit by the blob var/message_living = null //extension to first mob sent to only living mobs i.e. silicons have no skin to be burnt + can_synth = 0 /datum/reagent/blob/proc/send_message(mob/living/M) var/totalmessage = message diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index e022fbda573..64de2aef123 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -422,6 +422,7 @@ id = "gluttonytoxin" description = "An advanced corruptive toxin produced by something terrible." color = "#5EFF3B" //RGB: 94, 255, 59 + can_synth = 0 /datum/reagent/gluttonytoxin/reaction_mob(mob/M, method=TOUCH, reac_volume) M.ForceContractDisease(new /datum/disease/transformation/morph(0)) @@ -807,6 +808,7 @@ id = "nanomachines" description = "Microscopic construction robots." color = "#535E66" // rgb: 83, 94, 102 + can_synth = 0 /datum/reagent/nanites/reaction_mob(mob/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0) if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection)))) @@ -817,6 +819,7 @@ id = "xenomicrobes" description = "Microbes with an entirely alien cellular structure." color = "#535E66" // rgb: 83, 94, 102 + can_synth = 0 /datum/reagent/xenomicrobes/reaction_mob(mob/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0) if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection)))) @@ -1238,6 +1241,7 @@ datum/reagent/romerol of the host body." color = "#123524" // RGB (18, 53, 36) metabolization_rate = INFINITY + can_synth = 0 /datum/reagent/romerol/on_mob_life(mob/living/carbon/human/H) // Silently add the zombie infection organ to be activated upon death