From 9e38a049f76160b6ca752ff17eefee9e415c0ac7 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Wed, 8 Feb 2017 11:45:50 -0500 Subject: [PATCH 01/31] REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE --- code/modules/mob/living/status_procs.dm | 4 ++++ code/modules/mob/mob_helpers.dm | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index 402f94e837e..7dc2d1b8d58 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -103,6 +103,7 @@ // Booleans var/resting = FALSE + var/rest_CD = 0 /* STATUS EFFECTS @@ -140,12 +141,15 @@ /mob/living/proc/StartResting(updating = 1) var/val_change = !resting resting = TRUE + rest_CD = world.time + 20//this is for tracking it for the verb + to_chat(src, "You are now resting.") if(updating && val_change) update_canmove() /mob/living/proc/StopResting(updating = 1) var/val_change = !!resting resting = FALSE + to_chat(src, "You are now getting up.") if(updating && val_change) update_canmove() diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 95fce0b9399..dc33990dcca 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -361,9 +361,10 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM) set name = "Rest" set category = "IC" - resting = !resting - update_canmove() - to_chat(src, "You are now [resting ? "resting" : "getting up"].") + if(!resting) + StartResting() + else if(resting && !(rest_CD > world.time)) + StopResting() /proc/is_blind(A) if(iscarbon(A)) From 01a660298e7ce4a893cb7bc899348d2a421df26e Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Wed, 8 Feb 2017 12:17:36 -0500 Subject: [PATCH 02/31] CD edits --- code/modules/mob/living/status_procs.dm | 2 +- code/modules/mob/mob_helpers.dm | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index 7dc2d1b8d58..08eff7eada0 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -141,7 +141,7 @@ /mob/living/proc/StartResting(updating = 1) var/val_change = !resting resting = TRUE - rest_CD = world.time + 20//this is for tracking it for the verb + to_chat(src, "You are now resting.") if(updating && val_change) update_canmove() diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index dc33990dcca..75f64c753e8 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -361,9 +361,11 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM) set name = "Rest" set category = "IC" - if(!resting) + if(!resting && (world.time > rest_CD)) + rest_CD = world.time + 20 StartResting() - else if(resting && !(rest_CD > world.time)) + else if(resting && (world.time > rest_CD)) + rest_CD = world.time + 20 StopResting() /proc/is_blind(A) From c203a222760b0aca7c8ad6ec5be392216e5c798e Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Wed, 22 Feb 2017 00:43:53 -0500 Subject: [PATCH 03/31] pushing runtimeing code for fox to look at --- code/modules/mob/living/carbon/update_icons.dm | 2 -- code/modules/mob/living/status_procs.dm | 1 - code/modules/mob/living/update_status.dm | 4 ++++ code/modules/mob/mob_helpers.dm | 6 ++---- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm index 05224c28dde..cd3e937a8d7 100644 --- a/code/modules/mob/living/carbon/update_icons.dm +++ b/code/modules/mob/living/carbon/update_icons.dm @@ -19,8 +19,6 @@ if(dir & (EAST|WEST)) //Facing east or west final_dir = pick(NORTH, SOUTH) //So you fall on your side rather than your face or ass - lying_prev = lying //so we don't try to animate until there's been another change. - if(resize != RESIZE_DEFAULT_SIZE) changed++ ntransform.Scale(resize) diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index 08eff7eada0..a0b25312e00 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -103,7 +103,6 @@ // Booleans var/resting = FALSE - var/rest_CD = 0 /* STATUS EFFECTS diff --git a/code/modules/mob/living/update_status.dm b/code/modules/mob/living/update_status.dm index 59b7077e79e..b7a0e9e3e18 100644 --- a/code/modules/mob/living/update_status.dm +++ b/code/modules/mob/living/update_status.dm @@ -91,6 +91,10 @@ update_transform() if(!delay_action_updates) update_action_buttons_icon() + if(!lying && lying_prev) + if(client) + client.move_delay = world.time + movement_delay() + lying_prev = lying return canmove /mob/living/proc/update_stamina() diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 75f64c753e8..4a8a7b5b2f3 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -361,11 +361,9 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM) set name = "Rest" set category = "IC" - if(!resting && (world.time > rest_CD)) - rest_CD = world.time + 20 + if(!resting) StartResting() - else if(resting && (world.time > rest_CD)) - rest_CD = world.time + 20 + else if(resting) StopResting() /proc/is_blind(A) From dcc74e5f10b0903551093cb9ca343d839fcc95db Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Wed, 22 Feb 2017 08:37:27 -0500 Subject: [PATCH 04/31] urgh --- code/modules/mob/living/carbon/update_icons.dm | 2 ++ code/modules/mob/living/status_procs.dm | 4 ++-- code/modules/mob/living/update_status.dm | 2 +- code/modules/mob/mob_helpers.dm | 6 ++++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm index cd3e937a8d7..875df43a0f0 100644 --- a/code/modules/mob/living/carbon/update_icons.dm +++ b/code/modules/mob/living/carbon/update_icons.dm @@ -19,6 +19,8 @@ if(dir & (EAST|WEST)) //Facing east or west final_dir = pick(NORTH, SOUTH) //So you fall on your side rather than your face or ass + lying_prev = lying //so we don't try to animate until there's been another change. + if(resize != RESIZE_DEFAULT_SIZE) changed++ ntransform.Scale(resize) diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index a0b25312e00..f53fbd4160b 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -103,6 +103,7 @@ // Booleans var/resting = FALSE + var/rest_CD = 0 /* STATUS EFFECTS @@ -141,14 +142,13 @@ var/val_change = !resting resting = TRUE - to_chat(src, "You are now resting.") if(updating && val_change) update_canmove() /mob/living/proc/StopResting(updating = 1) var/val_change = !!resting resting = FALSE - to_chat(src, "You are now getting up.") + if(updating && val_change) update_canmove() diff --git a/code/modules/mob/living/update_status.dm b/code/modules/mob/living/update_status.dm index b7a0e9e3e18..7eb054176c4 100644 --- a/code/modules/mob/living/update_status.dm +++ b/code/modules/mob/living/update_status.dm @@ -93,7 +93,7 @@ update_action_buttons_icon() if(!lying && lying_prev) if(client) - client.move_delay = world.time + movement_delay() + client.move_delay = max(world.time + movement_delay(), world.time + 20) lying_prev = lying return canmove diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 4a8a7b5b2f3..ee7fa503e11 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -361,9 +361,11 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM) set name = "Rest" set category = "IC" - if(!resting) + if(!resting && (world.time > rest_CD)) + to_chat(src, "You are now resting.") StartResting() - else if(resting) + else if(resting && (world.time > rest_CD)) + to_chat(src, "You are now getting up.") StopResting() /proc/is_blind(A) From 38edcdeb3bf32469c3afcb8a296383a1c77bd4bd Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 23 Feb 2017 00:05:51 -0500 Subject: [PATCH 05/31] forgot this... --- code/modules/mob/mob_helpers.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index ee7fa503e11..664d54138d4 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -362,9 +362,11 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM) set category = "IC" if(!resting && (world.time > rest_CD)) + rest_CD = world.time + 20 to_chat(src, "You are now resting.") StartResting() else if(resting && (world.time > rest_CD)) + rest_CD = world.time + 20 to_chat(src, "You are now getting up.") StopResting() From 7a4f8d4696c063f46ff380def657005bfe3b3251 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 23 Feb 2017 08:39:01 -0500 Subject: [PATCH 06/31] tabbing --- code/modules/mob/living/carbon/update_icons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm index 875df43a0f0..05224c28dde 100644 --- a/code/modules/mob/living/carbon/update_icons.dm +++ b/code/modules/mob/living/carbon/update_icons.dm @@ -19,7 +19,7 @@ if(dir & (EAST|WEST)) //Facing east or west final_dir = pick(NORTH, SOUTH) //So you fall on your side rather than your face or ass - lying_prev = lying //so we don't try to animate until there's been another change. + lying_prev = lying //so we don't try to animate until there's been another change. if(resize != RESIZE_DEFAULT_SIZE) changed++ From 50a70ab9c6d8909f37d1d638334d197ed8c4427c Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sat, 25 Feb 2017 02:01:26 -0500 Subject: [PATCH 07/31] The CrazyLemons method --- code/modules/mob/living/status_procs.dm | 1 - code/modules/mob/living/update_status.dm | 4 ---- code/modules/mob/mob_helpers.dm | 11 +++++++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index f53fbd4160b..e95381d19cf 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -103,7 +103,6 @@ // Booleans var/resting = FALSE - var/rest_CD = 0 /* STATUS EFFECTS diff --git a/code/modules/mob/living/update_status.dm b/code/modules/mob/living/update_status.dm index 7eb054176c4..59b7077e79e 100644 --- a/code/modules/mob/living/update_status.dm +++ b/code/modules/mob/living/update_status.dm @@ -91,10 +91,6 @@ update_transform() if(!delay_action_updates) update_action_buttons_icon() - if(!lying && lying_prev) - if(client) - client.move_delay = max(world.time + movement_delay(), world.time + 20) - lying_prev = lying return canmove /mob/living/proc/update_stamina() diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 664d54138d4..745a1b34afc 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -361,12 +361,15 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM) set name = "Rest" set category = "IC" - if(!resting && (world.time > rest_CD)) - rest_CD = world.time + 20 + if(world.time < client.move_delay) + return + + client.move_delay += 20 + + if(!resting) to_chat(src, "You are now resting.") StartResting() - else if(resting && (world.time > rest_CD)) - rest_CD = world.time + 20 + else if(resting) to_chat(src, "You are now getting up.") StopResting() From 3a89c685bf7b6f994117dd2d6d2a07994c5da19f Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sat, 25 Feb 2017 02:04:00 -0500 Subject: [PATCH 08/31] Tweak per suggestion. --- code/modules/mob/mob_helpers.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 745a1b34afc..79d45e94261 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -364,9 +364,8 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM) if(world.time < client.move_delay) return - client.move_delay += 20 - if(!resting) + client.move_delay += 20 to_chat(src, "You are now resting.") StartResting() else if(resting) From 414f83bb987bfa97a3f63f9598cde8089940a1a1 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sat, 25 Feb 2017 23:45:15 -0500 Subject: [PATCH 09/31] Krasues Tweaks --- code/modules/mob/mob_helpers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 79d45e94261..b83f213a066 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -365,7 +365,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM) return if(!resting) - client.move_delay += 20 + client.move_delay = world.time + 20 to_chat(src, "You are now resting.") StartResting() else if(resting) From c0ae16c6959b053a1629576d99823aec7f9ef04e Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Sun, 26 Feb 2017 00:03:15 -0800 Subject: [PATCH 10/31] Electrocution is now tracked in autopsy --- code/modules/mob/living/carbon/carbon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 0756ba600ba..9520c13dac3 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -149,7 +149,7 @@ return 0 if(reagents.has_reagent("teslium")) shock_damage *= 1.5 //If the mob has teslium in their body, shocks are 50% more damaging! - take_overall_damage(0,shock_damage) + take_overall_damage(0,shock_damage, used_weapon = "Electrocution") //src.burn_skin(shock_damage) //src.adjustFireLoss(shock_damage) //burn_skin will do this for us //src.updatehealth() From d494eee903940a45fc7c9744b889bdaaf0b05326 Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Sun, 26 Feb 2017 04:47:45 -0800 Subject: [PATCH 11/31] Encourages crew to foster highly dangerous biothreats --- code/modules/events/spacevine.dm | 86 +++++++++++++++++++++++++++----- 1 file changed, 73 insertions(+), 13 deletions(-) diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index d232342042a..d0599fa7ebc 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -45,6 +45,9 @@ /datum/spacevine_mutation/proc/on_death(obj/effect/spacevine/holder) return +/datum/spacevine_mutation/proc/on_deletion(obj/effect/spacevine/holder) + return + /datum/spacevine_mutation/proc/on_hit(obj/effect/spacevine/holder, mob/hitter, obj/item/I, expected_damage) . = expected_damage @@ -115,7 +118,7 @@ . = ..() //Do this *after* the turf has changed as qdel in spacevines will call changeturf again if it hasn't for(var/obj/effect/spacevine/SV in src) - qdel(SV) + SV.wither() /datum/spacevine_mutation/space_covering var/static/list/coverable_turfs @@ -140,7 +143,7 @@ T.ChangeTurf(/turf/simulated/floor/vines) T.baseturf = currtype -/datum/spacevine_mutation/space_covering/on_death(obj/effect/spacevine/holder) +/datum/spacevine_mutation/space_covering/on_deletion(obj/effect/spacevine/holder) var/turf/T = get_turf(holder) if(istype(T, /turf/simulated/floor/vines)) T.ChangeTurf(T.baseturf) @@ -194,7 +197,7 @@ else . = 1 spawn(5) - qdel(holder) + holder.wither() /datum/spacevine_mutation/explosive/on_death(obj/effect/spacevine/holder, mob/hitter, obj/item/I) explosion(holder.loc, 0, 0, severity, 0, 0) @@ -221,7 +224,7 @@ /datum/spacevine_mutation/vine_eating/on_spread(obj/effect/spacevine/holder, turf/target) var/obj/effect/spacevine/prey = locate() in target if(prey && !prey.mutations.Find(src)) //Eat all vines that are not of the same origin - qdel(prey) + prey.wither() . = TRUE /datum/spacevine_mutation/aggressive_spread //very OP, but im out of other ideas currently @@ -305,6 +308,56 @@ /datum/spacevine_mutation/virulent_spread/on_search(obj/effect/spacevine/holder) return 1 +// Sure, let's encourage crew members to deliberately breed a highly dangerous +// threat. What could *possibly* go wrong? ;) +/datum/spacevine_mutation/mineral + name = "metallic" + hue = "#444444" + quality = POSITIVE + severity = 3 + var/drop_rate = 20 + var/list/mineral_results = list( + /obj/item/stack/sheet/metal = 1 + ) + +/datum/spacevine_mutation/mineral/on_death(obj/effect/spacevine/holder) + if(!prob(drop_rate)) + return + var/itemtype = pickweight(mineral_results) + var/turf/pos = get_turf(holder) + new itemtype(pos, severity) + +/datum/spacevine_mutation/mineral/valuables + name = "glimmering" + hue = "#888800" + drop_rate = 10 + mineral_results = list( + /obj/item/stack/sheet/mineral/silver = 4, + /obj/item/stack/sheet/mineral/gold = 2, + /obj/item/stack/sheet/mineral/diamond = 1 + ) + +/datum/spacevine_mutation/mineral/glass + name = "glassy" + hue = "#8888FF" + mineral_results = list( + /obj/item/stack/sheet/glass = 1 + ) + +/datum/spacevine_mutation/mineral/plastic + name = "plasticine" + hue = "#222288" + mineral_results = list( + /obj/item/stack/sheet/mineral/plastic = 1 + ) + +/datum/spacevine_mutation/mineral/wood + name = "wooden" + hue = "#442200" + mineral_results = list( + /obj/item/stack/sheet/wood = 1 + ) + // SPACE VINES (Note that this code is very similar to Biomass code) /obj/effect/spacevine name = "space vines" @@ -338,9 +391,15 @@ text += " vine." to_chat(user, text) -/obj/effect/spacevine/Destroy() +/obj/effect/spacevine/proc/wither() for(var/datum/spacevine_mutation/SM in mutations) SM.on_death(src) + qdel(src) + + +/obj/effect/spacevine/Destroy() + for(var/datum/spacevine_mutation/SM in mutations) + SM.on_deletion(src) if(master) master.vines -= src master.growth_queue -= src @@ -349,6 +408,7 @@ KZ.mutations |= mutations KZ.set_potency(master.mutativeness * 10) KZ.set_production((master.spread_cap / initial(master.spread_cap)) * 5) + qdel(master) master = null mutations.Cut() set_opacity(0) @@ -366,7 +426,7 @@ override += SM.on_chem(src, R) if(!override && istype(R, /datum/reagent/glyphosate)) if(prob(50)) - qdel(src) + wither() /obj/effect/spacevine/proc/eat(mob/eater) var/override = 0 @@ -375,7 +435,7 @@ if(!override) if(prob(10)) eater.say("Nom") - qdel(src) + wither() /obj/effect/spacevine/attackby(obj/item/weapon/W, mob/user, params) if (!W || !user || !W.type) @@ -388,12 +448,12 @@ for(var/obj/effect/spacevine/B in orange(1,src)) B.health = health - force if(B.health < 1) - qdel(B) + wither() health = health - force if(health < 1) - qdel(src) + wither() return @@ -408,7 +468,7 @@ health = health - force if(health < 1) - qdel(src) + wither() ..() @@ -482,7 +542,7 @@ SM.on_birth(SV) /obj/effect/spacevine_controller/process() - if(!vines) + if(!vines || !vines.len) qdel(src) //space vines exterminated. Remove the controller return if(!growth_queue) @@ -570,14 +630,14 @@ for(var/datum/spacevine_mutation/SM in mutations) i += SM.on_explosion(severity, src) if(!i && prob(100/severity)) - qdel(src) + wither() /obj/effect/spacevine/temperature_expose(null, temp, volume) var/override = 0 for(var/datum/spacevine_mutation/SM in mutations) override += SM.process_temperature(src, temp, volume) if(!override) - qdel(src) + wither() /obj/effect/spacevine/CanPass(atom/movable/mover, turf/target, height=0) if(isvineimmune(mover)) From 31417488c47e8baad018c3f7b1395acb283824aa Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Sun, 26 Feb 2017 09:43:00 -0800 Subject: [PATCH 12/31] Adds hooks in Adjust*Loss to support autopsy --- code/modules/mob/living/carbon/human/human_damage.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 4cf009ec44f..1f8d86c6c15 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -88,19 +88,19 @@ return amount -/mob/living/carbon/human/adjustBruteLoss(amount) +/mob/living/carbon/human/adjustBruteLoss(amount, damage_source) if(species) amount = amount * species.brute_mod if(amount > 0) - take_overall_damage(amount, 0) + take_overall_damage(amount, 0, used_weapon = damage_source) else heal_overall_damage(-amount, 0) -/mob/living/carbon/human/adjustFireLoss(amount) +/mob/living/carbon/human/adjustFireLoss(amount, damage_source) if(species) amount = amount * species.burn_mod if(amount > 0) - take_overall_damage(0, amount) + take_overall_damage(0, amount, used_weapon = damage_source) else heal_overall_damage(0, -amount) @@ -394,4 +394,4 @@ This function restores all organs. // Will set our damageoverlay icon to the next level, which will then be set back to the normal level the next mob.Life(). updatehealth() - return 1 \ No newline at end of file + return 1 From 66ee1659b6d8b624ed2ed0f05e78d976dac0cb3e Mon Sep 17 00:00:00 2001 From: Kyep Date: Sun, 26 Feb 2017 21:40:46 -0800 Subject: [PATCH 13/31] Post-PR-3 bugfix & rebalance pass Changes: 1) Fixes wireless AEGs being able to be recharged in conventional rechargers. This prevents people with recharger access using them as regular laserguns. 2) Fixes spiderlings from dying Mother of Terrors lingering around for a long time. Now, they're forced to ventcrawl immediately if they can. 3) Improves queen health regen. She was regularly getting picked off by one guy with a gun or two. 4) Queen and Mother now gain vent smash ability. Given how often the crew welds literally every vent, this is necessary to avoid them being totally shut out of the vent system in the late game. 5) Prince loses vent smash ability. Instead, he gets the ability to spin thicker (vision-blocking) webs, and +10 melee damage. 6) Fixes 'evil looking spiderling' meta by requiring that queen has laid at least 10 eggs before the ability is usable, so newbie queens don't use it first thing and instantly get discovered/swarmed. 7) Adds confirmation prompt to queen nesting. Queens will no longer be confused about why the cannot ventcrawl after nesting. 8) Reduces the chances of terror spiderlings skittering onto space tiles. Makes them less likely to space themselves. 9) Tweaks TS event by increasing timer, and having one of the possible infestation types spawn 4, rather than 3, green terrors. --- .../mission_code/UO71-terrorspiders.dm | 1 + code/modules/events/spider_terror.dm | 4 +-- .../hostile/terror_spiders/actions.dm | 29 ++++++++++++++----- .../hostile/terror_spiders/mother.dm | 6 ++++ .../hostile/terror_spiders/prince.dm | 11 ++++--- .../hostile/terror_spiders/queen.dm | 17 ++++++++--- .../hostile/terror_spiders/reproduction.dm | 7 +++-- 7 files changed, 53 insertions(+), 22 deletions(-) diff --git a/code/modules/awaymissions/mission_code/UO71-terrorspiders.dm b/code/modules/awaymissions/mission_code/UO71-terrorspiders.dm index a3b8db53bf2..52d8caa6f74 100644 --- a/code/modules/awaymissions/mission_code/UO71-terrorspiders.dm +++ b/code/modules/awaymissions/mission_code/UO71-terrorspiders.dm @@ -186,6 +186,7 @@ force = 10 origin_tech = null selfcharge = 1 + can_charge = 0 var/inawaymission = 1 /obj/item/weapon/gun/energy/laser/awaymission_aeg/process() diff --git a/code/modules/events/spider_terror.dm b/code/modules/events/spider_terror.dm index 2623bad0cfe..aed998713c2 100644 --- a/code/modules/events/spider_terror.dm +++ b/code/modules/events/spider_terror.dm @@ -1,6 +1,6 @@ /datum/event/spider_terror - announceWhen = 120 + announceWhen = 240 var/spawncount = 1 /datum/event/spider_terror/setup() @@ -22,7 +22,7 @@ switch(infestation_type) if(1) spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/green - spawncount = 3 + spawncount = 4 if(2) spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/white spawncount = 2 diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm index 276fb905a7b..9547fa23b61 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm @@ -7,7 +7,7 @@ /datum/action/innate/terrorspider/web/Activate() var/mob/living/simple_animal/hostile/poison/terror_spider/user = owner - user.Web() + user.Web(0) /datum/action/innate/terrorspider/wrap name = "Wrap" @@ -32,14 +32,25 @@ // ---------- PRINCE ACTIONS -/datum/action/innate/terrorspider/princesmash +/datum/action/innate/terrorspider/thickweb + name = "Thick Web" + icon_icon = 'icons/effects/effects.dmi' + button_icon_state = "stickyweb2" + +/datum/action/innate/terrorspider/thickweb/Activate() + var/mob/living/simple_animal/hostile/poison/terror_spider/user = owner + user.Web(1) + +// ---------- BOSS ACTIONS + +/datum/action/innate/terrorspider/ventsmash name = "Smash Welded Vent" icon_icon = 'icons/atmos/vent_pump.dmi' button_icon_state = "map_vent" -/datum/action/innate/terrorspider/princesmash/Activate() - var/mob/living/simple_animal/hostile/poison/terror_spider/prince/user = owner - user.DoPrinceSmash() +/datum/action/innate/terrorspider/ventsmash/Activate() + var/mob/living/simple_animal/hostile/poison/terror_spider/user = owner + user.DoVentSmash() // ---------- QUEEN ACTIONS @@ -50,7 +61,7 @@ /datum/action/innate/terrorspider/queen/queennest/Activate() var/mob/living/simple_animal/hostile/poison/terror_spider/queen/user = owner - user.NestMode() + user.NestPrompt() /datum/action/innate/terrorspider/queen/queensense name = "Hive Sense" @@ -81,7 +92,7 @@ // ---------- WEB -/mob/living/simple_animal/hostile/poison/terror_spider/proc/Web() +/mob/living/simple_animal/hostile/poison/terror_spider/proc/Web(var/thick = 0) var/turf/mylocation = loc visible_message("[src] begins to secrete a sticky substance.") if(do_after(src, delay_web, target = loc)) @@ -96,6 +107,8 @@ else var/obj/effect/spider/terrorweb/W = new /obj/effect/spider/terrorweb(loc) W.creator_ckey = ckey + if(thick) + W.opacity = 1 /obj/effect/spider/terrorweb name = "terror web" @@ -214,7 +227,7 @@ busy = 0 stop_automated_movement = 0 -/mob/living/simple_animal/hostile/poison/terror_spider/prince/proc/DoPrinceSmash() +/mob/living/simple_animal/hostile/poison/terror_spider/proc/DoVentSmash() for(var/obj/machinery/atmospherics/unary/vent_pump/P in view(1,src)) if(P.welded) P.welded = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm index 8e3f5ee20cd..fa162ab8848 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm @@ -25,7 +25,12 @@ spider_tier = TS_TIER_3 spider_opens_doors = 2 var/canspawn = 1 + var/datum/action/innate/terrorspider/ventsmash/ventsmash_action +/mob/living/simple_animal/hostile/poison/terror_spider/mother/New() + ..() + ventsmash_action = new() + ventsmash_action.Grant(src) /mob/living/simple_animal/hostile/poison/terror_spider/mother/death(gibbed) if(canspawn) @@ -38,6 +43,7 @@ else if(prob(10)) S.grow_as = pick(/mob/living/simple_animal/hostile/poison/terror_spider/black, /mob/living/simple_animal/hostile/poison/terror_spider/green) S.amount_grown = 50 // double speed growth + S.immediate_ventcrawl = 1 visible_message("[src] breaks apart, the many spiders on its back scurrying everywhere!") degenerate = 1 ..() diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm index b18f1c18492..40e6515668f 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm @@ -19,8 +19,8 @@ maxHealth = 600 // 30 laser shots health = 600 regen_points_per_hp = 6 // double the normal - IE halved regen speed - melee_damage_lower = 20 - melee_damage_upper = 30 + melee_damage_lower = 30 + melee_damage_upper = 40 move_to_delay = 4 // faster than normal ventcrawler = 0 ai_ventcrawls = 0 @@ -29,13 +29,12 @@ idle_ventcrawl_chance = 0 spider_tier = TS_TIER_3 spider_opens_doors = 2 - var/datum/action/innate/terrorspider/princesmash/princesmash_action - + var/datum/action/innate/terrorspider/thickweb/thickweb_action /mob/living/simple_animal/hostile/poison/terror_spider/prince/New() ..() - princesmash_action = new() - princesmash_action.Grant(src) + thickweb_action = new() + thickweb_action.Grant(src) /mob/living/simple_animal/hostile/poison/terror_spider/prince/death(gibbed) if(!hasdied) diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm index 3c7a9ca5677..e4a6a5da3cd 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm @@ -18,6 +18,7 @@ icon_dead = "terror_queen_dead" maxHealth = 200 health = 200 + regen_points_per_tick = 3 melee_damage_lower = 10 melee_damage_upper = 20 move_to_delay = 15 // yeah, this is very slow, but @@ -30,7 +31,7 @@ var/neststep = 0 var/hasnested = 0 var/spider_max_per_nest = 20 // above this, queen stops spawning more, and declares war. - var/canlay = 0 // main counter for egg-laying ability! # = num uses, incremented at intervals + var/canlay = 4 // main counter for egg-laying ability! # = num uses, incremented at intervals var/eggslaid = 0 var/spider_can_fakelings = 3 // spawns defective spiderlings that don't grow up, used to freak out crew, atmosphere idle_ventcrawl_chance = 0 @@ -47,12 +48,14 @@ var/datum/action/innate/terrorspider/queen/queensense/queensense_action var/datum/action/innate/terrorspider/queen/queeneggs/queeneggs_action var/datum/action/innate/terrorspider/queen/queenfakelings/queenfakelings_action - + var/datum/action/innate/terrorspider/ventsmash/ventsmash_action /mob/living/simple_animal/hostile/poison/terror_spider/queen/New() ..() queennest_action = new() queennest_action.Grant(src) + ventsmash_action = new() + ventsmash_action.Grant(src) spider_myqueen = src if(spider_awaymission) spider_growinstantly = 1 @@ -160,8 +163,6 @@ if(prob(20)) var/obj/effect/spider/eggcluster/terror_eggcluster/N = locate() in get_turf(src) if(!N) - if(!spider_awaymission) - QueenFakeLings() spider_lastspawn = world.time DoLayTerrorEggs(/mob/living/simple_animal/hostile/poison/terror_spider/red, 2, 1) neststep = 5 @@ -215,6 +216,11 @@ DoLayTerrorEggs(/mob/living/simple_animal/hostile/poison/terror_spider/purple, 2, 0) neststep = 6 +/mob/living/simple_animal/hostile/poison/terror_spider/queen/proc/NestPrompt() + var/confirm = alert(src, "Are you sure you want to nest? You will be able to lay eggs, and smash walls, but not ventcrawl.","Nest?","Yes","No") + if(confirm == "Yes") + NestMode() + /mob/living/simple_animal/hostile/poison/terror_spider/queen/proc/NestMode() queeneggs_action = new() queeneggs_action.Grant(src) @@ -316,6 +322,9 @@ C.toggle_cam(src, 0) /mob/living/simple_animal/hostile/poison/terror_spider/queen/proc/QueenFakeLings() + if(eggslaid < 10) + to_chat(src, "You must lay at least 10 eggs before doing this.") + return if(spider_can_fakelings) spider_can_fakelings-- var/numlings = 15 diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/reproduction.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/reproduction.dm index 4e58a858504..f6188ced362 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/reproduction.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/reproduction.dm @@ -15,6 +15,7 @@ var/spider_myqueen = null var/use_vents = 1 var/list/enemies = list() + var/immediate_ventcrawl = 0 /obj/effect/spider/spiderling/terror_spiderling/New() ..() @@ -73,8 +74,10 @@ var/list/nearby = oview(10, src) if(nearby.len) var/target_atom = pick(nearby) - walk_to(src, target_atom) - else if(prob(10) && use_vents) + if(!istype(get_turf(target_atom),/turf/space)) + walk_to(src, target_atom) + else if(immediate_ventcrawl || (prob(10) && use_vents)) + immediate_ventcrawl = 0 for(var/obj/machinery/atmospherics/unary/vent_pump/v in view(7,src)) if(!v.welded) entry_vent = v From a59cc3c15f7702b13bf2440b9178d36792e063d7 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 27 Feb 2017 12:37:18 +0000 Subject: [PATCH 14/31] adds wood planks to Cargo ordering Only 30, and 15 points, which is more expensive than metal. Wood in space is rare! --- code/datums/supplypacks.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index b5fe11fc096..ff754661c19 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1149,6 +1149,13 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 10 containername = "glass sheets crate" +/datum/supply_packs/materials/wood30 + name = "30 Wood Planks Crate" + contains = list(/obj/item/stack/sheet/wood) + amount = 30 + cost = 15 + containername = "wood planks crate" + /datum/supply_packs/materials/cardboard50 name = "50 Cardboard Sheets Crate" contains = list(/obj/item/stack/sheet/cardboard) From 297c516dba9ec7117f63fd914ba72849fd50a962 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Mon, 27 Feb 2017 12:29:18 -0500 Subject: [PATCH 15/31] fixes --- .../MetaStation/MetaStation.v41A.II.dmm | 17 ++-- _maps/map_files/MetaStation/z2.dmm | 85 ++++++++++++++++--- 2 files changed, 79 insertions(+), 23 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm index 849c3f04e91..11ae35502bf 100644 --- a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm +++ b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm @@ -1134,11 +1134,11 @@ "avP" = (/obj/machinery/computer/podtracker,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/engine/mechanic_workshop) "avQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "avR" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/light,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"avS" = (/obj/machinery/door/airlock/glass{name = "space-bridge access"},/obj/machinery/door_control{id = "supplybridge"; name = "Shuttle Bay Space Bridge Control"; pixel_x = 0; pixel_y = 27; req_access_txt = "0"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/fpmaint2{name = "Port Maintenance"}) +"avS" = (/obj/machinery/door/airlock/glass{name = "space-bridge access"},/obj/machinery/door_control{id = "supplybridge"; name = "Shuttle Bay Space Bridge Control"; pixel_x = 0; pixel_y = 27; req_access_txt = "0"; req_one_access_txt = "48;50"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "avT" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "avU" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "avV" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"avW" = (/obj/machinery/door/airlock/glass{name = "space-bridge access"},/obj/machinery/door_control{id = "supplybridge"; name = "Shuttle Bay Space Bridge Control"; pixel_x = 0; pixel_y = 27; req_access_txt = "0"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/fpmaint2{name = "Port Maintenance"}) +"avW" = (/obj/machinery/door/airlock/glass{name = "space-bridge access"; req_one_access_txt = "48;50"},/obj/machinery/door_control{id = "supplybridge"; name = "Shuttle Bay Space Bridge Control"; pixel_x = 0; pixel_y = 27; req_access_txt = "0"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "avX" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/machinery/light,/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "avY" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "avZ" = (/obj/machinery/door/airlock/maintenance_hatch{name = "Supply Bay Bridge Access"; req_access_txt = "0"; req_one_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) @@ -2758,8 +2758,8 @@ "bbb" = (/obj/structure/stool/bed/chair/office/dark,/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor/plasteel,/area/security/checkpoint/supply{name = "Security Post - Cargo"}) "bbc" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/machinery/computer/security/mining,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/security/checkpoint/supply{name = "Security Post - Cargo"}) "bbd" = (/obj/effect/spawner/window,/turf/simulated/floor/plating,/area/hallway/primary/port) -"bbe" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{icon = 'icons/obj/doors/Doorminingglass.dmi'; name = "Primary Tool Storage"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "brown"},/area/storage/primary) -"bbf" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{icon = 'icons/obj/doors/Doorminingglass.dmi'; name = "Primary Tool Storage"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plasteel{dir = 1; icon_state = "brown"},/area/storage/primary) +"bbe" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Primary Tool Storage"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/plasteel,/area/storage/primary) +"bbf" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_engineering{name = "Engineering Foyer"; req_access_txt = "0"; req_one_access_txt = "32;19;70"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel,/area/engine/break_room) "bbg" = (/obj/structure/closet/firecloset,/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/hallway/primary/central) "bbh" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/closet/emcloset,/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/hallway/primary/central) "bbi" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plasteel{tag = "icon-vault"; icon_state = "vault"},/area/hallway/primary/central) @@ -3661,7 +3661,7 @@ "bsu" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plasteel{dir = 8; icon_state = "cautioncorner"},/area/hallway/primary/starboard) "bsv" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/hallway/primary/starboard) "bsw" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/sortjunction{dir = 8; icon_state = "pipe-j2s"; sortType = 6},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor/plasteel{dir = 4; icon_state = "cautioncorner"},/area/hallway/primary/starboard) -"bsx" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_engineering{name = "Engineering Foyer"; req_access_txt = "0"; req_one_access_txt = "32;19"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel,/area/engine/break_room) +"bsx" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry{name = "Arrivals"}) "bsy" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/engine/break_room) "bsz" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 2},/turf/simulated/floor/plasteel,/area/engine/break_room) "bsA" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plasteel,/area/engine/break_room) @@ -8425,7 +8425,6 @@ "dgm" = (/obj/effect/decal/warning_stripes/yellow/hollow,/obj/structure/closet/emcloset,/obj/item/weapon/tank/emergency_oxygen,/obj/item/clothing/mask/breath,/turf/simulated/floor/plasteel,/area/hallway/secondary/entry{name = "Arrivals"}) "dgn" = (/obj/structure/table,/obj/item/device/flashlight,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/stock_parts/cell,/turf/simulated/floor/plasteel,/area/hallway/secondary/entry{name = "Arrivals"}) "dgo" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plasteel,/area/hallway/secondary/entry{name = "Arrivals"}) -"dgp" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry{name = "Arrivals"}) "dgq" = (/obj/effect/decal/warning_stripes/yellow/hollow,/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plasteel,/area/hallway/secondary/entry{name = "Arrivals"}) "dgr" = (/turf/simulated/wall/r_wall,/area/hallway/secondary/entry{name = "Arrivals"}) "dgs" = (/obj/effect/decal/warning_stripes/south,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry{name = "Arrivals"}) @@ -8581,7 +8580,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqabqaWDaWEaWFaWGaWDaHkaLCaMLaWHaWIaWJaLBaLBaLBaLBaUYaWKaHkazSapdalLaaaaMNaOnaMOaMOaMOaMOaMNaKpaKlaKlaWLaPIaRoaRoaRpaRoaOuaVjaWMaWNaVlaWOaWPaWQaWRapfazMaOAaWSaWTaWTaWUaWVaRuaUgaWWaOFabqaOGaOGaOGaWXaWYaWZaOGaOGaOGabqaMfaOHaXaaMjaXbaXcaVEaVEaVEaXdaVEaVEaXeaNCaXbaQCaXfaXgaXhaToaUiaToaTnaTpaToaXjaToaXkaTpaTqaToaTqaTpaXlaXmaNQaXnaXoaXpaXqaXraPiaQQaNQaXsaGWaxhaXtaXuaXvaXwaXxaXyaXzaXAaXBaXCaXDaXDaXEaXFaHhaHiaDLarAdeaaMJdebaMJaMJdebaMJaMJdebaMJaMJdecabqaCgaDoabqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqaaaaaaaaaaaaaaaabdaaabgMbdMbeWbeXbeXaXLaXLaXLaXLbfabpvaXLaXLaXLbeXbeXbeYbdMbMnaaaabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqaaaaWDaXPaXQaXRaXSaHkaXTaMLaXUaXVaXWaMLaMLaMLaXXaXYaXZaHkaYaaYbapfabqaYcaYdaMOaMOaMOaYeaYfabqabqaKlaWLaYgaPJaPKaYhaYiaYjaYkaYlaYmaYnaYnaYnaYnaYnapfaYoaYpaYqaYraYraYsaYtaYuaYvaYwaUoaaaaaaaaaaOGaOGaYyaOGaOGaaaaaaaaaaKoaNraYzaMjaYAaYBaYCaYDaYEaNCaNCaYFaYGaNCaYAaQCaYHaYIaYJaYKaYLaYKaYMaYNbmLaYPaYKaYKaYKaYKaYKaYKaYQaYRaYSaNQaNQaNQaNQaYTaNQaNQaNQaNQaoGaGWaxhaYVaYUaYUaSTaYWaYXaYYaYZaZaaZbaZcaZdaZeaZfaFXaZgaCgaaaabqabqaaaaaaaaaaaaabqaaaaaaabqabqarAaDiaCgaDoabqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdclHbcbbfcbfbbgNaXLaXLbdIbdIbdIbgPbgObdIbdIaXLaXLbgNbgQbgSbgRaWCabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqaaaaWDaWDaZiaZjaWDaWDaWDaZkaWDaWDaZlaZmaWDaWDaWDaZnaWDaWDaZoapfapfabqaZpaZqaZraZraZraZqaZsabqabqaZtaZuaPIaRoaRoaRpaRoaOuaZvaOuaZwaYnaZxaZyaZzaZAapfazSaOAaZBaZCaZDaZEaZFaZGaZHaZIaOFaZJaUraZJaZLaZMaZNaZOaZLaZJaUraZJaMfaZPaZQaZRaZSaMkaMkaMkaMkaZTaZUaZVaNCaZWaMkaQCaZXaTraZYaZZaZZaZZaZZaoGaoGaoGbaababbacbadbaebafaZZbagbagaoGbahazAazybaiazybajazybakazybalaxhbambambambambanbaobapbaqbarbasbataIvbaubavaCgaCgaCgabqabqbawbaxaDiaDiaDiaDiaDiaDibawaDibayaCgaCgaDoabqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqaaaaaaaaaaaaaaaaaaabdaXHbgTbicbeXbeXaXLbdIbidbifbiebihbigbiibidbdIaXLbeXbeXbijbgTaXOabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqaaaaaaaUNbaAbaBbaCbaDbaEbaBbaFbaGbaHbaGbaIbaJbaGbaKbaLbaMbaNbaOapfaaaaaabaPbaQbaQbaQbaRaaaabqaZtbaSaWLaPIaRoaRobaTbaUaOubaVbaWbaXbaYbaZbbabbbbbcapfazSaOAaOAaOAaKqaKqaUuaOFbbebbfaOFbbgbbhbbiaZLbbjbbkbblaZLbbmbbnbbobbpbbqbbrbbsbbtbbubbvbbwaMkaMkaYAaLLaYAaMkaMkaUibbybbzaUibbAbbBbbCbbDbbEbbFaoGaoGaoGaoGbbGaoGaoGaoGaoGaoGaoGaGWasIasJbbHbbHbbHbbHbbHbbHbbHbambbIbbJbbKbamaUwbbMbambbNbbOaFRaFRbbPbbQbbRaDfbbSaDfbbTaDibbUaDiaCiaCjbbVaCjaClaDibbUaDiaCmaDnaDoabqabqabqabqabqabqabqabqabqabqabqabqabqabqabqabqabqabqabqabdaXHbdMbeWbeXaXLaXLbdIbikbilbdLbnQbimbjPbjObdIaXLaXLbeXbeYbdMaXOabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqaaaaaaaUNbaAbaBbaCbaDbaEbaBbaFbaGbaHbaGbaIbaJbaGbaKbaLbaMbaNbaOapfaaaaaabaPbaQbaQbaQbaRaaaabqaZtbaSaWLaPIaRoaRobaTbaUaOubaVbaWbaXbaYbaZbbabbbbbcapfazSaOAaOAaOAaKqaKqaUuaOFbbebbeaOFbbgbbhbbiaZLbbjbbkbblaZLbbmbbnbbobbpbbqbbrbbsbbtbbubbvbbwaMkaMkaYAaLLaYAaMkaMkaUibbybbzaUibbAbbBbbCbbDbbEbbFaoGaoGaoGaoGbbGaoGaoGaoGaoGaoGaoGaGWasIasJbbHbbHbbHbbHbbHbbHbbHbambbIbbJbbKbamaUwbbMbambbNbbOaFRaFRbbPbbQbbRaDfbbSaDfbbTaDibbUaDiaCiaCjbbVaCjaClaDibbUaDiaCmaDnaDoabqabqabqabqabqabqabqabqabqabqabqabqabqabqabqabqabqabqabqabdaXHbdMbeWbeXaXLaXLbdIbikbilbdLbnQbimbjPbjObdIaXLaXLbeXbeYbdMaXOabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqabqaaaaUNbcdbcebcebcfbcebcebcebcgbchbcibcjbckbckbckbclbcmbcnbcoapfaaaaaaabqabqaaaaaaabqabqabqaZtbcpbcqbcrbcsaRobctbcubcvbcwbcxbcybczbcAbcBbcCbcDapfbcEbcFbcGbcHbcIbcJbcKbcLbcMbcNbcObcPbcQbcPbcRbcSbcTbcUbcVbcPbcWbcXbcXbcYbcZbdabcXbcXbdbbdcbdcbdcbddbdebdcbdcbdfbdcbdgbdhbdcbdcbdcbdibdjaoGbdkbdlbdmbdnbdobdpbdobdqbdobdrazBbakbalaubasJbbHbdsbdtbdubdvbdwbdxbambdybdzbdzbdAbdzbdBbambdCbarbdDbdEbdEbdEbdEbdEbdFaCgbdGaCjbdHaCjaDmaCgaCgaCgbdGaCjaDmaCmaCmaCgabqabqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdaXHbdMbeWbeXaXLaXLbdIbjQbilbdIbjRbdIbjTbjSbdIbdIaXLbeXbeYbdMaXOabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqabqaUNaUNbdQaUNaWDaUNbdRaUNbcdbcebdSbdTaUNbdRaUNbdUbdVbdWbdXapfapfapfapfalLalLalLapfapfapfaZtbdYbdZbdZbdZbdZbeaaRobebbecbedbeeaYnaYnaYnaYnaWjapfapfbegapfapfbehbeibejbekbelbembenbekbelbeobepbembeqbekbekbekbelbekbekberbesbekbekbekbekbekbekbekbetbeubekbekbenbevbewbekbekbekbekbexbeybezbezbezbeAbezbezbezaoGbmMaoGaGWaoGaoGbeCbeCbeCbeCbeDbeEbeEbeFbeGbeHbambeIbeJbeKbmNbeMbeNbambeObePbeQbdEbeRbeSbeTbdEbeUaCgaCgaCgaCgaCgaCgaCgbeVaCgaCgaCgaCgaCgaLwaCgabqarBbjUabqabqabqabqabqabqabqabqabqabqabqabqabqabqabqabqabqabdaXHbdMbeWbeXaXLaXLbjWbjVbjYbjXblFblDblIblGblJbdIaXLbeXbeYbdMaXOabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqaaaaUNabqaaaabqaaaaUNbfdaUNbfebfebffbfgaUNbfdaUNaUNaWDbfhbfibfjavTavUbfkavUbflavUbfmbfnavVbfobfpbfqbfqbfrbfsbftbfubfvbfwbfxbfybfwbfzbfAbfwbfBbfCbfDbfEbfFbfGbfHbfIbfJbfKbfKbfLbfMbfNbfObfPbfQbfRbfSbfSbfSbfSbfSbfSbfSbfTbfUbfVbfVbfVbfVbfVbfVbfVbfVbfWbfXbfYbfZbfVbgabfWbfVbfVbgbbgcbgdbezbgebgfbggbghbgibezbgjbmOaoGbglaoGaaabeCbgmbgnbeCbgobgpbgqbgrbgsbgtbambgubgvbgwbgxbmPbgzbambgAbgBbgCbdEbgDbgEbgFbdEbgGaOdaOdbgHaOdbgIaOdaOdaOdbgJaOdbgKbgLbgKbgLaefaefaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdabdaXHbdMbeWbeXaXLaXLbdIblKbilbdIblLbdIbjTbjSbdIbdIaXLbeXbeYbdMaXOabdabdabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -8591,7 +8590,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaablOblPblQblRbkbblSblTblSblTblSblTblSbkbblUbnFaUNbgVblWbgXblXblYblZbmabmbbmcbgXbmdbmebmfbmgbmhbmibmjbmkbmlbmmbmnbmobmpbmqbmrbmsbmtbmubmvbmwbmxbmybmzbmAbiVbfIbmSbhqbmQbmCbmDbmEbhqbmFbmGbjeabqabqbkXboBbopbpVboHbqfbqdbqhbqgbqkbqjbqlbkYabqabqbhwbmUbmVbmWbmXbmYbmZbnabhwbhybnbbncbndbnebnfbnebngbnhbnibnebnebnebnjbnebnkbnlbnmbnnbnebnebnobnkbngbnjbnpbnqbnobnrbnsbntbnubnvbnwbnxbnybnzbnAbnBbnCbnDblidfmdftdfqdfxdfudfydeZaoNdflabqaaaaaaaaaaWwaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqaaaaaaaaaaWwbnRblEbnKbrgbrhbeWbrjbeXaXLaXLbdIbrlbrmbifbrIbrnbrQbrKbdIbdIaXLbeXbeXbeXbeYbrfaXOabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabiqbkbbkbbipbkbblSblTblSbnVblSblTblSbkbblUbnFaUNbnWbnXbnYbnZboablkaUtblkbiubiubodboebhcbfwbofbogbohboibojbokbolbfwbombonbojbkCboobfwbrXboqborbosbotbbdbkIbfIbkJbhqboubovbowboxbhqboybozbjebkWblrbkWbsbboCboDboEboDboFboDboEboDboGbscbkWblrbkWbhwboIboIboIboJboKboLboMbhwboNboOboPboQboRboSboRboTboRboUboRboRboRboVboRboWboXboYboZboRboRbpabpbbpcboVbpdboVbpebpfbpgbntbphbpibpibpjbpkbpibpidfzdfBdfAdfGdfDdfIdfHdfKdfJdgddfLdgKazDabqaaaaaaaaaabqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqbpraaaaaaaaaabqbsdbsdblMbsebsfbeWbsnaXLaXLaXLbsMbdIblHblHbsObdIbdIbdIbdIbrkaXLaXLaXLbeXbeYbdMaXOabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaablObpwbpxblRbkbblSblTblSblTblSblTblSbkbblUbnFaUNbpybpzbpAbpBbpCbpDbpDbpEbpFbpBbpGbpHbpIbfwbpJbpKbpLbpMbpNbpObpPbfwbpQbpRbpSbpTbpUbfwbsibpWbpXbpYbpZbfGbqabjnbqbbqcbqcbqcbqcbqcbhtbtPbqebhtbkWbtSbtRbtTboEboEboEboEbqiboEboEboEboEbtZbtYbubbkWbqmbqnbqobqpbqqbqrbqrbqsbhwbqtbqubqvbqwbqxbqybqxbqzbqxbqAbqxbqxbqBbqxbqxbqCbqDbqxbqEbqBbqFbqGbqCbqHbqxbqIbqJbqKbqLbqMblsbqObqPbqQbqRbpnbqSbqSbqTdgMdgLdgOdgNdgPanqanqanqanqanqanqanqanqabqabqabqabqabqabqabqabqabqabqabqabqabqabqabqabqabqabqaaaabqbsPbsRbsQbsSbrdcKIaXNbsfbsTbsUaXLbsWbsVbsXbribsZbsYbtbbtabtcbrkbtebtdbtgbtfaXLbeXbeYbdMaXOabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabrobiobiobjZbrpbkbbrqbkbbrrbrsbkbbrtbkbbkibruaUNbgVbrvbrwbrxbrybrzbrAbrBbrCbrxbrDbrEbrFbfwbrGaXibrHblvbfwbfwbfwbfwbfwaXibrJblxbfwbfwbbdbrLbrMbbdbbdbzObehbfIbrObqcbrPbumbrRbqcbrSbrTbrUbrVbrWburbrYbrZbsabsabvWbwfbwebvWbvWbsabsabsgbshbwgbkWbhwboIboIboIbsjboIboIboIbhwbskbfIbslbZiblCbsoblCbsmbspbspbspbspbspbspaoGaoGbsqaoGaoGaoGbsrbmBaoGaoGaoGbstaoGbsubsvbswbsxbsybszbsAbsBbqSbsCbsCbsDbqUbsEbjNbntbsFbsGbsHbsIbsJbsJbsKbsLabqaaaaaaabqaaaaaaaaaaaaaaaaaaabqaaaaaaaaaaaaaaaaaaabqaaaaaabuLbudbuMabqbuObuNbuQbuPbuSbuRbuTbBebuVbuUbuWbribuYbuXbvabuZbvcbvbbvebvdbvgbvfaXLbvhbvibdMaXOabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabrobiobiobjZbrpbkbbrqbkbbrrbrsbkbbrtbkbbkibruaUNbgVbrvbrwbrxbrybrzbrAbrBbrCbrxbrDbrEbrFbfwbrGaXibrHblvbfwbfwbfwbfwbfwaXibrJblxbfwbfwbbdbrLbrMbbdbbdbzObehbfIbrObqcbrPbumbrRbqcbrSbrTbrUbrVbrWburbrYbrZbsabsabvWbwfbwebvWbvWbsabsabsgbshbwgbkWbhwboIboIboIbsjboIboIboIbhwbskbfIbslbZiblCbsoblCbsmbspbspbspbspbspbspaoGaoGbsqaoGaoGaoGbsrbmBaoGaoGaoGbstaoGbsubsvbswbbfbsybszbsAbsBbqSbsCbsCbsDbqUbsEbjNbntbsFbsGbsHbsIbsJbsJbsKbsLabqaaaaaaabqaaaaaaaaaaaaaaaaaaabqaaaaaaaaaaaaaaaaaaabqaaaaaabuLbudbuMabqbuObuNbuQbuPbuSbuRbuTbBebuVbuUbuWbribuYbuXbvabuZbvcbvbbvebvdbvgbvfaXLbvhbvibdMaXOabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabrobiobthbiobiqbiobiobiqbiobipbtibtjaWDbvjbtlbtmbfGbtnbtobtpbtobtqbfGbtrbtsbttbtubtvbtwbtxbtybtzbtwbtAbtBbtwbtvbtvbtCbtvbtDbtEbtFbtGbtHbtvbtIbtJbtKbkJbobbtMbtNbtObqcbjebjebjebjebkWbwmbtQboEboEboEbtUboEbtVbtWbtXboEboEbwnbuabAkbucbhwbwobuebufbugbuhboIbuibhwbujbfIbukboAdedbunbuobsmbupbuqbwpbusbutbuubuvbuwbuxaoGbuybuzbuAbuBbuCaoGaxcbuDaoGbuEbuFbuGbqNbuHbuHbuHbuIbuJbqSbqSbuKbvlbvkbvnbvmbvpbvobvrbvqbvsbvsbvvbvtbvwbvwbvwbxlbxmbvwbvwbvwbvwbvwbxlbvwbvwbvwbvwbvwbvwbxlbvwbxmbxobxnbxpbxpbxrbxqbxtbxsbxvbxubxxbxwbxzbxybxBbxAbxDbxCbzebxEbzgbzfbzjbzibzlbzkbznbzmbzpbzoaWCabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqabqabqabqabqaaaaUNbdRaUNaUNaUNaUNaUNaUNbdRaUNaaaaWDbzqbzsbzrbfGbvAbvBbvCbvBbvDbfGbvEbvFbvGbvHbvHbvIbvJbvHbvHbvKbvLbvMbvNbvHbvHbvObvHbvHbvHbvPbvQbvRbvRbvSbvTbvUbvVbqcbyobvXbvYbqcbvZbwabwbbwcbwdboEbtQboEbypbywbwhbwibwjbwibwkbyJbyxbAbbyQbAkbwqbhwbwrbwsbwtbwubwvbhwbhwbhwbhybwwbwxbsmbwybwzbwAbsmbwBbwCbwDbwEbwFbwGbwHbwIbwJbwKbwLbwMbwNbwObwPbwQbwRbwSaoGbsubwTbwUbntbwVbwWbwXbwYbwZbxabxbbxcbxdbqUbxebxfbxgbxhbxiaWCaaaaaabxjbsNabqaaaaaaabqaaaaaaaaaaaaaaaaaaabqaaaaaaaaaaaaaaaaaaabqaaaaaabxkbztbsLabqbBbbzubBdbBcbBgbBfbBibBhbBnbBjbCWbBobCYbCXbDabCZbDibDcbFdbDjbFfbFeaXLbrcbFgbdMaXOabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqabqaUNabqaaaabqaaaaUNbxGaUNbxHbxIbfebxJaUNbxGaUNaUNaWDbgVbxKbxLbfGbxMbvBbxNbvBbxObfGbxPbxQbxRbxSbxTbxUbxVbxWbxXbxYbxZbyabxTbxTbxTbybbxTbycbydbxVbyebxTbxTbyfbygbyhbvVbqcbyibyjbykbylbymbynbymbymbwdbAjbAebyqbyqbyqbyrbysbytbyubyvbyqbyqbyqbBWbCcbkWbhwbyybyzbyAbyBbyCbhwbyDbyEbyFbyGbwxblCbyHbyIbCdbsmbyKbyLbyMbyNbspbspaoGaoGbyOaoGaoGaoGbyPbCeaoGaoGbyRbySaoGbyTbwTbyUbntbjNbjNbjNbjNbyVbjNbjNbyWbyXbyYbntbntbyZbzabzbbzcaaabqYbzdaaaabqaaaaaaabqabqabqabqabqabqabqabqabqabqabqabqabqabqabqabqaaaaaabxkbBabFkbGNbGMcKIbsebGSbGObrcaXLbsMbsMbsMbribribICbBkbribribrkbrkbrkaXLaXLaXLbeXbeYbdMaXOabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -8609,7 +8608,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqaaaaUNbcdbcebcebcebcedfUdfTdfWdfVdfYdfXdgadfZdgcdgbbTmapfbgYauyatkbFpbHhbTnbHfbHfbTnbTobFpbTparJarLbTqbPQbRHapfbFubTrbzKbTsbTtbTubTvbFwbTwbTxbTybTzbTAbzKbTBbzPbfIbTCbMSbTDbTEbTFbTGbOBbOBbTHbTIbTJbTKbMWbRZbSabSabSabTLbNdbSdbSebTMbTNbTObNhbTPbSibTQbTRbNhbTSbTTbTUbNhbTVbhtbTWbbrbTXbNVbUabUabUbbUcbUdbStbStbUebUfbQIbUgbUhbUibUhbUjbQIbUkbUlbUmbUnbEGbNFbQVbUobUpbUqbQVavBasJasJbUrbCMbSJbUsbUtbCNbCNbCNbUubGGbUvbGGbRgbUwbRibzLabqbGLbGLbGLbGLbGLabqaaaabeaaabFbaaabFcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdaXHbdMbeWbeXbIFbKlbXDbXFbXEbYQbXGcckbZObKlbIFbeXbeYbdMaXOabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqabqaUNaUNbUBbUBaUNaUNbNWaWDdggdgRdggdfNaWDapfbUCapfapfapfbgYauCatkbFpbTobUDbUEbHfbUEbUFbFpbUGathapdatjbUHbXJapfbFuaoXbzKbzKbtkbUIbUJbtkbzKbzKbzKbzKbUKbzKbzKbULbjnbUMbMSbUNbUObUPbUQbURbOBbUSbUTbUUbUVbMWbUWbUXbUYbUZbVabNdbVbbSebVcbVdbVebNhbVfbSibVgbVhbQmcclcdBccmbNhbVmbhtbVnbbrbOWbQvbVtbVqbXcbYtbYsbVubVqbUebVvbQIbVwbVxbVybVzbUjbQIbVAbVBbVCbVDbVEbVFbQVbVGbVHbVIbQVbVJbVKbVLbVMbCMbVNbVObRabVPbCNbVQbSRbGGbSPbVRbVSbVTbPCbHGbIubIvbVUbVVbVWbGLabqaaabFcaaabFbaaabFcaaaaaaaaDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdclHbdMbeWbeXbeXaXLaXLbKlbKlcepbKlbKlaXLaXLbeXbeXbeYbdMaXOabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaDaaaaaaaaaaaaaaaaaaaaaaaaaaaabqaaaaaaaUNbWcbfdaUNdghdgjdgibBtdgkbBtdgldgmapfbWdbWebWfbWgbWhbWgbWibFpbFpbFpbFpbWjbFpbFpbFpbWkdeJdeHapdbWlbWmapfbWnbWobzKbWpbWqbWrbWsbWtbWubWvbzKbWwbWxbWybzKbzPbfIbWzbMSbQdbTEbWAbWBbQdbOBbWCbWDbWEbWFbMWbWGbWHbWIbWJbWKbWLbWMbWNbWObWPbWQbNhbWRbWSbWTbWUbWVbWWbWXbWYbWZbXabhtbXbbbrbOWbQvbYubXdbXdbXebXfbXgbXhbXibXjbQIbXkbVxbXlbXmbXnbQIbXobXpbXqbXrbEGbNFbQVbQVbQVbQVbQVbXsasJasJbXtbCMbVNbVObRabXubXvbVQbXwbInbSPbXxbRgbXybRibzLabqbzLbXzbXAbXBbGLabqaaabFcaaabFbaaabFcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdaXHbdMbeWbeXbeXbeXbeXbIFbIFceqbIFbIFbeXbeXbeXbeXbeYbdMaXOabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqabqabqaUNbUBbUBaUNdgndgjbBtbBtdgobBtdgpdgqapfbXHavUavUavUbDLathatkaoXaqBayBanHbXIauyauCapfapfapfapfapfbXKapfapfbFuatjbzKbXLbXMbXNbXNbWsbXObXPbzKbXQbXRbXSbzKbDQbfIbXTbMSbQdbXUbXVbXWbXXbOBbXYbXZbYabMWbMWbYbbYcbYdbYebYfbNdbYgbSdbYhbYibYjbNhbYkbYlbYmbYnbNUbYobYobYpbNhbYqbhtbYrbbrbOWbQIbYvbYEbYwbStcbacbbbUcbYxbYybYzbYAbYBbYCbYDccrbQIbEGbEGbEGbEGbEGbYFaoGbYGbUraucasJchGchFbYIasJbCMbCMbYJbNRbVPbCNbYKbYLbGGbYMbVRbRgbYNbSUbItbMjbMkbYObVVbYPbGLabqaaabFcaaabFbaaabFcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdaXHbdMbeWbeXbeXbeXbeXbeXbeXbdObeXbeXbeXbeXbeXbeXbeYbdMaXOabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqabqabqaUNbUBbUBaUNdgndgjbBtbBtdgobBtbsxdgqapfbXHavUavUavUbDLathatkaoXaqBayBanHbXIauyauCapfapfapfapfapfbXKapfapfbFuatjbzKbXLbXMbXNbXNbWsbXObXPbzKbXQbXRbXSbzKbDQbfIbXTbMSbQdbXUbXVbXWbXXbOBbXYbXZbYabMWbMWbYbbYcbYdbYebYfbNdbYgbSdbYhbYibYjbNhbYkbYlbYmbYnbNUbYobYobYpbNhbYqbhtbYrbbrbOWbQIbYvbYEbYwbStcbacbbbUcbYxbYybYzbYAbYBbYCbYDccrbQIbEGbEGbEGbEGbEGbYFaoGbYGbUraucasJchGchFbYIasJbCMbCMbYJbNRbVPbCNbYKbYLbGGbYMbVRbRgbYNbSUbItbMjbMkbYObVVbYPbGLabqaaabFcaaabFbaaabFcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdaXHbdMbeWbeXbeXbeXbeXbeXbeXbdObeXbeXbeXbeXbeXbeXbeYbdMaXOabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabredgrdgtdgsdgvdgudgxdgwdgyapfapfapfapfbWmbYRavUbYSbYTbYUbYVbYVdfibYWbYXbYVbYTbYVbYYbYVbYZbYVaPTbZaapdbzKbZbbZcbZdbZebHrbZfbZgbzKbzKbzKbzKbzKbZhbfIbOvdeEbMSbZjbZjbZjbMSbMSbMWbMWbZkbMWbMWbZlbZlbZlbZmbZlbZnbZnbZobZpbZnbZnbNhbNhbNhbNhbNhbNhbZqbZqbZqbNhbZrdeFbZsbbrbZtbZubZvbZvbZvbZwbZvbZvbZxbZybZvbZvbZvbZvbQIbZzbZAbZBbZCbZDbZEasJbZFbZGaoGbVLbZHbZIasJbYHckgasJarrbCMbZJbJWbZKbCNbCNbCNbZLbGGbZMbZNbRgbUwbRibzLabqbGLbGLbGLbGLbGLabqabqbRmabqbPGabqabeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdaXHbdMbKkbvhbvhbvhbvhbvhbvhbdObvhbvhbvhbvhbvhbvhbvibdMaXOabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadgrdgfdgzdgzdgzdgzdgzdgAaaaabqaaabZPbZPbZQbZRbZSapfbZTapfapfapfaYabZUbZUbZUbZUbZUbZUbZUapdbZVbZWbZXbzKbZYbZZcaacabbHrbWscaccadcaeayBapfcafbzPcagcahcaicajcakcakcakcalcamcancaocakcapcaqcaicaicarcascarcarcatcarcaucavcavcawcaxcaycazcaAcaBcakcakcakcaCcaDcavcaEbbrcaFcaGbQAcaIcaJcaKcaLcaMcaNcaKcaOcaQcaPcaRbQIcaScaTcaUcaVcaWcaXcaYbZGcaZaoGaoGaoGaoGaoGcmHbXtbCMbCMbCMcbcbJWbNRcbdcbecbfbKacbgcbhcbibVScbjbPCbHGbIubIvcbkcblcblbGLabqaaabFcaaabFbaaabFcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdclHcerbMrbMrbMrbMrbMrcLLcLLcQccLLcLLbMrbMrbMrbMrbMrbNXaWCabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadgrdgJdgzdgzdgzdgzdgDdgraaaabqaaabZScbmcbncbobZSapdcbpbPQcbqapfcbrbZUcbscbtcbucbvcbwbZUapdaoXbZWaoXbzKbzKbzKbzKbzKbzKbzKbzKbzKaxqaoXapfcbxbzPcbycbzbekbekbekbekbekbekbenbekcbAcbBcbCbembekbekbekbvTcbDcbEcbFbekbekbekbekbekcbGcbHbekbekbenbekbekbekbekcbIbekcbAcbJcbKcbLcbMcbNcbOcbNcbPcbPcbQcbRcbScbPcbOcbTbQIbQIbQIbQIcbUcbVasIarrcbWcbXasIcbXcbYcbZaoGayoaoGbCMccaccbcccccdcceccfccfccfbMcbGGbGGbGGbRgccgbRibzLabqbzLcchcciccjbGLabqaaabFcaaabFbaaabFcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdaaabPHbsdbsdbsdbPHbNYbbXcUIcUMcUIbbZaXOabqaaaaaaaaaabqaaaabdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/_maps/map_files/MetaStation/z2.dmm b/_maps/map_files/MetaStation/z2.dmm index ca29b437ca3..ab6a349678c 100644 --- a/_maps/map_files/MetaStation/z2.dmm +++ b/_maps/map_files/MetaStation/z2.dmm @@ -548,9 +548,22 @@ "kB" = (/turf/unsimulated/floor/snow,/obj/structure/flora/bush,/turf/unsimulated/floor/snow{tag = "icon-gravsnow_corner (WEST)"; icon_state = "gravsnow_corner"; dir = 8},/area/syndicate_mothership) "kC" = (/obj/structure/shuttle/engine/propulsion{dir = 8; icon_state = "propulsion"; tag = "icon-propulsion (EAST)"},/turf/space/transit,/area/wizard_station) "kD" = (/obj/structure/shuttle/engine/propulsion{dir = 4; icon_state = "propulsion"},/turf/space/transit,/area/wizard_station) +"kE" = (/turf/unsimulated/wall/abductor{icon_state = "alien21"},/area/abductor_ship) "kF" = (/obj/structure/dresser,/obj/structure/mirror{pixel_x = 0; pixel_y = 30},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/ferry) "kG" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 5},/obj/item/weapon/pen/blue,/turf/unsimulated/floor{dir = 8; icon_state = "vault"},/area/centcom/ferry) "kH" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/ferry) +"kI" = (/turf/unsimulated/wall/abductor{icon_state = "alien20"},/area/abductor_ship) +"kJ" = (/turf/unsimulated/wall/abductor{icon_state = "alien23"},/area/abductor_ship) +"kK" = (/turf/unsimulated/wall/abductor{icon_state = "alien22"},/area/abductor_ship) +"kL" = (/turf/unsimulated/wall/abductor{icon_state = "alien24"},/area/abductor_ship) +"kM" = (/turf/unsimulated/wall/abductor{icon_state = "alien16"},/area/abductor_ship) +"kN" = (/obj/machinery/abductor/experiment{team = 1},/turf/unsimulated/floor/abductor,/area/abductor_ship) +"kO" = (/turf/unsimulated/wall/abductor{icon_state = "alien17"},/area/abductor_ship) +"kP" = (/obj/machinery/abductor/pad{team = 1},/turf/unsimulated/floor/abductor,/area/abductor_ship) +"kQ" = (/obj/machinery/abductor/console{team = 1},/turf/unsimulated/floor/abductor,/area/abductor_ship) +"kR" = (/turf/unsimulated/wall/abductor{icon_state = "alien19"},/area/abductor_ship) +"kS" = (/turf/unsimulated/wall/abductor{icon_state = "alien18"},/area/abductor_ship) +"kT" = (/obj/machinery/abductor/experiment{team = 4},/turf/unsimulated/floor/abductor,/area/abductor_ship) "kU" = (/turf/unsimulated/floor{tag = "icon-darkblue (EAST)"; icon_state = "darkblue"; dir = 4},/area/centcom/ferry) "kV" = (/turf/unsimulated/wall,/area/tdome/tdomeobserve) "kW" = (/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows"; dir = 9},/area/tdome/tdomeobserve) @@ -558,10 +571,22 @@ "kY" = (/obj/machinery/door/airlock/centcom{name = "Thunderdome"; opacity = 1; req_access_txt = "101"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome/tdomeobserve) "kZ" = (/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows"; dir = 8},/area/tdome/tdomeobserve) "la" = (/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows"; dir = 5},/area/tdome/tdomeobserve) +"lb" = (/obj/machinery/abductor/pad{team = 4},/turf/unsimulated/floor/abductor,/area/abductor_ship) +"lc" = (/obj/machinery/abductor/console{team = 4},/turf/unsimulated/floor/abductor,/area/abductor_ship) +"ld" = (/turf/unsimulated/wall/abductor{icon_state = "alien14"},/area/abductor_ship) +"le" = (/turf/unsimulated/floor/abductor,/area/abductor_ship) +"lf" = (/obj/machinery/computer/camera_advanced/abductor{team = 1},/turf/unsimulated/floor/abductor,/area/abductor_ship) +"lg" = (/turf/unsimulated/wall/abductor{icon_state = "alien15"},/area/abductor_ship) +"lh" = (/obj/structure/closet/abductor,/turf/unsimulated/floor/abductor,/area/abductor_ship) +"li" = (/obj/machinery/computer/camera_advanced/abductor{team = 4},/turf/unsimulated/floor/abductor,/area/abductor_ship) +"lj" = (/turf/unsimulated/wall/abductor{icon_state = "alien12"},/area/abductor_ship) +"lk" = (/obj/effect/landmark/abductor/scientist,/turf/unsimulated/floor/abductor,/area/abductor_ship) +"ll" = (/obj/structure/table/abductor,/obj/item/weapon/retractor/alien,/obj/item/weapon/hemostat/alien,/turf/unsimulated/floor/abductor,/area/abductor_ship) "lm" = (/turf/unsimulated/wall/fakeglass{tag = "icon-fakewindows (WEST)"; icon_state = "fakewindows"; dir = 8},/area/syndicate_mothership) "ln" = (/turf/unsimulated/wall/fakeglass{tag = "icon-fakewindows (EAST)"; icon_state = "fakewindows"; dir = 4},/area/syndicate_mothership) "lo" = (/obj/structure/reagent_dispensers/water_cooler,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/ferry) "lp" = (/obj/structure/table/reinforced,/turf/unsimulated/floor{dir = 8; icon_state = "vault"},/area/centcom/ferry) +"lq" = (/obj/effect/landmark/abductor/agent,/turf/unsimulated/floor/abductor,/area/abductor_ship) "lr" = (/obj/structure/extinguisher_cabinet{pixel_x = 28},/turf/unsimulated/floor{tag = "icon-darkbrown (EAST)"; icon_state = "darkbrown"; dir = 4},/area/centcom/ferry) "ls" = (/obj/structure/table,/turf/unsimulated/floor{icon_state = "floor"},/area/tdome/tdomeobserve) "lt" = (/turf/unsimulated/floor{icon_state = "floor"},/area/tdome/tdomeobserve) @@ -575,23 +600,55 @@ "lB" = (/obj/structure/rack,/obj/item/toy/katana,/turf/unsimulated/floor{icon_state = "red"; dir = 2},/area/centcom/evac) "lC" = (/obj/structure/rack,/obj/item/weapon/storage/fancy/crayons,/obj/item/toy/sword,/turf/unsimulated/floor{icon_state = "red"; dir = 2},/area/centcom/evac) "lD" = (/turf/unsimulated/wall/fakeglass,/area/centcom/evac) +"lE" = (/obj/machinery/optable/abductor,/turf/unsimulated/floor/abductor,/area/abductor_ship) +"lF" = (/turf/unsimulated/wall/abductor{icon_state = "alien13"},/area/abductor_ship) +"lG" = (/obj/structure/table/abductor,/obj/item/weapon/storage/box/alienhandcuffs,/turf/unsimulated/floor/abductor,/area/abductor_ship) +"lH" = (/obj/effect/landmark/abductor/scientist{team = 4},/turf/unsimulated/floor/abductor,/area/abductor_ship) +"lI" = (/obj/effect/landmark/abductor/agent{team = 4},/turf/unsimulated/floor/abductor,/area/abductor_ship) +"lJ" = (/turf/unsimulated/wall/abductor{icon_state = "alien10"},/area/abductor_ship) +"lK" = (/obj/structure/table/abductor,/obj/item/weapon/paper/abductor,/obj/item/weapon/scalpel/alien,/obj/item/weapon/cautery/alien,/turf/unsimulated/floor/abductor,/area/abductor_ship) +"lL" = (/turf/unsimulated/wall/abductor{icon_state = "alien11"},/area/abductor_ship) +"lM" = (/turf/unsimulated/wall/abductor{icon_state = "alien6"},/area/abductor_ship) +"lN" = (/obj/machinery/abductor/gland_dispenser,/turf/unsimulated/floor/abductor,/area/abductor_ship) +"lO" = (/turf/unsimulated/wall/abductor{icon_state = "alien7"},/area/abductor_ship) "lP" = (/obj/structure/table,/obj/item/weapon/storage/fancy/crayons,/obj/item/weapon/storage/fancy/crayons,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_mothership) "lQ" = (/obj/machinery/washing_machine,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_mothership) +"lR" = (/obj/structure/stool/bed/abductor,/turf/unsimulated/floor/abductor,/area/abductor_ship) "lS" = (/obj/machinery/vending/cigarette,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/ferry) +"lT" = (/obj/structure/table/abductor,/obj/item/weapon/surgicaldrill/alien,/obj/item/weapon/circular_saw/alien,/turf/unsimulated/floor/abductor,/area/abductor_ship) +"lU" = (/turf/unsimulated/wall/abductor{icon_state = "alien9"},/area/abductor_ship) +"lV" = (/turf/unsimulated/wall/abductor{icon_state = "alien8"},/area/abductor_ship) "lW" = (/turf/unsimulated/floor{tag = "icon-darkred (EAST)"; icon_state = "darkred"; dir = 4},/area/centcom/ferry) "lX" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/turf/unsimulated/floor{icon_state = "floor"},/area/tdome/tdomeobserve) "lY" = (/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "floor"},/area/tdome/tdomeobserve) "lZ" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/turf/unsimulated/floor{icon_state = "floor"},/area/tdome/tdomeobserve) +"ma" = (/turf/unsimulated/wall/abductor{icon_state = "alien2"},/area/abductor_ship) +"mb" = (/turf/unsimulated/wall/abductor,/area/abductor_ship) +"mc" = (/turf/unsimulated/wall/abductor{icon_state = "alien4"},/area/abductor_ship) +"md" = (/turf/unsimulated/wall/abductor{icon_state = "alien3"},/area/abductor_ship) +"me" = (/turf/unsimulated/wall/abductor{icon_state = "alien5"},/area/abductor_ship) "mf" = (/obj/item/weapon/shard{color = "#008000"; icon_state = "small"},/obj/structure/grille{color = "#008000"; density = 0; icon_state = "brokengrille"},/turf/simulated/floor/plating/airless,/area/wizard_station) "mg" = (/turf/unsimulated/wall/fakeglass{color = "#008000"; dir = 8; icon_state = "fakewindows2"},/area/wizard_station) "mh" = (/turf/unsimulated/wall/fakeglass{color = "#008000"; dir = 4; icon_state = "fakewindows"},/area/wizard_station) "mi" = (/turf/unsimulated/wall{tag = "icon-uranium2"; icon_state = "uranium2"},/area/wizard_station) +"mj" = (/obj/machinery/abductor/experiment{team = 2},/turf/unsimulated/floor/abductor,/area/abductor_ship) +"mk" = (/obj/machinery/abductor/pad{team = 2},/turf/unsimulated/floor/abductor,/area/abductor_ship) +"ml" = (/obj/machinery/abductor/console{team = 2},/turf/unsimulated/floor/abductor,/area/abductor_ship) +"mm" = (/obj/machinery/abductor/experiment{team = 3},/turf/unsimulated/floor/abductor,/area/abductor_ship) "mn" = (/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area/syndicate_mothership) "mo" = (/obj/machinery/vending/syndisnack,/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area/syndicate_mothership) "mp" = (/obj/machinery/vending/syndicigs,/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area/syndicate_mothership) +"mq" = (/obj/machinery/abductor/pad{team = 3},/turf/unsimulated/floor/abductor,/area/abductor_ship) +"mr" = (/obj/machinery/abductor/console{team = 3},/turf/unsimulated/floor/abductor,/area/abductor_ship) +"ms" = (/obj/machinery/computer/camera_advanced/abductor{team = 2},/turf/unsimulated/floor/abductor,/area/abductor_ship) +"mt" = (/obj/machinery/computer/camera_advanced/abductor{team = 3},/turf/unsimulated/floor/abductor,/area/abductor_ship) "mu" = (/obj/machinery/vending/coffee,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/ferry) "mv" = (/obj/structure/table/reinforced,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/ferry) "mw" = (/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows2"; dir = 6},/area/tdome/tdomeobserve) +"mx" = (/obj/effect/landmark/abductor/scientist{team = 2},/turf/unsimulated/floor/abductor,/area/abductor_ship) +"my" = (/obj/effect/landmark/abductor/agent{team = 2},/turf/unsimulated/floor/abductor,/area/abductor_ship) +"mz" = (/obj/effect/landmark/abductor/scientist{team = 3},/turf/unsimulated/floor/abductor,/area/abductor_ship) +"mA" = (/obj/effect/landmark/abductor/agent{team = 3},/turf/unsimulated/floor/abductor,/area/abductor_ship) "mH" = (/obj/structure/lattice,/turf/space/transit,/area/wizard_station) "mI" = (/obj/item/weapon/shard{color = "#008000"},/turf/unsimulated/floor{tag = "icon-cultdamage5"; icon_state = "cultdamage5"},/area/wizard_station) "mK" = (/turf/unsimulated/floor{tag = "icon-cult"; icon_state = "cult"},/area/wizard_station) @@ -1048,21 +1105,21 @@ abababababababababababababababababababababababababababababababababababababababab ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababthtYtYtYtYthababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababththththththababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababababkIkEkKkJkLabababkIkEkKkJkLababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababkMkOkNkQkPkSkRabkMkOkTlclbkSkRabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababldlflelelelhlgabldlilelelelhlgabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababljlllklElqlGlFabljlllHlElIlGlFabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababablJlKlelelelhlLablJlKlelelelhlLabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababablMlOlNlTlRlVlUablMlOlNlTlRlVlUabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababababmbmamdmcmeabababmbmamdmcmeababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababababkIkEkKkJkLabababkIkEkKkJkLababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababkMkOmjmlmkkSkRabkMkOmmmrmqkSkRabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababldmslelelelhlgabldmtlelelelhlgabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababljllmxlEmylGlFabljllmzlEmAlGlFabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababablJlKlelelelhlLablJlKlelelelhlLabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababablMlOlNlTlRlVlUablMlOlNlTlRlVlUabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababababmbmamdmcmeabababmbmamdmcmeababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab From 0f1b2b599dfed7bf71f1f335de2901f20f8d34aa Mon Sep 17 00:00:00 2001 From: gt33 Date: Tue, 28 Feb 2017 04:27:36 -0500 Subject: [PATCH 16/31] Fixes the Mime's EVA Suit description --- code/modules/clothing/spacesuits/miscellaneous.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 3269cf146c5..b9256a656f9 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -170,14 +170,14 @@ /obj/item/clothing/head/helmet/space/eva/mime name = "mime eva helmet" // icon = 'spaceciv.dmi' - desc = "An eva helmet specifically designed for the mime." + desc = ". . ." icon_state = "spacemimehelmet" item_state = "spacemimehelmet" /obj/item/clothing/suit/space/eva/mime name = "mime eva suit" // icon = 'spaceciv.dmi' - desc = "An EVA suit specifically designed for the mime." + desc = ". . ." icon_state = "spacemime_suit" item_state = "spacemime_items" From 88669090a6048ed36dc0f77a81c0023370bb2603 Mon Sep 17 00:00:00 2001 From: KasparoVy Date: Tue, 28 Feb 2017 04:37:10 -0500 Subject: [PATCH 17/31] Properly Equips Plasmaman & Vox Multiverse Copies --- code/game/gamemodes/wizard/artefact.dm | 5 +++++ .../living/carbon/human/species/plasmaman.dm | 21 ++++++++++--------- .../living/carbon/human/species/station.dm | 4 ++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 7e9f98a64f2..c8eafde9048 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -586,6 +586,11 @@ var/global/list/multiverse = list() W.SetOwnerInfo(M) M.equip_to_slot_or_del(W, slot_wear_id) + if(M.get_species() == "Vox") + M.species.after_equip_job(null, M) //Voxygen(tm) + if(M.get_species() == "Plasmaman") + M.species.after_equip_job(null, M) //No fireballs from other dimensions. + M.update_icons() /obj/item/weapon/multisword/pure_evil diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index 095ea5ab6ca..009a28e95f1 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -35,19 +35,20 @@ return message /datum/species/plasmaman/after_equip_job(datum/job/J, mob/living/carbon/human/H) + var/assigned_role = H.mind && H.mind.assigned_role ? H.mind.assigned_role : "Civilian" // Unequip existing suits and hats. H.unEquip(H.wear_suit) H.unEquip(H.head) - if(H.mind.assigned_role != "Clown") + if(assigned_role != "Clown") H.unEquip(H.wear_mask) H.equip_or_collect(new /obj/item/clothing/mask/breath(H), slot_wear_mask) - var/suit=/obj/item/clothing/suit/space/eva/plasmaman - var/helm=/obj/item/clothing/head/helmet/space/eva/plasmaman + var/suit=/obj/item/clothing/suit/space/eva/plasmaman/assistant + var/helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/assistant var/tank_slot = slot_s_store var/tank_slot_name = "suit storage" - switch(H.mind.assigned_role) + switch(assigned_role) if("Scientist","Geneticist","Roboticist") suit=/obj/item/clothing/suit/space/eva/plasmaman/science helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/science @@ -55,8 +56,8 @@ suit=/obj/item/clothing/suit/space/eva/plasmaman/science/rd helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/science/rd if("Station Engineer", "Mechanic") - suit=/obj/item/clothing/suit/space/eva/plasmaman/engineer/ - helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/engineer/ + suit=/obj/item/clothing/suit/space/eva/plasmaman/engineer + helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/engineer if("Chief Engineer") suit=/obj/item/clothing/suit/space/eva/plasmaman/engineer/ce helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/engineer/ce @@ -64,11 +65,11 @@ suit=/obj/item/clothing/suit/space/eva/plasmaman/atmostech helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/atmostech if("Detective") - suit=/obj/item/clothing/suit/space/eva/plasmaman/security/ - helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/security/ + suit=/obj/item/clothing/suit/space/eva/plasmaman/security + helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/security if("Warden","Security Officer","Security Pod Pilot") - suit=/obj/item/clothing/suit/space/eva/plasmaman/security/ - helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/security/ + suit=/obj/item/clothing/suit/space/eva/plasmaman/security + helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/security H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/advtaser(H), slot_in_backpack) if("Internal Affairs Agent") suit=/obj/item/clothing/suit/space/eva/plasmaman/lawyer diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index d88eb8caa65..b7ca9d991d1 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -344,12 +344,12 @@ return capitalize(newname) /datum/species/vox/after_equip_job(datum/job/J, mob/living/carbon/human/H) - if(H.mind.assigned_role != "Clown" && H.mind.assigned_role != "Mime") + if(!H.mind || !H.mind.assigned_role || H.mind.assigned_role != "Clown" && H.mind.assigned_role != "Mime") H.unEquip(H.wear_mask) H.unEquip(H.l_hand) H.equip_or_collect(new /obj/item/clothing/mask/breath/vox(H), slot_wear_mask) - var/tank_pref = H.client.prefs.speciesprefs + var/tank_pref = H.client && H.client.prefs ? H.client.prefs.speciesprefs : null if(tank_pref)//Diseasel, here you go H.equip_or_collect(new /obj/item/weapon/tank/nitrogen(H), slot_l_hand) else From a21b47dfd6aa011f91fc5c7f77605c11b2e6db6a Mon Sep 17 00:00:00 2001 From: FlattestGuitar Date: Tue, 28 Feb 2017 12:39:22 +0100 Subject: [PATCH 18/31] Actually suppresses the .click macros :neutral_face: --- code/__HELPERS/mobs.dm | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 6490c869048..2c989753bf9 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -434,14 +434,26 @@ proc/add_logs(mob/user, mob/target, what_done, var/object=null, var/addition=nul if(!.) to_chat(user, "No mob located in [A].") -//suppress the .click macro -/client/var/next_click_macro_warning -/mob/verb/ClickSubstitute() +// Suppress the mouse macros +/client/var/next_mouse_macro_warning +/mob/proc/LogMouseMacro(verbused, params) + if(!client) + return + if(!client.next_mouse_macro_warning) // Log once + log_admin("[key_name(usr)] attempted to use a mouse macro: [verbused] [params]") + message_admins("[key_name_admin(usr)] attempted to use a mouse macro: [verbused] [html_encode(params)]") + if(client.next_mouse_macro_warning < world.time) // Warn occasionally + usr << 'sound/misc/sadtrombone.ogg' + client.next_mouse_macro_warning = world.time + 600 +/mob/verb/ClickSubstitute(params as command_text) set hidden = 1 set name = ".click" - if(!client.next_click_macro_warning) // Log once - log_admin("[key_name(usr)] attempted to use a .click macro.") - message_admins("[key_name_admin(usr)] attempted to use a .click macro.") - if(client.next_click_macro_warning < world.time) // Warn occasionally - usr << 'sound/misc/sadtrombone.ogg' - client.next_click_macro_warning = world.time + 600 + LogMouseMacro(".click", params) +/mob/verb/DblClickSubstitute(params as command_text) + set hidden = 1 + set name = ".dblclick" + LogMouseMacro(".dblclick", params) +/mob/verb/MouseSubstitute(params as command_text) + set hidden = 1 + set name = ".mouse" + LogMouseMacro(".mouse", params) From cd3812f9569ba59e139cfeef5a2ab3e56e84ec1e Mon Sep 17 00:00:00 2001 From: Luthix Date: Tue, 28 Feb 2017 20:17:29 -0700 Subject: [PATCH 19/31] Add files via upload --- sound/vox_fem/deeoo.ogg | Bin 6065 -> 10679 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/sound/vox_fem/deeoo.ogg b/sound/vox_fem/deeoo.ogg index 3a8bbd48aee0dcad297003beeefadd0ba386ca9c..a39fcf4ff058241b5b486e7fc21fcd4245ee70f5 100644 GIT binary patch literal 10679 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 uQS-4U*|z5g^HvFO$o_w}X4+r? literal 6065 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 O*T?7d+ti^lBJ^J#T`YhA From e6950ef66327dbf2a58dafb273017e8bb4c1c650 Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 28 Feb 2017 22:50:41 -0800 Subject: [PATCH 20/31] reduces TS event chance --- code/modules/events/event_container.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/event_container.dm b/code/modules/events/event_container.dm index 89ae637b84b..56d7d374167 100644 --- a/code/modules/events/event_container.dm +++ b/code/modules/events/event_container.dm @@ -191,7 +191,7 @@ var/list/event_last_fired = list() new /datum/event_meta(EVENT_LEVEL_MAJOR, "Abductor Visit", /datum/event/abductor, 80, is_one_shot = 1), new /datum/event_meta/alien(EVENT_LEVEL_MAJOR, "Alien Infestation", /datum/event/alien_infestation, 0, list(ASSIGNMENT_SECURITY = 30), 1), new /datum/event_meta(EVENT_LEVEL_MAJOR, "Traders", /datum/event/traders, 0, is_one_shot = 1), - new /datum/event_meta(EVENT_LEVEL_MAJOR, "Terror Spiders", /datum/event/spider_terror, 0, list(ASSIGNMENT_SECURITY = 20), is_one_shot = 1), + new /datum/event_meta(EVENT_LEVEL_MAJOR, "Terror Spiders", /datum/event/spider_terror, 0, list(ASSIGNMENT_SECURITY = 15), is_one_shot = 1), new /datum/event_meta(EVENT_LEVEL_MAJOR, "Slaughter Demon", /datum/event/spawn_slaughter, 15, is_one_shot = 1) ) From 032adc25fe5978c880da901f143f4d0c2f1048af Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 1 Mar 2017 04:40:11 -0500 Subject: [PATCH 21/31] Automatic changelog generation for PR #6627 [ci skip] --- html/changelogs/AutoChangeLog-pr-6627.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6627.yml diff --git a/html/changelogs/AutoChangeLog-pr-6627.yml b/html/changelogs/AutoChangeLog-pr-6627.yml new file mode 100644 index 00000000000..760ebf0dc32 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6627.yml @@ -0,0 +1,4 @@ +author: "Purpose2" +delete-after: True +changes: + - rscadd: "Enables Cargo to order Wood planks" From 05781cc9e175fd6c2fdb48cf5a6266cb431e318d Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 1 Mar 2017 04:41:01 -0500 Subject: [PATCH 22/31] Automatic changelog generation for PR #6616 [ci skip] --- html/changelogs/AutoChangeLog-pr-6616.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6616.yml diff --git a/html/changelogs/AutoChangeLog-pr-6616.yml b/html/changelogs/AutoChangeLog-pr-6616.yml new file mode 100644 index 00000000000..4796138cbbd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6616.yml @@ -0,0 +1,4 @@ +author: "Crazylemon64" +delete-after: True +changes: + - rscadd: "Kudzu vines now can yield materials if carefully tended to" From 98301886dada35cb5ac139396963a9aa9f60a4aa Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 1 Mar 2017 04:44:43 -0500 Subject: [PATCH 23/31] Automatic changelog compile, [ci skip] --- html/changelog.html | 10 ++++++++++ html/changelogs/.all_changelog.yml | 5 +++++ html/changelogs/AutoChangeLog-pr-6616.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6627.yml | 4 ---- 4 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-6616.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6627.yml diff --git a/html/changelog.html b/html/changelog.html index af762a59ccd..00fe3f0c29c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -55,6 +55,16 @@ -->
+

