diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 6abbd6dbfc7..301a7f552b3 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -14,10 +14,6 @@ }, /turf/space, /area/space/nearstation) -"aac" = ( -/turf/space, -/turf/space, -/area/space) "aaD" = ( /obj/effect/landmark{ name = "carpspawn" @@ -73030,11 +73026,7 @@ name = "Aft Maintenance" }) "cDS" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "Medbay" - }, +/obj/structure/sign/lifestar, /turf/simulated/wall, /area/medical/reception) "cDT" = ( @@ -76123,6 +76115,18 @@ /area/toxins/mixing{ name = "\improper Toxins Lab" }) +"cJg" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/xenobiology{ + name = "\improper Secure Lab" + }) "cJh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -84917,16 +84921,6 @@ /area/toxins/xenobiology{ name = "\improper Secure Lab" }) -"cYv" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) "cYw" = ( /obj/machinery/hydroponics/soil{ pixel_y = 8 @@ -84995,11 +84989,7 @@ /turf/simulated/floor/plating, /area/medical/psych) "cYF" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "Medbay" - }, +/obj/structure/sign/lifestar, /turf/simulated/wall, /area/medical/genetics) "cYG" = ( @@ -85940,32 +85930,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"daz" = ( -/turf/space, -/turf/space, -/turf/space, -/area/space) -"daE" = ( -/obj/structure/sink{ - dir = 8; - icon_state = "sink"; - pixel_x = -12; - pixel_y = 2 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) "daF" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; @@ -85996,22 +85960,6 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) -"daI" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/decal/warning_stripes/southeastcorner, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -86316,11 +86264,7 @@ name = "\improper Secure Lab" }) "dbu" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "Medbay" - }, +/obj/structure/sign/lifestar, /turf/simulated/wall, /area/medical/surgeryobs) "dbv" = ( @@ -87371,11 +87315,7 @@ }, /area/civilian/barber) "def" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "Medbay" - }, +/obj/structure/sign/lifestar, /turf/simulated/wall, /area/medical/medbay3{ name = "Medbay Aft" @@ -88198,11 +88138,7 @@ }, /area/engine/mechanic_workshop) "dfO" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "Medbay" - }, +/obj/structure/sign/lifestar, /turf/simulated/wall, /area/medical/psych) "dfQ" = ( @@ -88959,9 +88895,6 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plating, /area/security/permabrig) -"dlO" = ( -/turf/simulated/wall, -/area/hallway/secondary/entry) "dmU" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 8; @@ -89021,6 +88954,21 @@ icon_state = "neutral" }, /area/hallway/primary/port) +"dAs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "sol_inner"; + locked = 1; + name = "Arrivals External Access"; + req_access = null; + req_access_txt = "0" + }, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "dAH" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 @@ -89051,13 +88999,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) -"dIX" = ( -/obj/machinery/door/airlock/external{ - id_tag = "admin_home"; - locked = 1 - }, -/turf/simulated/floor/plating, -/area/hallway/secondary/entry) "dJz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -89157,18 +89098,6 @@ icon_state = "white" }, /area/medical/cryo) -"dZY" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) "edg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -89228,20 +89157,7 @@ icon_state = "dark" }, /area/engine/break_room) -"eIn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" - }, -/area/crew_quarters/kitchen) -"eKG" = ( +"eEV" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; frequency = 1379; @@ -89266,6 +89182,19 @@ }, /turf/simulated/floor/plating, /area/hallway/secondary/entry) +"eIn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "cafeteria"; + tag = "icon-cafeteria (NORTHEAST)" + }, +/area/crew_quarters/kitchen) "eKN" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -89368,6 +89297,13 @@ icon_state = "white" }, /area/medical/virology) +"fwO" = ( +/obj/machinery/door/airlock/external{ + id_tag = "specops_home"; + locked = 1 + }, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "fyS" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 4; @@ -89470,21 +89406,13 @@ /obj/machinery/tcomms/core/station, /turf/simulated/floor/bluegrid, /area/tcommsat/server) -"gac" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +"gbT" = ( +/obj/machinery/door/airlock/external{ + id_tag = "admin_home"; + locked = 1 }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "gda" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -89512,12 +89440,21 @@ icon_state = "chapel" }, /area/chapel/main) -"gjh" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +"ged" = ( +/obj/structure/sink{ + dir = 8; + icon_state = "sink"; + pixel_x = -12; + pixel_y = 2 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -26 + }, +/obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -89543,6 +89480,22 @@ }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) +"gyR" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK"; + pixel_x = 0; + pixel_y = -32 + }, +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/decal/warning_stripes/south, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) "gGG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5; @@ -89597,6 +89550,21 @@ /obj/effect/spawner/airlock/s_to_n, /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) +"hlZ" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/xenobiology{ + name = "\improper Secure Lab" + }) "hnt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -89719,6 +89687,33 @@ }, /turf/simulated/floor/wood, /area/security/vacantoffice) +"iae" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/decal/warning_stripes/southeastcorner, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/xenobiology{ + name = "\improper Secure Lab" + }) +"ibR" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 2; + height = 11; + id = "specops_home"; + name = "port bay 2"; + width = 5 + }, +/turf/space, +/area/space) "ied" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -89741,6 +89736,17 @@ icon_state = "white" }, /area/medical/surgery1) +"iiB" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 3; + height = 5; + id = "sit_arrivals"; + name = "Cerebron Maintenance"; + width = 11 + }, +/turf/space, +/area/space) "imQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -89754,28 +89760,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/storage/primary) -"izZ" = ( -/obj/machinery/door/airlock/external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "sol_outer"; - locked = 1; - name = "Arrivals External Access"; - req_access = null; - req_access_txt = "0" - }, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1379; - layer = 3.3; - master_tag = "sol_airlock"; - name = "exterior access button"; - pixel_x = -13; - pixel_y = -23; - req_access_txt = "0" - }, -/turf/simulated/floor/plating, -/area/hallway/secondary/entry) "iDw" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/portable_atmospherics/canister/air, @@ -89808,6 +89792,16 @@ }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai_upload) +"iMC" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry{ + name = "Arrivals" + }) "iNq" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -89914,6 +89908,18 @@ icon_state = "freezerfloor" }, /area/medical/virology) +"jhQ" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/xenobiology{ + name = "\improper Secure Lab" + }) "jmm" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 2 @@ -89925,15 +89931,6 @@ icon_state = "floorgrime" }, /area/maintenance/incinerator) -"jrz" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; - name = "KEEP CLEAR: DOCKING AREA"; - pixel_y = 0 - }, -/turf/simulated/floor/plating, -/area/hallway/secondary/entry) "jsQ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -89952,6 +89949,11 @@ /area/hallway/secondary/entry{ name = "Arrivals" }) +"jGE" = ( +/obj/effect/decal/warning_stripes/southeast, +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) "jLP" = ( /obj/machinery/atmospherics/unary/vent_pump, /turf/simulated/floor/plasteel, @@ -89968,6 +89970,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/engineering) +"kmF" = ( +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "koz" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -90024,34 +90030,6 @@ }, /turf/simulated/floor/bluegrid, /area/assembly/chargebay) -"kxd" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - autoclose = 0; - frequency = 1449; - icon_state = "door_locked"; - id_tag = "xeno_airlock_exterior"; - locked = 1; - name = "Secure Lab External Airlock"; - req_access_txt = "55" - }, -/obj/machinery/access_button{ - command = "cycle_exterior"; - master_tag = "xeno_airlock_control"; - pixel_x = -25; - req_access_txt = "55" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) "kBq" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -90269,22 +90247,6 @@ /area/construction/hallway{ name = "\improper MiniSat Exterior" }) -"mcU" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0; - pixel_y = -32 - }, -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister/air, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) "mcY" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -90297,6 +90259,28 @@ icon_state = "dark" }, /area/security/podbay) +"mea" = ( +/obj/machinery/door/airlock/external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "sol_outer"; + locked = 1; + name = "Arrivals External Access"; + req_access = null; + req_access_txt = "0" + }, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1379; + layer = 3.3; + master_tag = "sol_airlock"; + name = "exterior access button"; + pixel_x = -13; + pixel_y = -23; + req_access_txt = "0" + }, +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "moJ" = ( /obj/structure/window/reinforced{ dir = 4 @@ -90326,17 +90310,6 @@ /area/medical/research{ name = "Research Division" }) -"muw" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 3; - height = 5; - id = "sit_arrivals"; - name = "Cerebron Maintenance"; - width = 11 - }, -/turf/space, -/area/space) "mAt" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -90361,6 +90334,18 @@ }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) +"mGK" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/xenobiology{ + name = "\improper Secure Lab" + }) "nbq" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -90387,6 +90372,11 @@ /obj/effect/spawner/airlock/s_to_n, /turf/simulated/wall, /area/construction) +"neT" = ( +/obj/effect/decal/warning_stripes/southwest, +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) "nhZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -90449,18 +90439,6 @@ /area/construction/hallway{ name = "\improper MiniSat Exterior" }) -"nyz" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) "nzK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -90483,6 +90461,17 @@ /area/construction/hallway{ name = "\improper MiniSat Exterior" }) +"nIZ" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 4; + height = 11; + id = "trade_dock"; + name = "port bay 4 at Cerebron"; + width = 9 + }, +/turf/space, +/area/space) "nKy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6; @@ -90512,11 +90501,6 @@ icon_state = "dark" }, /area/crew_quarters/courtroom) -"nUT" = ( -/obj/effect/decal/warning_stripes/southeast, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) "nUW" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -90709,6 +90693,34 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) +"pad" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/research{ + autoclose = 0; + frequency = 1449; + icon_state = "door_locked"; + id_tag = "xeno_airlock_exterior"; + locked = 1; + name = "Secure Lab External Airlock"; + req_access_txt = "55" + }, +/obj/machinery/access_button{ + command = "cycle_exterior"; + master_tag = "xeno_airlock_control"; + pixel_x = -25; + req_access_txt = "55" + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/xenobiology{ + name = "\improper Secure Lab" + }) "pdC" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -91045,6 +91057,24 @@ }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai_upload) +"rdz" = ( +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-06"; + level = 4.1; + tag = "icon-plant-06" + }, +/obj/effect/decal/warning_stripes/northwest, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK"; + pixel_y = 32 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry{ + name = "Arrivals" + }) "rjU" = ( /obj/structure/window/reinforced{ dir = 1; @@ -91087,17 +91117,6 @@ }, /turf/simulated/floor/plasteel, /area/engine/break_room) -"rwd" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 2; - height = 11; - id = "specops_home"; - name = "port bay 2"; - width = 5 - }, -/turf/space, -/area/space) "rxV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -91120,6 +91139,33 @@ }, /turf/simulated/floor/plating, /area/engine/engineering) +"rDg" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light{ + dir = 1; + on = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/xenobiology{ + name = "\improper Secure Lab" + }) +"rDy" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 7; + height = 5; + id = "sst_home"; + name = "Near Cerebron Arrivals"; + width = 11 + }, +/turf/space, +/area/space) "rEw" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -91202,6 +91248,18 @@ icon_state = "neutralcorner" }, /area/hallway/primary/port) +"rTO" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 9; + height = 18; + id = "admin_home"; + name = "port bay 1"; + timid = 1; + width = 19 + }, +/turf/space, +/area/space) "say" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -91348,16 +91406,6 @@ /area/construction/hallway{ name = "\improper MiniSat Exterior" }) -"sKw" = ( -/obj/effect/decal/warning_stripes/west, -/obj/machinery/light{ - dir = 8; - icon_state = "tube1" - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) "sQp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -91378,14 +91426,6 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"sVH" = ( -/obj/docking_port/stationary/whiteship{ - dir = 8; - id = "whiteship_cyberiad"; - name = "North of Cerebron" - }, -/turf/space, -/area/space) "tay" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -91504,29 +91544,15 @@ /area/maintenance/aft{ name = "Aft Maintenance" }) -"tWC" = ( -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" - }) -"ufg" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-06"; - level = 4.1; - tag = "icon-plant-06" +"ueD" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/obj/effect/decal/warning_stripes/northwest, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_y = 32 +/turf/simulated/floor/plasteel{ + icon_state = "white" }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry{ - name = "Arrivals" +/area/toxins/xenobiology{ + name = "\improper Secure Lab" }) "ugy" = ( /obj/structure/cable/yellow{ @@ -91603,10 +91629,6 @@ icon_state = "green" }, /area/hydroponics) -"uIp" = ( -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/hallway/secondary/entry) "uJn" = ( /obj/effect/spawner/airlock/w_to_e, /turf/simulated/wall/r_wall, @@ -91666,10 +91688,14 @@ }, /turf/simulated/floor/plasteel, /area/atmos) -"uWD" = ( -/obj/effect/decal/warning_stripes/southwest, -/obj/effect/decal/warning_stripes/north, +"uWq" = ( +/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, +/area/hallway/secondary/entry{ + name = "Arrivals" + }) +"vaO" = ( +/turf/simulated/wall, /area/hallway/secondary/entry) "veh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -91692,22 +91718,14 @@ icon_state = "redfull" }, /area/security/main) -"vqS" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +"vgQ" = ( +/obj/docking_port/stationary/whiteship{ + dir = 8; + id = "whiteship_cyberiad"; + name = "North of Cerebron" }, -/obj/machinery/light{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology{ - name = "\improper Secure Lab" - }) +/turf/space, +/area/space) "vtP" = ( /obj/machinery/conveyor/west{ id = "garbage" @@ -91791,18 +91809,6 @@ icon_state = "redcorner" }, /area/security/brig) -"vTC" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 9; - height = 18; - id = "admin_home"; - name = "port bay 1"; - timid = 1; - width = 19 - }, -/turf/space, -/area/space) "vVo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -91912,17 +91918,15 @@ /area/medical/research{ name = "Research Division" }) -"wFs" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 4; - height = 11; - id = "trade_dock"; - name = "port bay 4 at Cerebron"; - width = 9 +"wHZ" = ( +/obj/effect/spawner/window/reinforced, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; + name = "KEEP CLEAR: DOCKING AREA"; + pixel_y = 0 }, -/turf/space, -/area/space) +/turf/simulated/floor/plating, +/area/hallway/secondary/entry) "wJQ" = ( /obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/pipe/simple/visible{ @@ -91930,17 +91934,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) -"wOm" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 7; - height = 5; - id = "sst_home"; - name = "Near Cerebron Arrivals"; - width = 11 - }, -/turf/space, -/area/space) "wRS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -92074,21 +92067,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) -"xBg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "sol_inner"; - locked = 1; - name = "Arrivals External Access"; - req_access = null; - req_access_txt = "0" - }, -/turf/simulated/floor/plating, -/area/hallway/secondary/entry) "xEi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -92126,13 +92104,6 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central) -"xKH" = ( -/obj/machinery/door/airlock/external{ - id_tag = "specops_home"; - locked = 1 - }, -/turf/simulated/floor/plating, -/area/hallway/secondary/entry) "xOM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -98416,7 +98387,6 @@ aaa aaa aaa aaa -aac aaa aaa aaa @@ -98424,7 +98394,8 @@ aaa aaa aaa aaa -aac +aaa +aaa aaa aaa aaa @@ -98667,7 +98638,7 @@ aaa aaa aaa aaa -aac +aaa aaa aaa aaa @@ -99431,11 +99402,6 @@ aaa aaa aaa aaa -aac -aaa -aaa -aaa -aac aaa aaa aaa @@ -99452,7 +99418,12 @@ aaa aaa aaa aaa -aac +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -99965,7 +99936,7 @@ aaa aaa aaa aaa -aac +aaa aaa aaa aaa @@ -100530,7 +100501,7 @@ aaa aaa aaa aaa -wFs +nIZ aaa aaa aaa @@ -100786,9 +100757,9 @@ aaa aaa aaa aaa -uIp -izZ -jrz +kmF +mea +wHZ abq abq abq @@ -100811,7 +100782,7 @@ aaa aaa aaa aaa -rwd +ibR aaa aaa aaa @@ -100993,7 +100964,7 @@ aaa aaa aaa aaa -aac +aaa aaa aaa aaa @@ -101043,9 +101014,9 @@ acG aWD aWD aWD -dlO -eKG -uIp +vaO +eEV +kmF abq aaa abq @@ -101067,9 +101038,9 @@ aaa aaa aaa aaa -uIp -xKH -uIp +kmF +fwO +kmF abq aaa aaa @@ -101300,9 +101271,9 @@ aTN aTN aWG ayC -dlO -xBg -uIp +vaO +dAs +kmF aUN aUN abq @@ -101320,13 +101291,13 @@ aUN aUN aUN aaa -aac aaa -aac aaa -uIp +aaa +aaa +kmF bOx -uIp +kmF abq abq abq @@ -101487,11 +101458,11 @@ aaa aaa aaa aaa -aac aaa aaa aaa -aac +aaa +aaa aaa aaa aaa @@ -101508,7 +101479,7 @@ aaa aaa aaa aaa -aac +aaa aaa aaa aaa @@ -101557,9 +101528,9 @@ aWr aUW aWF aYa -dlO +vaO baH -mcU +gyR aUN abq abq @@ -101576,14 +101547,14 @@ aUN bBr bcy aUN -aac -aac aaa -aac -aac -uIp -xKH -uIp +aaa +aaa +aaa +aaa +kmF +fwO +kmF aUN aUN aUN @@ -101839,18 +101810,18 @@ aaa aaa aaa aWD -ufg -tWC -tWC -tWC -tWC -tWC -tWC -sKw +rdz +uWq +uWq +uWq +uWq +uWq +uWq +iMC bcy -dIX -uWD -dIX +gbT +neT +gbT aaa aaa aaa @@ -102010,7 +101981,6 @@ aaa aaa aaa aaa -aac aaa aaa aaa @@ -102042,7 +102012,8 @@ aaa aaa aaa aaa -wOm +aaa +rDy aaa aaa aaa @@ -102105,10 +102076,10 @@ bUB bUB bUB dgw -dIX -nUT -dIX -vTC +gbT +jGE +gbT +rTO aaa aaa aaa @@ -102528,7 +102499,6 @@ aaa aaa aaa aaa -aac aaa aaa aaa @@ -102536,7 +102506,8 @@ aaa aaa aaa aaa -aac +aaa +aaa aaa aaa aaa @@ -104146,11 +104117,11 @@ bzy bBw vFn aUN -aac +aaa aaa bKt aaa -aac +aaa aUN baJ bUQ @@ -104404,9 +104375,9 @@ baJ bDK aWD abq -uIp +kmF bKu -uIp +kmF abq aWD bRV @@ -104660,11 +104631,11 @@ bdR baJ bFG aWD -uIp -uIp +kmF +kmF bOx -uIp -uIp +kmF +kmF aWD bCx dfZ @@ -104918,7 +104889,7 @@ baJ bES aWD bMT -uIp +kmF bKu aUN bOT @@ -106679,15 +106650,6 @@ apd axk abq aaa -aac -aaa -aaa -aaa -aaa -aaa -aac -aaa -aac aaa aaa aaa @@ -106697,7 +106659,16 @@ aaa aaa aaa aaa -aac +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa apf @@ -106953,7 +106924,7 @@ aaa aaa aaa aaa -aac +aaa aaa aaa abq @@ -107182,7 +107153,7 @@ aaa aaa aaa aaa -muw +iiB aaa aaa aaa @@ -107707,13 +107678,13 @@ apd axk abq aaa -aac +aaa aaa aaa aEI aaa aaa -aac +aaa aaa aaa aaa @@ -107981,7 +107952,7 @@ aaa aaa aaa aaa -aac +aaa aaa aaa abq @@ -108229,7 +108200,7 @@ aGY ayK abq aaa -aac +aaa aaa aaa aaa @@ -108239,7 +108210,7 @@ aTS aaa aaa aaa -aac +aaa aaa abq apf @@ -114748,7 +114719,6 @@ dhi cVa cSO aaa -daz aaa aaa aaa @@ -114759,7 +114729,8 @@ aaa aaa aaa aaa -daz +aaa +aaa aaa aaa aaa @@ -114900,7 +114871,6 @@ aqu arW ake aWv -aac aaa aaa aaa @@ -114908,7 +114878,8 @@ aaa aaa aaa aaa -aac +aaa +aaa aHG aHG aHG @@ -115004,7 +114975,6 @@ dfG cWz cXI cSO -aac aaa aaa aaa @@ -115017,7 +114987,8 @@ aaa aaa aaa aaa -aac +aaa +aaa aaa aaa aaa @@ -115928,7 +115899,7 @@ azc amx auL ajg -aac +aaa aaa aaa aaa @@ -115936,7 +115907,7 @@ aaa aaa aFd aaa -aac +aaa aHG aKt aMf @@ -120658,7 +120629,6 @@ aaa aaa aaa aaa -aac aaa aaa aaa @@ -120671,7 +120641,8 @@ aaa aaa aaa aaa -aac +aaa +aaa aaa aaa aaa @@ -122967,7 +122938,7 @@ cVn cTY cTY cTY -dZY +mGK cNz aaa aaa @@ -123224,7 +123195,7 @@ cNz cNz cNz cNz -nyz +cJg cNz aaa aaa @@ -123481,7 +123452,7 @@ aaa aaa aaa cNz -nyz +cJg cNz aaa aaa @@ -123738,7 +123709,7 @@ aaa aaa aaa cNz -vqS +rDg cNz aaa aaa @@ -123995,7 +123966,7 @@ aaa aaa aaa cNz -nyz +cJg cNz aaa aaa @@ -124252,7 +124223,7 @@ aaa aaa aaa cNz -nyz +cJg cNz aaa aaa @@ -124509,7 +124480,7 @@ bZU bZU aaa cNz -nyz +cJg cNz aaa aaa @@ -124766,7 +124737,7 @@ cYm bZU aaa cNz -nyz +cJg cNz aaa cVF @@ -125023,11 +124994,11 @@ cZJ bZU aaa cNz -nyz +cJg cNz cNz cVG -daE +ged cWA cXg cVG @@ -125280,10 +125251,10 @@ cYw bZU aaa cNz -gjh -gac +jhQ +hlZ cTY -kxd +pad cWh cWF cXi @@ -125551,7 +125522,7 @@ cYR cZD daq dab -daI +iae dfD dbr dab @@ -126574,7 +126545,7 @@ aaa cVG dbF cXX -cYv +ueD cYV cZr bMu @@ -139294,7 +139265,6 @@ aaa aaa aaa aaa -aac aaa aaa aaa @@ -139305,7 +139275,8 @@ aaa aaa aaa aaa -aac +aaa +aaa aaa aaa aaa @@ -140065,10 +140036,6 @@ aaa aaa aaa aaa -aac -aaa -aaa -aac aaa aaa aaa @@ -140076,7 +140043,11 @@ aaa aaa aaa aaa -aac +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -140581,7 +140552,7 @@ aaa aaa aaa aaa -aac +aaa aaa aaa aaa @@ -140837,7 +140808,6 @@ aaa aaa aaa aaa -aac aaa aaa aaa @@ -140852,7 +140822,8 @@ aaa aaa aaa aaa -aac +aaa +aaa aaa aaa aaa @@ -141093,7 +141064,6 @@ aaa aaa aaa aaa -aac aaa aaa aaa @@ -141110,7 +141080,8 @@ aaa aaa aaa aaa -aac +aaa +aaa aaa aaa aaa @@ -142121,7 +142092,6 @@ aaa aaa aaa aaa -aac aaa aaa aaa @@ -142138,7 +142108,8 @@ aaa aaa aaa aaa -aac +aaa +aaa aaa aaa aaa @@ -142379,7 +142350,6 @@ aaa aaa aaa aaa -aac aaa aaa aaa @@ -142394,7 +142364,8 @@ aaa aaa aaa aaa -aac +aaa +aaa aaa aaa aaa @@ -142637,7 +142608,7 @@ aaa aaa aaa aaa -aac +aaa aaa aaa aaa @@ -143149,10 +143120,6 @@ aaa aaa aaa aaa -aac -aaa -aaa -aac aaa aaa aaa @@ -143160,7 +143127,11 @@ aaa aaa aaa aaa -aac +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -143920,7 +143891,6 @@ aaa aaa aaa aaa -aac aaa aaa aaa @@ -143931,7 +143901,8 @@ aaa aaa aaa aaa -aac +aaa +aaa aaa aaa aaa @@ -145680,7 +145651,7 @@ aaa aaa aaa aaa -sVH +vgQ aaa aaa aaa diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index f04c362a81d..231f4c6be60 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -5169,7 +5169,7 @@ /turf/simulated/floor/plasteel/white, /area/ruin/unpowered/syndicate_lava_base/medbay) "kT" = ( -/obj/structure/sign/redcross, +/obj/structure/sign/lifestar, /turf/simulated/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/medbay) "kV" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm index b22acc77af3..8084a99f002 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm @@ -549,9 +549,7 @@ /turf/simulated/floor/plasteel, /area/ruin/space/ancientstation) "bD" = ( -/obj/structure/sign/redcross{ - icon_state = "greencross" - }, +/obj/structure/sign/greencross, /turf/simulated/wall/rust, /area/ruin/space/ancientstation) "bE" = ( diff --git a/_maps/map_files/RandomZLevels/centcomAway.dmm b/_maps/map_files/RandomZLevels/centcomAway.dmm index 39e84d28b50..5adba1d2e08 100644 --- a/_maps/map_files/RandomZLevels/centcomAway.dmm +++ b/_maps/map_files/RandomZLevels/centcomAway.dmm @@ -3616,9 +3616,7 @@ }, /area/awaymission/centcomAway/general) "jd" = ( -/obj/structure/sign/redcross{ - icon_state = "lifestar" - }, +/obj/structure/sign/lifestar, /turf/simulated/wall/r_wall, /area/awaymission/centcomAway/general) "je" = ( diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 49cb653d453..c264ced51e2 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -40118,11 +40118,7 @@ }, /area/medical/morgue) "bEy" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "Medbay" - }, +/obj/structure/sign/lifestar, /turf/simulated/wall, /area/medical/reception) "bEz" = ( @@ -44657,11 +44653,7 @@ }, /area/medical/morgue) "bNe" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "Medbay" - }, +/obj/structure/sign/lifestar, /turf/simulated/wall/r_wall, /area/medical/chemistry) "bNf" = ( @@ -47798,11 +47790,7 @@ /area/medical/medbay2) "bSu" = ( /obj/effect/spawner/window/reinforced, -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "Medbay" - }, +/obj/structure/sign/lifestar, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -53971,11 +53959,7 @@ }, /area/medical/medbay2) "ccD" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "Medbay" - }, +/obj/structure/sign/lifestar, /turf/simulated/wall, /area/medical/cryo) "ccE" = ( @@ -60893,11 +60877,7 @@ }, /area/hallway/primary/aft) "cpj" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; - name = "Medbay" - }, +/obj/structure/sign/lifestar, /turf/simulated/wall, /area/maintenance/genetics) "cpk" = ( diff --git a/_maps/map_files/shuttles/admin_hospital.dmm b/_maps/map_files/shuttles/admin_hospital.dmm index 441c049b705..81b233aa2eb 100644 --- a/_maps/map_files/shuttles/admin_hospital.dmm +++ b/_maps/map_files/shuttles/admin_hospital.dmm @@ -75,9 +75,7 @@ }, /area/shuttle/administration) "ah" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; +/obj/structure/sign/lifestar{ name = "NHV Asclepius" }, /turf/simulated/shuttle/wall{ @@ -125,9 +123,7 @@ }, /area/shuttle/administration) "ak" = ( -/obj/structure/sign/redcross{ - desc = "The Star of Life, a symbol of Medical Aid."; - icon_state = "lifestar"; +/obj/structure/sign/lifestar{ name = "NHV Asclepius" }, /turf/simulated/shuttle/wall{ diff --git a/_maps/map_files/shuttles/emergency_meta.dmm b/_maps/map_files/shuttles/emergency_meta.dmm index ca2819c79c8..276b404cbf8 100644 --- a/_maps/map_files/shuttles/emergency_meta.dmm +++ b/_maps/map_files/shuttles/emergency_meta.dmm @@ -568,7 +568,7 @@ /turf/simulated/shuttle/floor, /area/shuttle/escape) "bm" = ( -/obj/structure/sign/redcross, +/obj/structure/sign/lifestar, /turf/simulated/shuttle/wall{ dir = 1; icon_state = "swallc2" @@ -920,7 +920,7 @@ /turf/simulated/shuttle/floor, /area/shuttle/escape) "bY" = ( -/obj/structure/sign/redcross, +/obj/structure/sign/lifestar, /turf/simulated/shuttle/wall{ dir = 8; icon_state = "swall2"; diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index e1303b90b43..ad77d1cffc1 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -153,10 +153,10 @@ icon = 'icons/obj/mining.dmi' icon_state = "xeno_warning" -/obj/structure/sign/redcross +/obj/structure/sign/lifestar name = "medbay" - desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here.'" - icon_state = "redcross" + desc = "The Star of Life, a symbol of Medical Aid." + icon_state = "lifestar" /obj/structure/sign/greencross name = "medbay" diff --git a/code/modules/economy/Economy_TradeDestinations.dm b/code/modules/economy/Economy_TradeDestinations.dm index 74d005e3b3b..0efa3a4a058 100644 --- a/code/modules/economy/Economy_TradeDestinations.dm +++ b/code/modules/economy/Economy_TradeDestinations.dm @@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(weighted_mundaneevent_locations) /datum/trade_destination/anansi name = "NSS Anansi" - description = "Medical station ran by Second Red Cross (but owned by NT) for handling emergency cases from nearby colonies." + description = "Medical station ran by Second Green Cross (but owned by NT) for handling emergency cases from nearby colonies." distance = 1.7 willing_to_buy = list() willing_to_sell = list() @@ -37,7 +37,7 @@ GLOBAL_LIST_EMPTY(weighted_mundaneevent_locations) /datum/trade_destination/anansi/get_custom_eventstring(var/event_type) if(event_type == RESEARCH_BREAKTHROUGH) - return "Thanks to research conducted on the NSS Anansi, Second Red Cross Society wishes to announce a major breakthough in the field of \ + return "Thanks to research conducted on the NSS Anansi, Second Green Cross Society wishes to announce a major breakthough in the field of \ [pick("mind-machine interfacing","neuroscience","nano-augmentation","genetics")]. Nanotrasen is expected to announce a co-exploitation deal within the fortnight." return null diff --git a/code/modules/vehicle/ambulance.dm b/code/modules/vehicle/ambulance.dm index 37c9d97e5c6..702b8e97201 100644 --- a/code/modules/vehicle/ambulance.dm +++ b/code/modules/vehicle/ambulance.dm @@ -63,7 +63,7 @@ /obj/item/key/ambulance name = "ambulance key" - desc = "A keyring with a small steel key, and tag with a red cross on it." + desc = "A keyring with a small steel key, and tag with a green cross on it." icon_state = "keydoc" diff --git a/code/modules/vehicle/snowmobile.dm b/code/modules/vehicle/snowmobile.dm index c4b8d7aefba..25d2f4e1ccf 100644 --- a/code/modules/vehicle/snowmobile.dm +++ b/code/modules/vehicle/snowmobile.dm @@ -13,5 +13,5 @@ /obj/item/key/snowmobile name = "snowmobile key" - desc = "A keyring with a small steel key, and tag with a red cross on it; clearly it's not implying you're going to the hospital for this..." + desc = "A keyring with a small steel key, and tag with a green cross on it; Clearly it's not implying you're going to the hospital for this..." icon_state = "keydoc" //get a better icon, sometime. diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi index 129f0a0e6e7..17101426105 100644 Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi index cd6f7eeec94..83cde24a8a4 100644 Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index 0cf67d92ef9..3f0b2180e58 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index e393e5b326e..1412801fa40 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index ebf6021fd21..11189a5a0ad 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ diff --git a/icons/obj/vehicles.dmi b/icons/obj/vehicles.dmi index 2f528c44c77..d377ff37a3f 100644 Binary files a/icons/obj/vehicles.dmi and b/icons/obj/vehicles.dmi differ