From b5f0e0affed59506ed9d64e019ef78ad9d35085e Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 11 Jan 2020 10:39:08 +1000 Subject: [PATCH 1/6] Fixes wrong gasmask in xenoflorist locker --- .../structures/crates_lockers/closets/secure/hydroponics.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index 110d3984f8..71c76bb7e3 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -42,7 +42,7 @@ /obj/structure/closet/secure_closet/hydroponics/sci/Initialize() starts_with += /obj/item/clothing/head/bio_hood/scientist starts_with += /obj/item/clothing/suit/bio_suit/scientist - starts_with += /obj/item/clothing/mask/gas/clear + starts_with += /obj/item/clothing/mask/gas // VOREStation Edit: Gasmasks we use are different if(prob(1)) starts_with += /obj/item/weapon/chainsaw From a570cafa2a178151f0f841e81d009328769bcff0 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 11 Jan 2020 11:33:58 +1000 Subject: [PATCH 2/6] Adds taur cloak and dress to loadout --- .../preference_setup/loadout/loadout_xeno_vr.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm index 6c7f506073..6b92ab1376 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm @@ -74,3 +74,14 @@ path = /obj/item/clothing/glasses/sunglasses/sechud/tajblind //whitelisted = SPECIES_TAJ sort_category = "Xenowear" + +// Taur stuff +/datum/gear/suit/taur/drake_cloak + display_name = "drake cloak (Drake-taur)" + path = /obj/item/clothing/suit/drake_cloak + sort_category = "Xenowear" + +/datum/gear/suit/taur/white_dress + display_name = "white wedding dress (Wolf/Horse-taur)" + path = /obj/item/clothing/suit/taur_dress/white + sort_category = "Xenowear" \ No newline at end of file From efe0d3a5b3248c64a2b4dedbf19a4d37a3bfe41a Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 11 Jan 2020 12:04:41 +1000 Subject: [PATCH 3/6] Readds cryo to surface medical --- maps/tether/tether-03-surface3.dmm | 596 ++++++++++++++--------------- maps/tether/tether_areas2.dm | 3 - 2 files changed, 283 insertions(+), 316 deletions(-) diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 97b05955cb..1d7885268d 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -102,34 +102,14 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/security/upperhall) "aao" = ( -/obj/structure/closet/secure_closet/paramedic, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 9 +/obj/machinery/alarm{ + pixel_y = 22 }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 9 - }, -/turf/simulated/floor/tiled/white, +/turf/simulated/open, /area/tether/surfacebase/medical/triage) "aap" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 6 +/obj/machinery/light{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -137,12 +117,6 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) "aar" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/open, -/area/tether/surfacebase/medical/triage) -"aas" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 5 }, @@ -158,6 +132,23 @@ /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 8 }, +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) +"aas" = ( +/obj/effect/floor_decal/borderfloorwhite/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "aat" = ( @@ -220,13 +211,9 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "aaD" = ( -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 - }, -/turf/simulated/open, +/obj/machinery/atmospherics/unary/cryo_cell, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled, /area/tether/surfacebase/medical/triage) "aaE" = ( /turf/simulated/wall, @@ -288,14 +275,28 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "aaL" = ( +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 5 + }, /obj/machinery/light{ dir = 1 }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 +/obj/structure/table/glass, +/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -366,20 +367,18 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "aaU" = ( -/obj/machinery/alarm{ - pixel_y = 22 - }, +/obj/structure/closet/secure_closet/paramedic, /obj/effect/floor_decal/borderfloorwhite{ - dir = 5 + dir = 9 }, /obj/effect/floor_decal/corner/paleblue/border{ - dir = 5 + dir = 9 }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 5 +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22; + pixel_y = 0 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -1050,34 +1049,19 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "acd" = ( -/obj/effect/floor_decal/borderfloorwhite/corner{ - dir = 4 +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/oxygen/prechilled, +/obj/effect/floor_decal/techfloor{ + dir = 1 }, -/obj/effect/floor_decal/corner/paleblue/bordercorner{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/triage) "ace" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/atmospherics/unary/freezer, +/obj/effect/floor_decal/techfloor{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/triage) "acf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4137,23 +4121,16 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "agZ" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 +/obj/structure/table/steel, +/obj/item/weapon/tool/wrench, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/floor_decal/techfloor{ + dir = 9 }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/machinery/alarm{ + pixel_y = 22 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/triage) "aha" = ( /obj/effect/floor_decal/borderfloor{ @@ -5743,10 +5720,6 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "ajr" = ( -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 4 - }, /obj/machinery/portable_atmospherics/powered/pump/filled, /obj/effect/floor_decal/techfloor{ dir = 1 @@ -5761,6 +5734,10 @@ d2 = 2; icon_state = "0-2" }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "ajs" = ( @@ -6205,9 +6182,6 @@ dir = 6 }, /obj/structure/table/standard, -/obj/machinery/vending/wallmed1/public{ - pixel_y = 28 - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "akf" = ( @@ -6233,15 +6207,16 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "akj" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, /obj/effect/floor_decal/techfloor{ dir = 4 }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "akk" = ( @@ -8094,16 +8069,16 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "anu" = ( -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 4 - }, /obj/effect/floor_decal/techfloor{ dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "anv" = ( @@ -8441,9 +8416,6 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "anY" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/machinery/portable_atmospherics/powered/pump/filled, /obj/effect/floor_decal/techfloor{ dir = 6 @@ -8453,6 +8425,10 @@ icon_state = "alarm0"; pixel_x = 24 }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "anZ" = ( @@ -9023,7 +8999,6 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, @@ -9033,6 +9008,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/industrial/danger, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "apf" = ( @@ -11108,29 +11084,25 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "asA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + icon_state = "warningcorner"; + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/light_switch{ - dir = 1; - on = 0; - pixel_x = -10; - pixel_y = -24 - }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/patient_c) +/area/tether/surfacebase/medical/triage) "asB" = ( /obj/structure/disposalpipe/sortjunction{ dir = 1; @@ -26282,8 +26254,22 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) "aRK" = ( -/turf/simulated/wall, -/area/tether/surfacebase/medical/patient_c) +/obj/machinery/door/airlock/medical{ + name = "Cryogenics Maintenance" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/dark, +/area/tether/surfacebase/medical/triage) "aRL" = ( /obj/machinery/washing_machine, /turf/simulated/floor/tiled/white, @@ -26429,13 +26415,14 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) "aSb" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "surfmedint-c" +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/patient_c) +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "aSc" = ( /obj/machinery/door/firedoor/glass/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -26534,25 +26521,16 @@ /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_main) "aSk" = ( -/obj/structure/bed/chair, -/obj/machinery/alarm{ - pixel_y = 22 +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 1 }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 9 - }, -/obj/effect/floor_decal/corner/pink/border{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 10 - }, -/obj/effect/floor_decal/corner/pink/bordercorner2{ - icon_state = "bordercolorcorner2"; - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5; + icon_state = "intact" }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/patient_c) +/area/tether/surfacebase/medical/triage) "aSl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ icon_state = "intact-scrubbers"; @@ -26561,69 +26539,48 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) "aSm" = ( -/obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/pink/border{ - dir = 1 - }, -/obj/item/device/radio/intercom{ - dir = 1; - pixel_y = 24; - req_access = list() - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/button/windowtint{ - id = "surfmedint-c"; - pixel_x = -12; - pixel_y = 28 - }, -/obj/machinery/button/windowtint{ - id = "surfmedext-c"; - pixel_x = 12; - pixel_y = 28 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/patient_c) -"aSn" = ( -/obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 5 - }, -/obj/effect/floor_decal/corner/pink/border{ - dir = 5 - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 28 - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/patient_c) -"aSo" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "surfmedext-c" - }, -/obj/structure/window/reinforced{ +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/patient_c) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/corner, +/turf/simulated/floor/tiled/dark, +/area/tether/surfacebase/medical/triage) +"aSn" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/dark, +/area/tether/surfacebase/medical/triage) +"aSo" = ( +/obj/structure/table/steel, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/obj/machinery/firealarm{ + dir = 2; + layer = 3.3; + pixel_x = 0; + pixel_y = 26 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/surfacebase/medical/triage) "aSp" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 8 @@ -26713,23 +26670,13 @@ /area/rnd/outpost/xenobiology/outpost_main) "aSu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/techfloor{ + dir = 6 }, -/obj/machinery/door/airlock/medical{ - name = "Patient Room C"; - req_one_access = list() - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/patient_c) +/turf/simulated/floor/tiled/dark, +/area/tether/surfacebase/medical/triage) "aSv" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -26838,24 +26785,22 @@ /turf/simulated/floor/wood, /area/library) "aSG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/pink/border, -/obj/effect/floor_decal/borderfloorwhite/corner2, -/obj/effect/floor_decal/corner/pink/bordercorner2, -/obj/machinery/light/small, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 6 }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/patient_c) +/area/tether/surfacebase/medical/triage) "aSH" = ( /obj/effect/floor_decal/steeldecal/steel_decals4, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -26873,26 +26818,22 @@ /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) "aSK" = ( -/obj/structure/closet/secure_closet/personal/patient, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/borderfloorwhite{ - dir = 6 + dir = 4 }, -/obj/effect/floor_decal/corner/pink/border{ - dir = 6 +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 5 }, -/obj/machinery/vending/wallmed1{ - pixel_y = -30 +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 5 }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/patient_c) +/area/tether/surfacebase/medical/triage) "aSL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -27845,10 +27786,19 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "aUh" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/carry, -/area/shuttle/tether/surface) +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "aUi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -27862,6 +27812,41 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/common) +"aUj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 9; + icon_state = "intact" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/techfloor/hole, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/dark, +/area/tether/surfacebase/medical/triage) +"aUk" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"aUl" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tether/surface) "aUx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -28376,21 +28361,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) -"aVw" = ( -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) -"aVx" = ( -/obj/machinery/firealarm{ - dir = 2; - layer = 3.3; - pixel_x = -32; - pixel_y = 26 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "aVB" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -43795,7 +43765,7 @@ aSF axg atH aGy -aHf +aUk aIa aIz aJn @@ -44303,10 +44273,10 @@ aab aab aac aag -aar -aaD +aat +aat aag -aao +aaU aeH abw aaH @@ -44445,7 +44415,7 @@ aab aab aac aag -aat +aao abh aag aad @@ -44587,7 +44557,7 @@ aab aab aac aah -aVx +aap aaZ aVv adw @@ -44729,9 +44699,9 @@ aab aab aac aah +aar aas -acd -aVw +aSb aaZ aaZ aaC @@ -44872,8 +44842,8 @@ aab aab aag aag -aaL -aaZ +aaD +aSk aaZ aaZ ago @@ -45014,11 +44984,11 @@ aab aab aac aag -aaU -ace -aap -afx -agZ +aaL +asA +aSG +aSK +aUh aRG afx aSq @@ -45155,15 +45125,15 @@ aab aab aab aQW +aag +aag +aRK aaz abd acf aed afy ahO -aRK -aSb -aSu aSP aSZ aTn @@ -45297,15 +45267,15 @@ aab aab aab aac +aag +agZ +aSm aaz abp acR aed afA aih -aRK -aSk -asA aSP aTb aTo @@ -45439,15 +45409,15 @@ aab aab aab aac +aag +acd +aSn aaz abr adu aed afD aDp -aRK -aSm -aSG aSP aTc aTp @@ -45581,15 +45551,15 @@ aab aab aab aaq +aag +ace +aUj aaz abs adv aed afE aGm -aRK -aSn -aSK aSP aTd aTq @@ -45655,7 +45625,7 @@ aNk aNl aNJ aNP -aUh +aUl aKU abg aOk @@ -45723,15 +45693,15 @@ aab aab aab aaq +aag +aSo +aSu aaz aca aca aed agi agi -aRK -aSo -aSo aSP aSP aSP @@ -45797,7 +45767,7 @@ aNl aNl aNK aNP -aUh +aUl aKU abg aOk @@ -45865,10 +45835,10 @@ aab aab aab aaq -aaq -aac -aac -aac +aag +aag +aag +aag aac aac aac @@ -45939,7 +45909,7 @@ aNm aNl aNK aNP -aUh +aUl aKU abg aOk diff --git a/maps/tether/tether_areas2.dm b/maps/tether/tether_areas2.dm index d1a5477d38..36f3222e6e 100644 --- a/maps/tether/tether_areas2.dm +++ b/maps/tether/tether_areas2.dm @@ -201,9 +201,6 @@ /area/tether/surfacebase/medical/patient_b name = "\improper Surface Patient Room B" lightswitch = 0 -/area/tether/surfacebase/medical/patient_c - name = "\improper Surface Patient Room C" - lightswitch = 0 /area/tether/surfacebase/medical/lowerhall name = "\improper Surface Medical Lower Hall" /area/tether/surfacebase/medical/storage From 9612d9c2e62ee59435060c71e36c119d697eefad Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 11 Jan 2020 12:08:26 +1000 Subject: [PATCH 4/6] Fixes decals on a single tile --- maps/tether/tether-05-station1.dmm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 9372846f2c..588538d4c9 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -4468,12 +4468,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "1-2" }, From 47086d7bf052b54b5a9e34dd6efe143a6eb814e3 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 11 Jan 2020 16:02:12 +1000 Subject: [PATCH 5/6] Adds new event: drone drop pod --- code/modules/events/drone_pod_vr.dm | 31 +++++++++++++++++++++++ code/modules/events/event_container_vr.dm | 1 + maps/tether/tether_defines.dm | 2 ++ maps/~map_system/maps.dm | 1 + vorestation.dme | 1 + 5 files changed, 36 insertions(+) create mode 100644 code/modules/events/drone_pod_vr.dm diff --git a/code/modules/events/drone_pod_vr.dm b/code/modules/events/drone_pod_vr.dm new file mode 100644 index 0000000000..45ce01684b --- /dev/null +++ b/code/modules/events/drone_pod_vr.dm @@ -0,0 +1,31 @@ +/datum/event/drone_pod_drop + announceWhen = 1 + var/turf/land_target = null + var/attempt_amount = 10 + +/datum/event/drone_pod_drop/setup() + startWhen = rand(8,15) + if(LAZYLEN(using_map.meteor_strike_areas)) + var/turf/potential_target = null + for(var/i=1, i <= attempt_amount, i++) + potential_target = pick(get_area_turfs(pick(using_map.meteor_strike_areas))) + if(potential_target.x < 7 || potential_target.x > world.maxx-7 || potential_target.y < 7 || potential_target.y > world.maxy-7) + continue + else + land_target = potential_target + break + + if(!land_target) + kill() + +/datum/event/meteor_strike/announce() + command_announcement.Announce("An unidentified drone pod has been detected landing near the surface facilty. Open and examine at your own risk.", "NanoTrasen Orbital Monitoring") + +/datum/event/drone_pod_drop/start() + if(istype(land_target, /turf/simulated/open)) + while(istype(land_target, /turf/simulated/open)) + land_target = GetBelow(land_target) + if(!land_target) + kill() + + new /datum/random_map/droppod/supply(null, land_target.x-2, land_target.y-2, land_target.z, supplied_drops = list(/obj/structure/ghost_pod/manual/lost_drone)) \ No newline at end of file diff --git a/code/modules/events/event_container_vr.dm b/code/modules/events/event_container_vr.dm index 6f5e8dada2..3cb0243e66 100644 --- a/code/modules/events/event_container_vr.dm +++ b/code/modules/events/event_container_vr.dm @@ -81,6 +81,7 @@ new /datum/event_meta(EVENT_LEVEL_MODERATE, "Spider Infestation", /datum/event/spider_infestation, 30, list(ASSIGNMENT_SECURITY = 30), 1), //Evil grubs that drain station power slightly new /datum/event_meta(EVENT_LEVEL_MODERATE, "Grub Infestation", /datum/event/grub_infestation, 0, list(ASSIGNMENT_SECURITY = 10, ASSIGNMENT_ENGINEER = 30), 1), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Drone Pod Drop", /datum/event/drone_pod_drop, 10, list(ASSIGNMENT_SCIENTIST = 40), 1) ) add_disabled_events(list( new /datum/event_meta(EVENT_LEVEL_MODERATE, "Appendicitis", /datum/event/spontaneous_appendicitis, 0, list(ASSIGNMENT_MEDICAL = 30), 1), diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm index 029798c96d..ca516f15bb 100644 --- a/maps/tether/tether_defines.dm +++ b/maps/tether/tether_defines.dm @@ -102,6 +102,8 @@ spawnpoint_stayed = /datum/spawnpoint/cryo meteor_strike_areas = list(/area/tether/surfacebase/outside/outside3) + drop_pod_allowed_z = list(Z_LEVEL_SURFACE_HIGH) + unit_test_exempt_areas = list( /area/tether/surfacebase/outside/outside1, diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm index fe0ef3972b..833f733e5c 100644 --- a/maps/~map_system/maps.dm +++ b/maps/~map_system/maps.dm @@ -59,6 +59,7 @@ var/list/all_maps = list() var/list/holomap_legend_x = list() var/list/holomap_legend_y = list() var/list/meteor_strike_areas // VOREStation Edit - Areas meteor strikes may choose to hit. + var/list/drop_pod_allowed_z // VOREStation Edit - Which z-levels to target with droppods? var/ai_shell_restricted = FALSE //VOREStation Addition - are there z-levels restricted? var/ai_shell_allowed_levels = list() //VOREStation Addition - which z-levels ARE we allowed to visit? diff --git a/vorestation.dme b/vorestation.dme index 1f4cc0a7cf..afaf1e4bff 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1851,6 +1851,7 @@ #include "code\modules\events\carp_migration.dm" #include "code\modules\events\comms_blackout.dm" #include "code\modules\events\communications_blackout.dm" +#include "code\modules\events\drone_pod_vr.dm" #include "code\modules\events\dust.dm" #include "code\modules\events\electrical_storm.dm" #include "code\modules\events\event.dm" From e1f3b56f745cfcba0a55c0a445a6d2f346cd196e Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sat, 11 Jan 2020 01:08:14 -0500 Subject: [PATCH 6/6] Revert "Temporarily removes update_client_z from /logout" --- code/modules/mob/logout.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm index d9940a1581..aa42ab461d 100644 --- a/code/modules/mob/logout.dm +++ b/code/modules/mob/logout.dm @@ -2,7 +2,7 @@ SSnanoui.user_logout(src) // this is used to clean up (remove) this user's Nano UIs player_list -= src disconnect_time = world.realtime //VOREStation Addition: logging when we disappear. - //update_client_z(null) //VOREStation TEST Removal: potential source of restart crashes + update_client_z(null) log_access_out(src) if(admin_datums[src.ckey]) if (ticker && ticker.current_state == GAME_STATE_PLAYING) //Only report this stuff if we are currently playing.