01 March 2017

+

Crazylemon64 updated:

+
    +
  • Kudzu vines now can yield materials if carefully tended to
    • +
+

Purpose2 updated:

+
    +
  • Enables Cargo to order Wood planks
    • +
+

28 February 2017

KasparoVy updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 4186b5c37cc..feeb05da535 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -3925,3 +3925,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. KasparoVy: - bugfix: Plasmaman suits will now only auto-extinguish if you're actually on fire (and not just taking a shower). +2017-03-01: + Crazylemon64: + - rscadd: Kudzu vines now can yield materials if carefully tended to + Purpose2: + - rscadd: Enables Cargo to order Wood planks diff --git a/html/changelogs/AutoChangeLog-pr-6616.yml b/html/changelogs/AutoChangeLog-pr-6616.yml deleted file mode 100644 index 4796138cbbd..00000000000 --- a/html/changelogs/AutoChangeLog-pr-6616.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Crazylemon64" -delete-after: True -changes: - - rscadd: "Kudzu vines now can yield materials if carefully tended to" diff --git a/html/changelogs/AutoChangeLog-pr-6627.yml b/html/changelogs/AutoChangeLog-pr-6627.yml deleted file mode 100644 index 760ebf0dc32..00000000000 --- a/html/changelogs/AutoChangeLog-pr-6627.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Purpose2" -delete-after: True -changes: - - rscadd: "Enables Cargo to order Wood planks" From c3bcd15c5e0bde6cc36d35b417a72646e68ec9e5 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Wed, 1 Mar 2017 14:44:09 -0800 Subject: [PATCH 24/31] fix nukeops --- code/game/gamemodes/nuclear/nuclear.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index a7f3b36fc74..ce0f01c5261 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -246,9 +246,7 @@ proc/issyndicate(mob/living/M as mob) synd_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(synd_mob), slot_shoes) synd_mob.equip_or_collect(new /obj/item/clothing/gloves/combat(synd_mob), slot_gloves) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/card/id/syndicate(synd_mob), slot_wear_id) - if(synd_mob.backbag == 2) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(synd_mob), slot_back) - if(synd_mob.backbag == 3) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(synd_mob), slot_back) - if(synd_mob.backbag == 4) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(synd_mob), slot_back) + synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(synd_mob), slot_back) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/food/pill/initropidril(synd_mob), slot_in_backpack) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/pistol(synd_mob), slot_belt) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(synd_mob.back), slot_in_backpack) From 60159b65e15d3ea984ea04d1e0c406b6b1bd6870 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 1 Mar 2017 18:21:23 -0500 Subject: [PATCH 25/31] Automatic changelog generation for PR #6364 [ci skip] --- html/changelogs/AutoChangeLog-pr-6364.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6364.yml diff --git a/html/changelogs/AutoChangeLog-pr-6364.yml b/html/changelogs/AutoChangeLog-pr-6364.yml new file mode 100644 index 00000000000..da34da7301e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6364.yml @@ -0,0 +1,5 @@ +author: "Fethas" +delete-after: True +changes: + - tweak: "2 second cooldown on the rest verb. You are not Neo, knock it off." + - rscadd: "StopResting and StartResting Procs are not on the rest verb." From fb1a17f5b27c67e585c0c27157a09fc668b79d70 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 1 Mar 2017 18:22:10 -0500 Subject: [PATCH 26/31] Automatic changelog generation for PR #6639 [ci skip] --- html/changelogs/AutoChangeLog-pr-6639.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6639.yml diff --git a/html/changelogs/AutoChangeLog-pr-6639.yml b/html/changelogs/AutoChangeLog-pr-6639.yml new file mode 100644 index 00000000000..2bf2831ead0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6639.yml @@ -0,0 +1,5 @@ +author: "KasparoVy" +delete-after: True +changes: + - bugfix: "Plasmaman multiverse sword copies are now properly equipped (suit, helmet, internals, etc.)" + - bugfix: "Vox multiverse sword copies are now peoperly equipped (internals)." From 055f76f85e41175258f8b4e8c0de10af7b233cc0 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 1 Mar 2017 18:29:54 -0500 Subject: [PATCH 27/31] Automatic changelog generation for PR #6622 [ci skip] --- html/changelogs/AutoChangeLog-pr-6622.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6622.yml diff --git a/html/changelogs/AutoChangeLog-pr-6622.yml b/html/changelogs/AutoChangeLog-pr-6622.yml new file mode 100644 index 00000000000..631db6e8d9f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6622.yml @@ -0,0 +1,5 @@ +author: "Kyep" +delete-after: True +changes: + - bugfix: "Fixed several Terror Spider things that should not be possible, like recharging wireless guns, the 'evil-looking spiderlings' instant meta, and spiderlings spacing themselves." + - tweak: "Several Terror Spider balance and fun tweaks, such as giving the Prince of Terror a new webbing ability, and ensuring queens/mothers can break open vents, so they cannot be completely shut out late-round." From 87f70058ff633bed10182b518d58d1b8fad60ae7 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 1 Mar 2017 18:46:28 -0500 Subject: [PATCH 28/31] Automatic changelog compile, [ci skip] --- html/changelog.html | 15 +++++++++++++++ html/changelogs/.all_changelog.yml | 14 ++++++++++++++ html/changelogs/AutoChangeLog-pr-6364.yml | 5 ----- html/changelogs/AutoChangeLog-pr-6622.yml | 5 ----- html/changelogs/AutoChangeLog-pr-6639.yml | 5 ----- 5 files changed, 29 insertions(+), 15 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-6364.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6622.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6639.yml diff --git a/html/changelog.html b/html/changelog.html index 00fe3f0c29c..5592f735751 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -60,6 +60,21 @@
    • Kudzu vines now can yield materials if carefully tended to
    +

    Fethas updated:

    +
      +
    • 2 second cooldown on the rest verb. You are not Neo, knock it off.
      • +
    • StopResting and StartResting Procs are not on the rest verb.
      • +
    +

    KasparoVy updated:

    +
      +
    • Plasmaman multiverse sword copies are now properly equipped (suit, helmet, internals, etc.)
      • +
    • Vox multiverse sword copies are now peoperly equipped (internals).
      • +
    +

    Kyep updated:

    +
      +
    • Fixed several Terror Spider things that should not be possible, like recharging wireless guns, the 'evil-looking spiderlings' instant meta, and spiderlings spacing themselves.
      • +
    • Several Terror Spider balance and fun tweaks, such as giving the Prince of Terror a new webbing ability, and ensuring queens/mothers can break open vents, so they cannot be completely shut out late-round.
      • +

    Purpose2 updated:

    • Enables Cargo to order Wood planks
      • diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index feeb05da535..75f8fe7fe5a 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -3928,5 +3928,19 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2017-03-01: Crazylemon64: - rscadd: Kudzu vines now can yield materials if carefully tended to + Fethas: + - tweak: 2 second cooldown on the rest verb. You are not Neo, knock it off. + - rscadd: StopResting and StartResting Procs are not on the rest verb. + KasparoVy: + - bugfix: Plasmaman multiverse sword copies are now properly equipped (suit, helmet, + internals, etc.) + - bugfix: Vox multiverse sword copies are now peoperly equipped (internals). + Kyep: + - bugfix: Fixed several Terror Spider things that should not be possible, like recharging + wireless guns, the 'evil-looking spiderlings' instant meta, and spiderlings + spacing themselves. + - tweak: Several Terror Spider balance and fun tweaks, such as giving the Prince + of Terror a new webbing ability, and ensuring queens/mothers can break open + vents, so they cannot be completely shut out late-round. Purpose2: - rscadd: Enables Cargo to order Wood planks diff --git a/html/changelogs/AutoChangeLog-pr-6364.yml b/html/changelogs/AutoChangeLog-pr-6364.yml deleted file mode 100644 index da34da7301e..00000000000 --- a/html/changelogs/AutoChangeLog-pr-6364.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Fethas" -delete-after: True -changes: - - tweak: "2 second cooldown on the rest verb. You are not Neo, knock it off." - - rscadd: "StopResting and StartResting Procs are not on the rest verb." diff --git a/html/changelogs/AutoChangeLog-pr-6622.yml b/html/changelogs/AutoChangeLog-pr-6622.yml deleted file mode 100644 index 631db6e8d9f..00000000000 --- a/html/changelogs/AutoChangeLog-pr-6622.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Kyep" -delete-after: True -changes: - - bugfix: "Fixed several Terror Spider things that should not be possible, like recharging wireless guns, the 'evil-looking spiderlings' instant meta, and spiderlings spacing themselves." - - tweak: "Several Terror Spider balance and fun tweaks, such as giving the Prince of Terror a new webbing ability, and ensuring queens/mothers can break open vents, so they cannot be completely shut out late-round." diff --git a/html/changelogs/AutoChangeLog-pr-6639.yml b/html/changelogs/AutoChangeLog-pr-6639.yml deleted file mode 100644 index 2bf2831ead0..00000000000 --- a/html/changelogs/AutoChangeLog-pr-6639.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "KasparoVy" -delete-after: True -changes: - - bugfix: "Plasmaman multiverse sword copies are now properly equipped (suit, helmet, internals, etc.)" - - bugfix: "Vox multiverse sword copies are now peoperly equipped (internals)." From c7f92c15c65bd2f00806da45a92eb3414f929f27 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Wed, 1 Mar 2017 19:47:05 -0500 Subject: [PATCH 29/31] There it is! The Bridge of Death! STOP! Who would cross the Bridge of Death Must answer me These questions three Ere the other side he see. --- _maps/map_files/MetaStation/MetaStation.v41A.II.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm index 11ae35502bf..9ecf54e59c3 100644 --- a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm +++ b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm @@ -1134,7 +1134,7 @@ "avP" = (/obj/machinery/computer/podtracker,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/engine/mechanic_workshop) "avQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "avR" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/machinery/light,/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/fpmaint2{name = "Port Maintenance"}) -"avS" = (/obj/machinery/door/airlock/glass{name = "space-bridge access"},/obj/machinery/door_control{id = "supplybridge"; name = "Shuttle Bay Space Bridge Control"; pixel_x = 0; pixel_y = 27; req_access_txt = "0"; req_one_access_txt = "48;50"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/fpmaint2{name = "Port Maintenance"}) +"avS" = (/obj/machinery/door/airlock/glass{name = "space-bridge access"},/obj/machinery/door_control{id = "supplybridge"; name = "Shuttle Bay Space Bridge Control"; pixel_x = 0; pixel_y = 27; req_access_txt = "0"; req_one_access_txt = "0"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "avT" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/fpmaint2{name = "Port Maintenance"}) "avU" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"}) "avV" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/maintenance/fpmaint2{name = "Port Maintenance"}) From d98a552d5a5db3855c8310a2d3a58c52ac3ebc72 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 1 Mar 2017 20:06:44 -0500 Subject: [PATCH 30/31] Automatic changelog generation for PR #6629 [ci skip] --- html/changelogs/AutoChangeLog-pr-6629.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6629.yml diff --git a/html/changelogs/AutoChangeLog-pr-6629.yml b/html/changelogs/AutoChangeLog-pr-6629.yml new file mode 100644 index 00000000000..339afd99055 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6629.yml @@ -0,0 +1,4 @@ +author: "Fethas" +delete-after: True +changes: + - tweak: "Various metastation fixes." From b74da9d753884e946e1576596cd3c38c4b660a15 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 1 Mar 2017 20:46:36 -0500 Subject: [PATCH 31/31] Automatic changelog compile, [ci skip] --- html/changelog.html | 1 + html/changelogs/.all_changelog.yml | 1 + html/changelogs/AutoChangeLog-pr-6629.yml | 4 ---- 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-6629.yml diff --git a/html/changelog.html b/html/changelog.html index 5592f735751..e46aea58e72 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -64,6 +64,7 @@
      • 2 second cooldown on the rest verb. You are not Neo, knock it off.
      • StopResting and StartResting Procs are not on the rest verb.
        • +
      • Various metastation fixes.

      KasparoVy updated:

        diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 75f8fe7fe5a..cce1cb4d43b 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -3931,6 +3931,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Fethas: - tweak: 2 second cooldown on the rest verb. You are not Neo, knock it off. - rscadd: StopResting and StartResting Procs are not on the rest verb. + - tweak: Various metastation fixes. KasparoVy: - bugfix: Plasmaman multiverse sword copies are now properly equipped (suit, helmet, internals, etc.) diff --git a/html/changelogs/AutoChangeLog-pr-6629.yml b/html/changelogs/AutoChangeLog-pr-6629.yml deleted file mode 100644 index 339afd99055..00000000000 --- a/html/changelogs/AutoChangeLog-pr-6629.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Fethas" -delete-after: True -changes: - - tweak: "Various metastation fixes."