diff --git a/_maps/map_files/FestiveBall/FestiveStation.dmm b/_maps/map_files/FestiveBall/FestiveStation.dmm
index 43baee3745..9c748ee4a9 100644
--- a/_maps/map_files/FestiveBall/FestiveStation.dmm
+++ b/_maps/map_files/FestiveBall/FestiveStation.dmm
@@ -806,20 +806,6 @@
/obj/structure/festive/whitebrick/windowWELeftEnd,
/turf/open/floor/plasteel/dark,
/area/command/bridge)
-"acj" = (
-/obj/machinery/door/poddoor/shutters{
- id = "parkcomm";
- name = "Command Parking"
- },
-/turf/open/floor/festive/cobblestone,
-/area/edina/street)
-"ack" = (
-/obj/machinery/light/small{
- dir = 1;
- light_color = "#ffc1c1"
- },
-/turf/open/floor/festive/cobblestone,
-/area/edina/street)
"acl" = (
/obj/structure/table/reinforced,
/obj/item/aicard,
@@ -1052,20 +1038,6 @@
},
/turf/open/floor/festive/cobblestone,
/area/edina/street/secondary/command)
-"acX" = (
-/obj/machinery/button/door{
- id = "parkcomm";
- name = "Command Parking";
- pixel_x = 28;
- pixel_y = 7;
- req_one_access_txt = "2;19"
- },
-/obj/machinery/light{
- dir = 4;
- light_color = "#c1caff"
- },
-/turf/open/floor/festive/cobblestone,
-/area/edina/street)
"acY" = (
/obj/machinery/light/floor,
/turf/open/floor/carpet/purple,
@@ -1161,10 +1133,6 @@
},
/turf/open/floor/plasteel,
/area/command/heads_quarters/hop/private)
-"adr" = (
-/obj/effect/festive/street/streetlinenm,
-/turf/open/floor/festive/cobblestone,
-/area/edina/street)
"ads" = (
/obj/machinery/light{
dir = 8;
@@ -1291,20 +1259,6 @@
/obj/effect/decal/festive/fairylights,
/turf/open/floor/wood,
/area/command/heads_quarters/hop/private)
-"adQ" = (
-/obj/structure/bed,
-/obj/item/bedsheet/hop,
-/obj/effect/decal/festive/red_stockings,
-/obj/effect/landmark/start/head_of_personnel,
-/turf/open/floor/wood,
-/area/command/heads_quarters/hop/private)
-"adR" = (
-/obj/effect/festive/street/streetlinenm,
-/obj/vehicle/sealed/vectorcraft/auto{
- dir = 8
- },
-/turf/open/floor/festive/cobblestone,
-/area/edina/street)
"adS" = (
/obj/machinery/airalarm/directional/west,
/turf/open/floor/wood,
@@ -1391,18 +1345,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai)
-"aeg" = (
-/obj/machinery/light{
- dir = 4;
- light_color = "#c1caff"
- },
-/turf/open/floor/wood,
-/area/command/heads_quarters/hop/private)
-"aeh" = (
-/obj/effect/festive/street/streetlinenm,
-/obj/effect/festive/street/streetlinesm,
-/turf/open/floor/festive/cobblestone,
-/area/edina/street)
"aei" = (
/obj/structure/table/wood/fancy/black,
/obj/item/storage/photo_album,
@@ -1503,17 +1445,6 @@
/obj/structure/dresser,
/turf/open/floor/wood,
/area/command/heads_quarters/hop/private)
-"aeu" = (
-/obj/effect/festive/street/streetlineem,
-/obj/vehicle/sealed/vectorcraft/hop{
- dir = 1
- },
-/turf/open/floor/festive/cobblestone,
-/area/edina/street)
-"aev" = (
-/obj/effect/turf_decal/delivery/white,
-/turf/open/floor/festive/cobblestone,
-/area/edina/street)
"aew" = (
/obj/structure/reagent_dispensers/water_cooler,
/turf/open/floor/wood,
@@ -2057,57 +1988,6 @@
},
/turf/open/floor/plasteel/dark,
/area/command/gateway)
-"afE" = (
-/obj/machinery/gateway{
- dir = 9
- },
-/obj/effect/turf_decal/bot_white/right,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/command/gateway)
-"afF" = (
-/obj/machinery/gateway{
- dir = 1
- },
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/command/gateway)
-"afG" = (
-/obj/machinery/gateway{
- dir = 5
- },
-/obj/effect/turf_decal/bot_white/left,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/command/gateway)
"afH" = (
/obj/machinery/light{
dir = 4
@@ -2322,44 +2202,6 @@
"age" = (
/turf/open/floor/plasteel/dark,
/area/command/gateway)
-"agf" = (
-/obj/machinery/gateway{
- dir = 8
- },
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/command/gateway)
-"agg" = (
-/obj/machinery/gateway/centerstation,
-/turf/open/floor/plasteel/dark,
-/area/command/gateway)
-"agh" = (
-/obj/machinery/gateway{
- dir = 4
- },
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/command/gateway)
"agi" = (
/obj/structure/grille,
/obj/structure/festive/whitebrick/windowWELeftEnd,
@@ -2587,58 +2429,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/command/storage/eva)
-"agH" = (
-/obj/machinery/gateway{
- dir = 10
- },
-/obj/effect/turf_decal/bot_white/left,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/command/gateway)
-"agI" = (
-/obj/machinery/gateway,
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/command/gateway)
-"agJ" = (
-/obj/machinery/gateway{
- dir = 6
- },
-/obj/effect/turf_decal/bot_white/right,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/command/gateway)
"agK" = (
/obj/machinery/camera{
c_tag = "Fore Primary Hallway";
@@ -3111,11 +2901,6 @@
/obj/item/storage/firstaid/regular,
/turf/open/floor/plasteel,
/area/command/gateway)
-"ahL" = (
-/obj/structure/table,
-/obj/item/paper/pamphlet/gateway,
-/turf/open/floor/plasteel,
-/area/command/gateway)
"ahM" = (
/turf/open/floor/plasteel,
/area/command/gateway)
@@ -3197,11 +2982,6 @@
},
/turf/open/floor/festive/wooden/wooden1,
/area/command/corporate_showroom)
-"ahV" = (
-/obj/structure/bed,
-/obj/item/bedsheet/captain,
-/turf/open/floor/wood,
-/area/command/heads_quarters/captain/private)
"ahW" = (
/obj/structure/chair/comfy/brown,
/obj/effect/landmark/start/captain,
@@ -3350,13 +3130,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/command/storage/eva)
-"aik" = (
-/obj/item/radio/intercom{
- name = "Station Intercom (General)";
- pixel_x = -30
- },
-/turf/open/floor/plasteel,
-/area/command/gateway)
"ail" = (
/obj/structure/chair/stool,
/turf/open/floor/plasteel,
@@ -3958,23 +3731,6 @@
/obj/effect/festive/street/streetlineeast,
/turf/open/floor/festive/cobblestone,
/area/edina/street/secondary/command)
-"ajN" = (
-/obj/machinery/button/door{
- id = "parkcomm";
- name = "Command Parking";
- pixel_x = 28;
- pixel_y = 7;
- req_one_access_txt = "2;19"
- },
-/obj/machinery/light/small{
- dir = 4;
- light_color = "#d8b1b1"
- },
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 4
- },
-/turf/open/floor/festive/sidewalk,
-/area/edina/street/secondary/command)
"ajO" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -4635,19 +4391,6 @@
"alJ" = (
/turf/open/floor/festive/alleyway,
/area/edina/street/secondary/castle)
-"alK" = (
-/obj/effect/turf_decal/weather/snow/corner{
- color = "#FFFFFE";
- dir = 8
- },
-/obj/effect/turf_decal/weather/snow/corner{
- color = "#FFFFFE";
- dir = 9
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"alL" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/festive/sidewalk,
@@ -4662,15 +4405,6 @@
},
/turf/open/floor/carpet/arcade,
/area/commons/fitness/recreation)
-"alN" = (
-/obj/effect/turf_decal/weather/snow/corner{
- color = "#FFFFFE";
- dir = 5
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"alO" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/structure/cable/yellow{
@@ -4705,9 +4439,6 @@
},
/turf/open/floor/wood,
/area/maintenance/starboard/fore)
-"alT" = (
-/turf/open/floor/festive/cobblestone,
-/area/edina/street)
"alU" = (
/obj/effect/turf_decal/weather/snow/corner{
color = "#FFFFFE";
@@ -4786,76 +4517,11 @@
},
/turf/open/floor/festive/stairs/stairswest,
/area/maintenance/starboard/fore)
-"amh" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"ami" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"amj" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"amk" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/door/airlock/security/glass,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"aml" = (
-/obj/structure/cable/yellow{
- icon_state = "2-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"amm" = (
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"amn" = (
-/obj/machinery/door/airlock/security/glass,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"amo" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
"amp" = (
/obj/effect/festive/street/sidewalkw,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/festive/cobblestone,
/area/edina/street/intersection/princessperimeter/north)
-"amq" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 4
- },
-/obj/structure/festive/trainplatform/secorner,
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"amr" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -4865,12 +4531,6 @@
},
/turf/open/floor/plasteel,
/area/ai_monitored/command/storage/eva)
-"ams" = (
-/obj/structure/festive/trainplatform/edge_west,
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"amt" = (
/turf/open/floor/festive/stairs/stairseast,
/area/maintenance/starboard/fore)
@@ -5010,218 +4670,6 @@
/obj/effect/festive/street/streetliftedtile2,
/turf/open/floor/festive/cobblestone,
/area/edina/street/intersection/princessperimeter/north)
-"amL" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/table,
-/obj/item/poster/random_official,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"amM" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/closet/wardrobe/mixed,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"amN" = (
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/table,
-/obj/item/poster/random_official,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"amO" = (
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/closet/emcloset,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"amP" = (
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/table,
-/obj/item/poster/random_official,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"amQ" = (
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/closet/wardrobe/mixed,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"amR" = (
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/closet/crate{
- icon_state = "crateopen"
- },
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"amS" = (
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/closet/wardrobe/mixed,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"amT" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"amU" = (
-/obj/structure/cable/yellow,
-/obj/machinery/power/apc{
- areastring = "/area/maintenance/starboard/fore";
- dir = 1;
- name = "Starboard Bow Maintenance APC";
- pixel_y = -24
- },
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"amV" = (
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"amW" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/rack,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"amX" = (
-/obj/machinery/space_heater,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"amY" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/closet/firecloset,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"amZ" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/closet/emcloset,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"ana" = (
-/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"anb" = (
-/obj/machinery/suit_storage_unit/ce,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/plasteel/white,
-/area/command/heads_quarters/ce)
-"anc" = (
-/obj/machinery/button/door{
- id = "ceprivacy";
- name = "Privacy Shutters Control";
- pixel_y = 26
- },
-/obj/machinery/holopad,
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/command/heads_quarters/ce)
-"and" = (
-/obj/structure/rack,
-/obj/item/lighter,
-/obj/item/clothing/glasses/meson{
- pixel_y = 4
- },
-/obj/item/stock_parts/cell/high/plus,
-/obj/item/reagent_containers/pill/patch/silver_sulf,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/command/heads_quarters/ce)
-"ane" = (
-/obj/structure/filingcabinet/chestdrawer,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/mob/living/simple_animal/parrot/Poly,
-/turf/open/floor/plasteel/dark,
-/area/command/heads_quarters/ce)
-"anf" = (
-/obj/structure/closet/secure_closet/engineering_chief,
-/obj/machinery/power/apc/highcap/five_k{
- areastring = "/area/command/heads_quarters/ce";
- dir = 4;
- name = "CE Office APC";
- pixel_x = 24
- },
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/obj/item/key/CE,
-/turf/open/floor/plasteel/dark,
-/area/command/heads_quarters/ce)
"ang" = (
/obj/machinery/door/airlock/external{
name = "External Containment Access";
@@ -5244,12 +4692,6 @@
/obj/structure/flora/grass/both,
/turf/open/floor/grass/snow/edina,
/area/edina)
-"ank" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
"anl" = (
/turf/closed/wall/mineral/iron,
/area/security/prison)
@@ -5626,23 +5068,6 @@
},
/turf/open/floor/festive/wooden/wooden1,
/area/ai_monitored/security/armory)
-"aoc" = (
-/obj/structure/dresser,
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_x = 32;
- pixel_y = 32
- },
-/obj/machinery/newscaster/security_unit{
- pixel_y = 32
- },
-/turf/open/floor/carpet/red,
-/area/command/heads_quarters/hos)
-"aod" = (
-/obj/structure/sign/poster/contraband/donut_corp{
- pixel_y = -32
- },
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
"aoe" = (
/turf/closed/wall/mineral/iron,
/area/service/bar/atrium)
@@ -5666,11 +5091,6 @@
/obj/item/taperecorder,
/turf/open/floor/carpet,
/area/security/detectives_office)
-"aoh" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/rack,
-/turf/open/floor/festive/alleyway,
-/area/service/bar/atrium)
"aoi" = (
/obj/structure/closet/secure_closet/detective,
/turf/open/floor/carpet,
@@ -6120,24 +5540,6 @@
},
/turf/open/floor/festive/sidewalk,
/area/edina)
-"apo" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"app" = (
-/obj/structure/cable/yellow{
- icon_state = "2-8"
- },
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
"apq" = (
/obj/machinery/light{
dir = 8
@@ -6242,28 +5644,6 @@
/obj/structure/tank_dispenser/oxygen,
/turf/open/floor/wood,
/area/security/office)
-"apI" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 8
- },
-/obj/structure/fence{
- dir = 4
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
-"apJ" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 4
- },
-/obj/structure/fence{
- dir = 4
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"apK" = (
/obj/machinery/door/airlock/command{
name = "Head of Security's Office";
@@ -6451,15 +5831,6 @@
},
/turf/open/floor/holofloor/ice,
/area/edina)
-"aqi" = (
-/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
"aqj" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable/yellow{
@@ -7043,20 +6414,6 @@
},
/turf/open/floor/plating,
/area/tcommsat/server)
-"arw" = (
-/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 8;
- name = "8maintenance loot spawner"
- },
-/obj/structure/table,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
"arx" = (
/obj/structure/weightmachine/weightlifter,
/turf/open/floor/wood,
@@ -7108,16 +6465,6 @@
"arE" = (
/turf/open/floor/wood,
/area/security/warden)
-"arF" = (
-/obj/item/bedsheet/hos,
-/obj/structure/bed,
-/obj/effect/landmark/start/head_of_security,
-/obj/item/storage/fancy/donut_box,
-/obj/structure/sign/poster/official/nt_storm_officer{
- pixel_y = 32
- },
-/turf/open/floor/carpet/red,
-/area/command/heads_quarters/hos)
"arG" = (
/obj/machinery/computer/security,
/obj/machinery/firealarm{
@@ -7560,14 +6907,6 @@
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
-"asL" = (
-/obj/structure/fence,
-/obj/structure/streetdecor/lampfestive{
- pixel_x = 16;
- pixel_y = 10
- },
-/turf/open/floor/grass/snow/edina,
-/area/edina)
"asM" = (
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -7897,16 +7236,6 @@
/obj/structure/grille,
/turf/closed/wall/r_wall,
/area/engineering/atmos)
-"atC" = (
-/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/closet/toolcloset,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
"atD" = (
/obj/machinery/washing_machine,
/turf/open/floor/wood,
@@ -8201,22 +7530,6 @@
},
/turf/open/floor/circuit/telecomms/mainframe,
/area/tcommsat/server)
-"aur" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"aus" = (
-/obj/structure/cable/yellow{
- icon_state = "1-4"
- },
-/obj/structure/closet/toolcloset,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
"aut" = (
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
@@ -8655,15 +7968,6 @@
/obj/structure/table/reinforced,
/turf/open/floor/wood,
/area/security/processing)
-"avz" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer1,
-/obj/machinery/atmospherics/components/unary/portables_connector/layer3{
- dir = 1;
- pixel_x = 10
- },
-/obj/machinery/atmospherics/pipe/simple/yellow/visible,
-/turf/open/floor/plasteel,
-/area/engineering/atmos)
"avA" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 1
@@ -8776,11 +8080,6 @@
},
/turf/open/floor/grass/snow/edina,
/area/edina)
-"avQ" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/table,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
"avR" = (
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -9101,12 +8400,6 @@
"awz" = (
/turf/open/floor/wood,
/area/security/processing)
-"awA" = (
-/obj/machinery/door/airlock/external{
- name = "Gulag Shuttle Airlock"
- },
-/turf/open/floor/wood,
-/area/security/processing)
"awB" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer1,
/obj/machinery/atmospherics/components/binary/pump,
@@ -9376,20 +8669,6 @@
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
-"axo" = (
-/obj/machinery/atmospherics/components/trinary/mixer/airmix{
- dir = 8;
- node1_concentration = 0.21;
- node2_concentration = 0.79;
- piping_layer = 1;
- pixel_x = -5;
- pixel_y = -5
- },
-/obj/machinery/atmospherics/pipe/simple/yellow{
- dir = 5
- },
-/turf/open/floor/plasteel,
-/area/engineering/atmos)
"axp" = (
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 4
@@ -9667,116 +8946,6 @@
},
/turf/open/floor/festive/stairs/stairssouth,
/area/maintenance/starboard/fore)
-"aya" = (
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/rack,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"ayb" = (
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/closet/wardrobe/mixed,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"ayc" = (
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/closet/cardboard,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"ayd" = (
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"aye" = (
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/structure/table,
-/obj/item/flashlight/lamp,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"ayf" = (
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/structure/table,
-/obj/item/folder/white,
-/obj/item/pen,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"ayg" = (
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -2;
- pixel_y = 5
- },
-/obj/item/storage/fancy/donut_box,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"ayh" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 8;
- name = "8maintenance loot spawner"
- },
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"ayi" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/closet/wardrobe/mixed,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"ayj" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"ayk" = (
-/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"ayl" = (
-/turf/open/floor/festive/alleyway,
-/area/security/brig)
-"aym" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/festive/alleyway,
-/area/security/brig)
"ayn" = (
/obj/structure/closet/secure_closet/brig{
id = "Cell 1";
@@ -9917,31 +9086,6 @@
},
/turf/open/floor/wood,
/area/maintenance/starboard/fore)
-"ayI" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"ayJ" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/light/small,
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"ayK" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/structure/chair/office/dark{
- dir = 1
- },
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
"ayL" = (
/obj/docking_port/stationary{
dir = 4;
@@ -9954,33 +9098,6 @@
},
/turf/open/floor/grass/snow/edina,
/area/edina)
-"ayM" = (
-/obj/machinery/door/airlock/security/glass,
-/obj/machinery/door/firedoor,
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/turf/open/floor/festive/alleyway,
-/area/maintenance/starboard/fore)
-"ayN" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/turf/open/floor/festive/alleyway,
-/area/security/brig)
-"ayO" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/festive/alleyway,
-/area/security/brig)
"ayP" = (
/obj/item/radio/intercom{
desc = "Talk through this. It looks like it has been modified to not broadcast.";
@@ -10383,16 +9500,6 @@
},
/turf/closed/wall/r_wall,
/area/engineering/atmos)
-"azX" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/layer3{
- dir = 8;
- pixel_y = 10
- },
-/obj/machinery/atmospherics/pipe/simple/yellow/visible{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/engineering/atmos)
"azY" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 4
@@ -10406,22 +9513,6 @@
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
-"aAa" = (
-/obj/machinery/door/airlock/security/glass{
- id_tag = "outerbrig";
- name = "Brig";
- req_access_txt = "63"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/obj/machinery/door/firedoor,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/festive/alleyway,
-/area/security/brig)
"aAb" = (
/obj/machinery/door/poddoor/preopen{
id = "Secure Gate";
@@ -10431,19 +9522,6 @@
/obj/structure/cable/yellow,
/turf/open/floor/plating,
/area/security/brig)
-"aAc" = (
-/obj/machinery/door/firedoor,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/airlock/security{
- id_tag = "laborexit";
- name = "Labor Shuttle";
- req_access_txt = "63"
- },
-/turf/open/floor/festive/alleyway,
-/area/security/processing)
"aAd" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/door/firedoor,
@@ -10521,13 +9599,6 @@
/obj/effect/festive/street/streetlineinnerne,
/turf/open/floor/festive/cobblestone,
/area/science/robotics/mechbay)
-"aAo" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/festive/alleyway,
-/area/security/processing)
"aAp" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/door/firedoor,
@@ -10584,9 +9655,6 @@
},
/turf/open/floor/festive/cobblestone,
/area/science/robotics/mechbay)
-"aAy" = (
-/turf/open/floor/festive/alleyway,
-/area/security/processing)
"aAz" = (
/obj/machinery/light,
/turf/open/floor/wood,
@@ -10613,13 +9681,6 @@
/obj/effect/festive/street/sidewalkn,
/turf/open/floor/festive/cobblestone,
/area/security)
-"aAE" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/festive/alleyway,
-/area/service/bar/atrium)
"aAF" = (
/obj/effect/festive/street/streetlinenorth,
/obj/machinery/light{
@@ -10659,16 +9720,6 @@
},
/turf/open/floor/festive/cobblestone,
/area/science/robotics/mechbay)
-"aAK" = (
-/obj/machinery/light{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/festive/alleyway,
-/area/security/processing)
"aAL" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -10742,16 +9793,6 @@
/obj/item/storage/belt/utility/full/engi,
/turf/open/floor/festive/cobblestone,
/area/science/robotics/mechbay)
-"aBa" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/obj/item/radio/intercom{
- pixel_x = -26
- },
-/turf/open/floor/festive/alleyway,
-/area/security/processing)
"aBb" = (
/obj/machinery/light,
/turf/open/floor/engine/co2,
@@ -10949,16 +9990,6 @@
/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer1,
/turf/open/floor/plasteel,
/area/engineering/atmos)
-"aBM" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/layer3{
- dir = 4;
- pixel_y = 10
- },
-/obj/machinery/atmospherics/pipe/simple/yellow/visible{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/engineering/atmos)
"aBN" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output{
dir = 8
@@ -11043,18 +10074,6 @@
},
/turf/open/floor/festive/cobblestone,
/area/science/robotics/mechbay)
-"aBZ" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Equipment Room";
- req_access_txt = "1"
- },
-/obj/machinery/door/firedoor,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/festive/alleyway,
-/area/security/office)
"aCa" = (
/turf/open/floor/engine/n2o,
/area/engineering/atmos)
@@ -11189,18 +10208,6 @@
},
/turf/open/floor/plasteel/freezer,
/area/commons/dorms)
-"aCw" = (
-/obj/machinery/door/airlock/security/glass{
- id_tag = "outerbrig";
- name = "Brig";
- req_access_txt = "63"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/festive/alleyway,
-/area/service/bar/atrium)
"aCx" = (
/obj/machinery/door/airlock/security/glass,
/obj/machinery/door/firedoor,
@@ -11719,16 +10726,6 @@
},
/turf/open/floor/plating,
/area/service/bar/atrium)
-"aEm" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/festive/alleyway,
-/area/service/bar/atrium)
"aEn" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -11752,10 +10749,6 @@
/obj/effect/turf_decal/weather/snow/corner,
/turf/open/floor/festive/sidewalk,
/area/edina/street/secondary/command)
-"aEr" = (
-/obj/effect/festive/street/sidewalknsm,
-/turf/open/floor/festive/cobblestone,
-/area/edina/street)
"aEs" = (
/obj/structure/chair/stool,
/obj/structure/disposalpipe/segment{
@@ -13222,19 +12215,6 @@
},
/turf/open/floor/engine/vacuum,
/area/engineering/atmos)
-"aIc" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/layer3{
- dir = 8;
- pixel_y = 10
- },
-/obj/machinery/atmospherics/pipe/simple/yellow/visible{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer1{
- dir = 10
- },
-/turf/open/floor/plasteel,
-/area/engineering/atmos)
"aId" = (
/obj/machinery/atmospherics/pipe/manifold/yellow/visible,
/turf/open/floor/plasteel,
@@ -13840,9 +12820,6 @@
},
/turf/open/floor/festive/sidewalk,
/area/edina/street/primary/perimeter)
-"aJr" = (
-/turf/open/floor/festive/alleyway,
-/area/service/bar/atrium)
"aJs" = (
/obj/structure/table/wood,
/obj/machinery/microwave{
@@ -14100,12 +13077,6 @@
"aJX" = (
/turf/open/floor/carpet/orange,
/area/maintenance/bar)
-"aJY" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/festive/alleyway,
-/area/service/bar/atrium)
"aJZ" = (
/obj/structure/table/wood,
/obj/machinery/microwave{
@@ -14360,12 +13331,6 @@
},
/turf/open/floor/festive/alleyway,
/area/science)
-"aKJ" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/closet/wardrobe/mixed,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/festive/alleyway,
-/area/service/bar/atrium)
"aKK" = (
/obj/machinery/chem_dispenser/drinks,
/obj/structure/table/wood,
@@ -14422,16 +13387,6 @@
/obj/structure/chair/sofa/right,
/turf/open/floor/wood,
/area/maintenance/bar)
-"aKW" = (
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/festive/alleyway,
-/area/service/bar/atrium)
"aKX" = (
/obj/machinery/chem_dispenser/drinks/beer,
/obj/structure/table/wood,
@@ -14669,12 +13624,6 @@
},
/turf/open/floor/wood,
/area/security/prison)
-"aLF" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/rack,
-/turf/open/floor/festive/alleyway,
-/area/service/bar/atrium)
"aLG" = (
/obj/structure/streetdecor/lampfestive{
pixel_x = 16
@@ -15063,11 +14012,6 @@
"aMG" = (
/turf/closed/festive/whitebrick,
/area/science/lab)
-"aMH" = (
-/obj/structure/grille,
-/obj/structure/festive/whitebrick/windowNSRightEnd,
-/turf/open/floor/plasteel,
-/area/science/lab)
"aMI" = (
/obj/structure/grille,
/obj/structure/festive/whitebrick/windowNSMiddle,
@@ -15811,42 +14755,10 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/festive/stairs/stairssouth,
/area/service/bar/atrium)
-"aOy" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/table,
-/turf/open/floor/festive/alleyway,
-/area/service/bar/atrium)
-"aOz" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/closet/firecloset,
-/turf/open/floor/festive/alleyway,
-/area/service/bar/atrium)
"aOA" = (
/obj/effect/festive/street/streetliftedtile2,
/turf/open/floor/festive/cobblestone,
/area/edina/street/intersection/princessperimeter/north)
-"aOB" = (
-/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/festive/alleyway,
-/area/service/bar/atrium)
-"aOC" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 8;
- name = "8maintenance loot spawner"
- },
-/turf/open/floor/festive/alleyway,
-/area/service/bar/atrium)
-"aOD" = (
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/open/floor/festive/alleyway,
-/area/service/bar/atrium)
-"aOE" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/closet/wardrobe/mixed,
-/turf/open/floor/festive/alleyway,
-/area/service/bar/atrium)
"aOF" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -16140,30 +15052,6 @@
},
/turf/open/floor/festive/stairs/stairswest,
/area/service/bar/atrium)
-"aPs" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/festive/alleyway,
-/area/service/bar/atrium)
-"aPt" = (
-/obj/machinery/light/small,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/festive/alleyway,
-/area/service/bar/atrium)
-"aPu" = (
-/obj/machinery/door/airlock/security/glass{
- id_tag = "outerbrig";
- name = "Brig";
- req_access_txt = "63"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/festive/alleyway,
-/area/service/bar/atrium)
"aPv" = (
/obj/effect/festive/street/streetlinene,
/turf/open/floor/festive/cobblestone,
@@ -17526,14 +16414,6 @@
},
/turf/open/floor/wood,
/area/science)
-"aSE" = (
-/obj/structure/table/wood,
-/obj/structure/sign/poster/official/report_crimes{
- pixel_y = 32
- },
-/obj/item/storage/box/donkpockets,
-/turf/open/floor/wood,
-/area/science)
"aSF" = (
/obj/item/radio/intercom{
name = "Station Intercom";
@@ -17852,10 +16732,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/festive/cobblestone,
/area/edina/street/intersection/princessperimeter/north)
-"aTy" = (
-/obj/effect/festive/street/sidewalkn,
-/turf/open/floor/festive/cobblestone,
-/area/edina/street/primary/perimeter)
"aTz" = (
/turf/closed/festive/greybrick,
/area/commons/dorms)
@@ -18297,17 +17173,6 @@
},
/turf/open/floor/wood,
/area/science)
-"aUJ" = (
-/obj/machinery/status_display{
- pixel_y = -32
- },
-/obj/machinery/vending/cola/random,
-/obj/machinery/light,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/science)
"aUK" = (
/obj/machinery/vending/cigarette,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
@@ -18572,11 +17437,6 @@
},
/turf/open/floor/plasteel/white,
/area/science/explab)
-"aVy" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/obj/machinery/light/small,
-/turf/open/floor/carpet/red,
-/area/science/robotics)
"aVz" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
/obj/machinery/light/small{
@@ -19436,30 +18296,6 @@
},
/turf/open/indestructible/hotelwood,
/area/service/chapel/office)
-"aXL" = (
-/obj/structure/cable/yellow{
- icon_state = "2-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 1
- },
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/open/indestructible/hotelwood,
-/area/service/chapel/office)
"aXM" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -19958,12 +18794,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/commons/storage/tools)
-"aZh" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/turf/open/floor/festive/trainplatform,
-/area/maintenance/bar)
"aZi" = (
/turf/closed/festive/whitebrick,
/area/service/hydroponics)
@@ -20129,10 +18959,6 @@
"aZB" = (
/turf/open/floor/festive/alleyway,
/area/medical/medbay/aft)
-"aZC" = (
-/obj/machinery/light/small,
-/turf/open/indestructible/hotelwood,
-/area/service/chapel/office)
"aZD" = (
/obj/machinery/airalarm{
dir = 1;
@@ -21124,13 +19950,6 @@
},
/turf/open/floor/light,
/area/maintenance/bar)
-"bcC" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/turf/open/floor/festive/trainplatform,
-/area/maintenance/bar)
"bcD" = (
/obj/machinery/chem_master/condimaster,
/turf/open/floor/plasteel,
@@ -21430,12 +20249,6 @@
},
/turf/open/floor/plasteel/dark,
/area/commons/fitness/recreation)
-"bdu" = (
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/turf/open/floor/festive/trainplatform,
-/area/maintenance/bar)
"bdv" = (
/obj/machinery/light{
dir = 8
@@ -21763,17 +20576,6 @@
/obj/effect/landmark/start/research_director,
/turf/open/floor/carpet/purple,
/area/command/heads_quarters/rd/private)
-"bes" = (
-/obj/machinery/light{
- dir = 4
- },
-/obj/structure/bed,
-/obj/item/bedsheet/rd,
-/obj/machinery/status_display{
- pixel_x = 32
- },
-/turf/open/floor/holofloor/wood,
-/area/command/heads_quarters/rd/private)
"bet" = (
/obj/machinery/light/small{
brightness = 3;
@@ -22832,9 +21634,6 @@
},
/turf/open/indestructible/hotelwood,
/area/service/chapel/main)
-"bgY" = (
-/turf/open/floor/festive/cobblestone,
-/area/cargo)
"bgZ" = (
/obj/machinery/light/small{
dir = 1;
@@ -23799,18 +22598,6 @@
},
/turf/open/floor/plasteel/dark,
/area/service/cafeteria)
-"bjS" = (
-/obj/effect/turf_decal/weather/snow/corner{
- color = "#FFFFFE";
- dir = 8
- },
-/obj/structure/fence{
- dir = 4
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"bjT" = (
/obj/effect/festive/street/streetlineeast,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -27234,36 +26021,6 @@
"brJ" = (
/turf/open/floor/plasteel/checker,
/area/commons/dorms)
-"brK" = (
-/obj/effect/festive/trainrails/north{
- icon_state = "trainrails_west"
- },
-/obj/structure/fence{
- dir = 4
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
-"brL" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
-"brM" = (
-/obj/effect/festive/trainrails/north{
- icon_state = "trainrails_east"
- },
-/obj/structure/fence{
- dir = 4
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"brN" = (
/obj/structure/chair/wood/normal,
/turf/open/floor/plasteel/checker,
@@ -27440,13 +26197,6 @@
icon_state = "carpetsymbol"
},
/area/service/chapel/main/monastery)
-"bsn" = (
-/obj/structure/bed,
-/obj/item/bedsheet/black,
-/turf/open/floor/carpet{
- icon_state = "carpetsymbol"
- },
-/area/service/chapel/main/monastery)
"bso" = (
/obj/structure/fence/corner{
dir = 4
@@ -28147,11 +26897,6 @@
/obj/effect/landmark/start/shaft_miner,
/turf/open/floor/plasteel,
/area/cargo/miningoffice)
-"btM" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/landmark/start/shaft_miner,
-/turf/open/floor/plasteel,
-/area/cargo/miningoffice)
"btN" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -28217,22 +26962,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/indestructible/hotelwood,
/area/service/chapel/main/monastery)
-"btW" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/structure/extinguisher_cabinet{
- pixel_y = 32
- },
-/obj/machinery/light/small{
- dir = 1;
- light_color = "#ffc1c1"
- },
-/turf/open/indestructible/hotelwood,
-/area/service/chapel/main/monastery)
"btX" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -28256,20 +26985,6 @@
/obj/effect/landmark/start/chaplain,
/turf/open/indestructible/hotelwood,
/area/service/chapel/main/monastery)
-"btZ" = (
-/obj/structure/chair/sofa,
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/light/small{
- dir = 1;
- light_color = "#ffc1c1"
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/open/indestructible/hotelwood,
-/area/service/chapel/main/monastery)
"bua" = (
/obj/structure/chair/sofa/left,
/obj/structure/cable/yellow{
@@ -29207,9 +27922,6 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/service/kitchen)
-"bwk" = (
-/turf/open/floor/festive/cobblestone,
-/area/cargo/qm)
"bwl" = (
/obj/machinery/door/airlock/mining/glass{
name = "Quartermaster";
@@ -29316,10 +28028,6 @@
"bwv" = (
/turf/open/floor/carpet/green,
/area/service/chapel/main/monastery)
-"bww" = (
-/obj/machinery/light/small,
-/turf/open/floor/carpet/green,
-/area/service/chapel/main/monastery)
"bwx" = (
/obj/structure/cable/yellow{
icon_state = "1-4"
@@ -29611,19 +28319,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/dark,
/area/medical/medbay/aft)
-"bxn" = (
-/obj/structure/chair/wood/normal,
-/obj/effect/decal/festive/christmas_ivy_string,
-/turf/open/floor/carpet/green,
-/area/medical/surgery)
-"bxo" = (
-/obj/structure/chair/wood/normal,
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/decal/festive/christmas_ivy_string,
-/turf/open/floor/carpet/green,
-/area/medical/surgery)
"bxp" = (
/obj/machinery/light{
dir = 1
@@ -29781,12 +28476,6 @@
"bxN" = (
/turf/closed/festive/bluebrick/bluebrickcornersw,
/area/command/heads_quarters/cmo)
-"bxO" = (
-/obj/structure/festive/trainplatform/edge_east,
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"bxP" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -29855,13 +28544,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/commons/storage/tools)
-"bxY" = (
-/obj/machinery/door/poddoor/shutters{
- id = "QMgarage";
- name = "QM's Garage"
- },
-/turf/open/floor/festive/cobblestone,
-/area/cargo/qm)
"bxZ" = (
/obj/effect/festive/street/streetlinenw,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -29954,10 +28636,6 @@
},
/turf/open/floor/plasteel/dark,
/area/medical/medbay/aft)
-"byk" = (
-/obj/structure/chair/wood/normal,
-/turf/open/floor/carpet/green,
-/area/medical/surgery)
"byl" = (
/obj/machinery/holopad,
/turf/open/floor/carpet/green,
@@ -30521,57 +29199,10 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
/area/medical/genetics/cloning)
-"bzN" = (
-/obj/machinery/computer/operating,
-/obj/structure/sign/warning/nosmoking{
- pixel_x = -28
- },
-/turf/open/floor/plasteel,
-/area/medical/surgery)
-"bzO" = (
-/obj/structure/table,
-/obj/item/hemostat,
-/obj/item/surgicaldrill,
-/obj/effect/decal/festive/fairylights,
-/turf/open/floor/plasteel/white/side,
-/area/medical/surgery)
-"bzP" = (
-/obj/structure/table,
-/obj/item/cautery{
- pixel_x = 4
- },
-/obj/item/razor{
- pixel_y = 5
- },
-/obj/item/scalpel{
- pixel_y = 12
- },
-/obj/effect/decal/festive/fairylights,
-/turf/open/floor/plasteel/white/side,
-/area/medical/surgery)
-"bzQ" = (
-/obj/structure/table,
-/obj/item/retractor,
-/obj/item/circular_saw,
-/obj/structure/window/reinforced{
- dir = 4;
- layer = 2.9
- },
-/obj/effect/decal/festive/fairylights,
-/turf/open/floor/plasteel,
-/area/medical/surgery)
"bzR" = (
/obj/structure/closet,
/turf/open/floor/plasteel/white,
/area/medical/surgery)
-"bzS" = (
-/obj/structure/table,
-/obj/item/clothing/gloves/color/latex,
-/obj/item/clothing/mask/surgical,
-/obj/item/clothing/suit/apron/surgical,
-/obj/machinery/light,
-/turf/open/floor/plasteel/white,
-/area/medical/surgery)
"bzT" = (
/obj/structure/bed,
/obj/item/bedsheet/medical,
@@ -30745,36 +29376,6 @@
/obj/structure/extinguisher_cabinet,
/turf/closed/festive/whitebrick,
/area/medical/surgery)
-"bAu" = (
-/obj/machinery/light{
- dir = 8
- },
-/turf/open/floor/plasteel/white/side{
- dir = 4
- },
-/area/medical/surgery)
-"bAv" = (
-/obj/effect/landmark/start/medical_doctor,
-/turf/open/floor/plasteel/white,
-/area/medical/surgery)
-"bAw" = (
-/turf/open/floor/plasteel/white,
-/area/medical/surgery)
-"bAx" = (
-/obj/structure/cable/yellow{
- icon_state = "0-2"
- },
-/obj/structure/table,
-/obj/item/surgical_drapes,
-/obj/structure/window/reinforced{
- dir = 4;
- layer = 2.9
- },
-/obj/item/book/manual/wiki/surgery,
-/turf/open/floor/plasteel/white/side{
- dir = 8
- },
-/area/medical/surgery)
"bAy" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -31063,14 +29664,6 @@
/obj/effect/festive/street/sidewalknsm,
/turf/open/floor/festive/cobblestone,
/area/edina/street/intersection/princessprogress)
-"bAX" = (
-/obj/machinery/door/poddoor/shutters{
- id = "cargocars";
- name = "Cargo Loading dock"
- },
-/obj/machinery/door/firedoor,
-/turf/open/floor/festive/cobblestone,
-/area/cargo)
"bAY" = (
/obj/effect/turf_decal/loading_area{
dir = 8
@@ -31202,34 +29795,6 @@
},
/turf/closed/festive/whitebrick,
/area/medical/surgery)
-"bBn" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1
- },
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12;
- pixel_y = 2
- },
-/turf/open/floor/plasteel/white,
-/area/medical/surgery)
-"bBo" = (
-/obj/structure/table/optable,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel/white,
-/area/medical/surgery)
"bBp" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -31724,36 +30289,6 @@
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
/area/medical/surgery)
-"bCe" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12;
- pixel_y = 2
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
- },
-/obj/machinery/light_switch{
- pixel_x = -28
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/plasteel/white,
-/area/medical/surgery)
"bCf" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -32304,14 +30839,6 @@
},
/turf/open/floor/festive/cobblestone,
/area/edina/street/intersection/princessprogress)
-"bCN" = (
-/obj/effect/turf_decal/caution{
- dir = 8;
- pixel_x = 6;
- pixel_y = 16
- },
-/turf/open/floor/festive/cobblestone,
-/area/cargo)
"bCO" = (
/obj/machinery/light{
dir = 4
@@ -32532,21 +31059,6 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel,
/area/medical/surgery)
-"bDh" = (
-/obj/machinery/shower{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/medical/surgery)
"bDi" = (
/obj/machinery/shower{
dir = 1
@@ -33815,22 +32327,6 @@
},
/turf/open/floor/festive/wooden/wooden1,
/area/commons/dorms)
-"bGo" = (
-/obj/machinery/button/door{
- id = "rdgarage";
- name = "Director's Garage Door";
- pixel_x = -7;
- pixel_y = 26;
- req_access_txt = "30"
- },
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 8
- },
-/turf/open/floor/festive/alleyway,
-/area/edina/backstreet/med)
"bGp" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 1
@@ -33838,15 +32334,6 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/festive/alleyway,
/area/edina/backstreet/med)
-"bGq" = (
-/obj/structure/festive/trainplatform/edge_west,
-/obj/structure/fence{
- dir = 4
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"bGr" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/festive/wooden/wooden1,
@@ -34735,38 +33222,6 @@
},
/turf/open/floor/festive/alleyway,
/area/edina/backstreet/med)
-"bId" = (
-/obj/docking_port/stationary{
- dir = 8;
- dwidth = 4;
- height = 15;
- id = "emergency_home";
- name = "PubbyStation emergency evac bay";
- width = 20
- },
-/obj/structure/festive/trainplatform/edge_west,
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
-"bIe" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 4
- },
-/obj/structure/festive/trainplatform/necorner,
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
-"bIf" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1
- },
-/obj/structure/fence,
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"bIg" = (
/obj/effect/festive/street/sidewalkwem,
/turf/open/floor/festive/cobblestone,
@@ -35678,20 +34133,6 @@
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
/area/medical/storage)
-"bKf" = (
-/obj/docking_port/stationary{
- dir = 4;
- dwidth = 3;
- height = 5;
- id = "mining_home";
- name = "mining shuttle bay";
- roundstart_template = /datum/map_template/shuttle/mining/delta;
- width = 7
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"bKg" = (
/obj/structure/festive/greybrick/windowWELeftEnd,
/turf/open/floor/festive/trainplatform,
@@ -36088,21 +34529,6 @@
/obj/structure/fluff/lightpost/light,
/turf/open/floor/grass/snow/edina,
/area/edina)
-"bKX" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 5
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
-"bKY" = (
-/obj/effect/festive/trainrails/north,
-/obj/structure/fence,
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"bKZ" = (
/obj/effect/festive/street/sidewalke,
/turf/open/floor/festive/cobblestone,
@@ -36318,20 +34744,6 @@
color = "#967832"
},
/area/commons/locker)
-"bLv" = (
-/obj/machinery/button/door{
- id = "idquarters";
- name = "Privacy Control";
- pixel_x = -26;
- pixel_y = -26;
- req_access_txt = "30"
- },
-/obj/machinery/light/small,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
-/turf/open/floor/carpet/purple,
-/area/medical/storage)
"bLw" = (
/obj/machinery/door/airlock/medical{
name = "Patient Room A";
@@ -36515,15 +34927,6 @@
/mob/living/simple_animal/pet/dog/corgi/Lisa,
/turf/open/floor/grass,
/area/edina/crew_quarters/store/pet)
-"bLQ" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 4
- },
-/obj/structure/festive/trainplatform/edge_west,
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"bLR" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/shaker,
@@ -36694,13 +35097,6 @@
initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
},
/area/science)
-"bMl" = (
-/obj/effect/festive/trainrails/south,
-/obj/structure/fence,
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"bMm" = (
/obj/structure/closet/cardboard,
/obj/structure/reagent_dispensers/keg/milk,
@@ -37026,13 +35422,6 @@
},
/turf/open/floor/festive/wooden/wooden2,
/area/cargo/qm)
-"bMR" = (
-/obj/effect/turf_decal/weather/snow/corner,
-/obj/structure/fence,
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"bMS" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/dropper,
@@ -37488,17 +35877,6 @@
},
/turf/open/floor/carpet/cyan,
/area/medical/storage)
-"bNT" = (
-/obj/effect/spawner/structure/window,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "loungeshutters";
- name = "privacy shutters"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/carpet/cyan,
-/area/medical/storage)
"bNU" = (
/obj/machinery/vending/wallmed,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -37883,14 +36261,6 @@
/obj/structure/flora/grass/green,
/turf/open/floor/grass/snow/edina,
/area/edina/backstreet/med)
-"bOO" = (
-/obj/structure/closet/crate/medical,
-/obj/effect/decal/festive/fairylights,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/indestructible,
-/area/cargo/warehouse)
"bOP" = (
/obj/machinery/light/small,
/turf/open/indestructible,
@@ -37945,17 +36315,6 @@
/obj/structure/lattice,
/turf/open/floor/grass/snow/edina,
/area/edina)
-"bOY" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 8
- },
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"bOZ" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 1
@@ -38039,11 +36398,6 @@
},
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
-"bPj" = (
-/obj/effect/festive/street/streetlineem,
-/obj/effect/festive/street/streetlinewm,
-/turf/open/floor/plasteel,
-/area/medical/chemistry)
"bPk" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -39069,19 +37423,6 @@
},
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
-"bRe" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow,
-/obj/machinery/power/apc/auto_name{
- pixel_x = 30
- },
-/obj/structure/cable/yellow{
- icon_state = "0-2"
- },
-/turf/open/floor/plasteel/white,
-/area/medical/chemistry)
"bRf" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
@@ -39463,36 +37804,6 @@
},
/turf/open/floor/festive/wooden/wooden1,
/area/medical/chemistry)
-"bRP" = (
-/obj/structure/table/wood,
-/obj/item/grenade/chem_grenade,
-/obj/item/grenade/chem_grenade,
-/obj/item/grenade/chem_grenade,
-/obj/item/stack/cable_coil,
-/obj/item/assembly/igniter{
- pixel_x = 3;
- pixel_y = -7
- },
-/obj/item/assembly/timer{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/screwdriver{
- pixel_x = -2;
- pixel_y = 6
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/machinery/power/apc{
- areastring = "/area/medical/chemistry";
- dir = 1;
- name = "Chemistry Lab APC";
- pixel_y = -24
- },
-/obj/structure/cable/yellow,
-/turf/open/floor/festive/wooden/wooden1,
-/area/medical/chemistry)
"bRQ" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/glass/beaker/large,
@@ -39990,21 +38301,6 @@
},
/turf/open/floor/festive/alleyway,
/area/edina/backstreet/med)
-"bTk" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1
- },
-/obj/machinery/button/door{
- id = "weewoo";
- name = "Ambulance Garage button";
- pixel_y = 28;
- req_access_txt = "5"
- },
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/open/floor/festive/alleyway,
-/area/medical/cryo)
"bTl" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 1
@@ -40345,22 +38641,6 @@
},
/turf/open/floor/festive/cobblestone,
/area/edina/street/primary/servitor)
-"bTY" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 8
- },
-/obj/docking_port/stationary{
- dir = 4;
- dwidth = 5;
- height = 7;
- id = "supply_home";
- name = "Cargo Bay";
- width = 12
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"bTZ" = (
/obj/structure/toilet/secret/low_loot,
/obj/structure/window/spawner/east,
@@ -40484,18 +38764,6 @@
},
/turf/open/floor/festive/wooden/wooden1,
/area/commons/dorms)
-"bUs" = (
-/obj/machinery/button/door{
- id = "qm_warehouse";
- name = "Warehouse Door Control";
- pixel_y = 24;
- req_access_txt = "31"
- },
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1
- },
-/turf/open/floor/festive/alleyway,
-/area/edina/backstreet/supply)
"bUt" = (
/obj/structure/grille,
/obj/structure/festive/whitebrick/windowWELeftEnd,
@@ -40597,14 +38865,6 @@
color = "#967832"
},
/area/edina/backstreet/supply)
-"bUG" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/turf/open/floor/festive/white_alleyway{
- color = "#967832"
- },
-/area/edina/backstreet/supply)
"bUH" = (
/turf/open/floor/festive/white_alleyway{
color = "#967832"
@@ -40891,14 +39151,6 @@
"bVo" = (
/turf/closed/festive/greybrick,
/area/service/janitor)
-"bVp" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/festive/white_alleyway{
- color = "#967832"
- },
-/area/edina/backstreet/supply)
"bVq" = (
/obj/effect/festive/street/streetlinesw,
/turf/open/floor/festive/cobblestone,
@@ -41004,11 +39256,6 @@
},
/turf/open/floor/festive/alleyway,
/area/edina/backstreet/supply)
-"bVF" = (
-/obj/structure/grille,
-/obj/structure/festive/redbrick/windowNSRightEnd,
-/turf/closed/festive/redbrick,
-/area/security/checkpoint/supply)
"bVG" = (
/obj/structure/grille,
/obj/structure/festive/redbrick/windowNSMiddle,
@@ -41797,12 +40044,6 @@
/obj/effect/landmark/start/geneticist,
/turf/open/floor/plasteel/white,
/area/medical/genetics)
-"bXA" = (
-/obj/structure/bed,
-/obj/item/bedsheet/cmo,
-/obj/effect/landmark/start/chief_medical_officer,
-/turf/open/floor/carpet/royalblack,
-/area/command/heads_quarters/cmo)
"bXB" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -43126,13 +41367,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/festive/alleyway,
/area/edina/backstreet/supply)
-"caz" = (
-/obj/structure/streetdecor/lampfestive{
- pixel_x = -8;
- pixel_y = -5
- },
-/turf/open/floor/festive/sidewalk,
-/area/edina/street/primary/perimeter)
"caA" = (
/obj/machinery/door/airlock/public/glass{
name = "Hydroponics";
@@ -43270,15 +41504,6 @@
/obj/structure/window/spawner,
/turf/open/floor/plasteel/white,
/area/commons/fitness)
-"caO" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/structure/sign/poster/contraband/yes_erp{
- pixel_y = 32
- },
-/turf/open/floor/plasteel/white,
-/area/commons/fitness)
"caP" = (
/obj/machinery/door/airlock/medical{
name = "Showers"
@@ -43798,15 +42023,6 @@
},
/turf/open/floor/plating,
/area/cargo/storage)
-"cbJ" = (
-/obj/effect/turf_decal/weather/snow/corner,
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 8
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"cbK" = (
/obj/structure/grille,
/obj/structure/festive/whitebrick/windowWERightEnd,
@@ -44353,15 +42569,6 @@
},
/turf/open/floor/festive/sidewalk,
/area/edina/street/intersection/progcastaux)
-"cdn" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1
- },
-/obj/structure/festive/trainplatform/nwcorner,
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"cdo" = (
/obj/effect/turf_decal/weather/snow/corner,
/obj/structure/cable/yellow{
@@ -45104,11 +43311,6 @@
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
/turf/open/floor/festive/cobblestone,
/area/edina/street/primary/perimeter)
-"ceU" = (
-/obj/structure/bed,
-/obj/item/bedsheet/qm,
-/turf/open/floor/carpet/orange,
-/area/cargo/qm)
"ceV" = (
/obj/effect/turf_decal/weather/snow/corner{
color = "#FFFFFE";
@@ -45370,18 +43572,6 @@
color = "#ffe6a8"
},
/area/commons/fitness)
-"cfE" = (
-/obj/effect/turf_decal/weather/snow/corner{
- color = "#FFFFFF";
- dir = 4
- },
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"cfF" = (
/obj/structure/sign/poster/official/walk{
pixel_x = 32;
@@ -46101,23 +44291,6 @@
},
/turf/open/floor/festive/sidewalk,
/area/edina/street/primary/servitor)
-"cho" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1
- },
-/obj/machinery/button/door{
- id = "QMgarage";
- name = "Garage door button";
- pixel_y = 28
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/festive/sidewalk,
-/area/edina/street/primary/servitor)
"chp" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -46147,30 +44320,12 @@
},
/turf/open/floor/festive/cobblestone,
/area/edina/street/primary/servitor)
-"chs" = (
-/obj/effect/turf_decal/weather/snow/corner{
- color = "#FFFFFF";
- dir = 4
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"cht" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/festive/cobblestone,
/area/edina/street/primary/perimeter)
-"chu" = (
-/obj/machinery/button/door{
- id = "QMgarage";
- name = "Garage door button";
- pixel_x = -28
- },
-/obj/effect/festive/street/streetlinenm,
-/turf/open/floor/festive/cobblestone,
-/area/cargo/qm)
"chv" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 1
@@ -46649,13 +44804,6 @@
},
/turf/open/floor/festive/sidewalk,
/area/edina/street/primary/servitor)
-"ciH" = (
-/obj/effect/festive/street/streetlinenm,
-/obj/vehicle/sealed/vectorcraft/auto{
- dir = 8
- },
-/turf/open/floor/festive/cobblestone,
-/area/cargo/qm)
"ciI" = (
/obj/structure/window/reinforced{
dir = 8
@@ -46993,12 +45141,6 @@
},
/turf/open/floor/festive/sidewalk,
/area/edina/street/primary/servitor)
-"cjv" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/festive/white_alleyway{
- color = "#967832"
- },
-/area/edina/backstreet/supply)
"cjw" = (
/obj/machinery/conveyor{
dir = 1;
@@ -47263,16 +45405,6 @@
},
/turf/open/floor/carpet/blue,
/area/commons/cryopod)
-"cjT" = (
-/obj/structure/streetdecor/lampfestive{
- pixel_x = -8;
- pixel_y = -5
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 4
- },
-/turf/open/floor/festive/sidewalk,
-/area/edina/street/primary/perimeter)
"cjU" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/line{
@@ -49037,23 +47169,6 @@
},
/turf/open/floor/festive/sidewalk,
/area/edina/street/primary/perimeter)
-"cnS" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/button/door{
- id = "clowngarage";
- name = "Garage Door";
- pixel_y = 28
- },
-/turf/open/floor/festive/sidewalk,
-/area/edina/street/primary/perimeter)
"cnT" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -49376,18 +47491,6 @@
"coH" = (
/turf/open/floor/festive/sidewalk,
/area/edina/street/intersection/servsuppaux)
-"coI" = (
-/obj/structure/streetdecor/lampfestive{
- pixel_x = 8
- },
-/turf/open/floor/festive/sidewalk,
-/area/edina/street/primary/perimeter)
-"coJ" = (
-/obj/structure/streetdecor/lampfestive{
- pixel_x = -8
- },
-/turf/open/floor/festive/sidewalk,
-/area/edina/street/primary/perimeter)
"coK" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -49506,19 +47609,6 @@
},
/turf/open/floor/festive/cobblestone,
/area/edina/street/primary/perimeter)
-"cpa" = (
-/obj/structure/streetdecor/lampfestive{
- pixel_x = 8
- },
-/turf/open/floor/festive/sidewalk,
-/area/edina/street/intersection/servsuppaux)
-"cpb" = (
-/obj/effect/festive/street/streetlinewest,
-/obj/effect/turf_decal/arrows/white{
- dir = 1
- },
-/turf/open/floor/festive/cobblestone,
-/area/edina/street/intersection/servsuppaux)
"cpc" = (
/turf/open/floor/festive/cobblestone,
/area/edina/street/intersection/servsuppaux)
@@ -49690,10 +47780,6 @@
/obj/structure/festive/trainplatform/secorner,
/turf/open/floor/festive/sidewalk,
/area/edina/street/primary/perimeter)
-"cpJ" = (
-/obj/effect/festive/street/streetlineeast,
-/turf/open/floor/festive/cobblestone,
-/area/edina/street/intersection/servsuppaux)
"cpK" = (
/obj/structure/festive/trainplatform/swcorner,
/turf/open/floor/festive/sidewalk,
@@ -49840,12 +47926,6 @@
color = "#ffe994"
},
/area/edina/backstreet/med)
-"cqj" = (
-/obj/structure/streetdecor/lampfestive{
- pixel_x = -8
- },
-/turf/open/floor/festive/sidewalk,
-/area/edina/street/intersection/servsuppaux)
"cqk" = (
/obj/effect/festive/street/sidewalknsm,
/turf/open/floor/festive/cobblestone,
@@ -50163,10 +48243,6 @@
},
/turf/open/floor/festive/cobblestone,
/area/edina/street/primary/servitor)
-"crd" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/festive/sidewalk,
-/area/edina/street/intersection/servsuppaux)
"cre" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -50565,13 +48641,6 @@
},
/turf/open/floor/festive/cobblestone,
/area/edina/street/intersection/princessservitor)
-"csj" = (
-/obj/structure/streetdecor/lampfestive{
- pixel_x = -8;
- pixel_y = 20
- },
-/turf/open/floor/festive/sidewalk,
-/area/edina/street/intersection/princessservitor)
"csk" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
@@ -51100,30 +49169,6 @@
/obj/structure/festive/trainplatform/edge_north,
/turf/open/floor/festive/sidewalk,
/area/edina/street/intersection/princessperimeter/south)
-"ctK" = (
-/obj/structure/streetdecor/lampfestive{
- pixel_x = 8;
- pixel_y = 16
- },
-/turf/open/floor/festive/sidewalk,
-/area/edina/street/intersection/servsuppaux)
-"ctL" = (
-/obj/effect/festive/street/streetlinewest,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/festive/cobblestone,
-/area/edina/street/intersection/servsuppaux)
-"ctM" = (
-/obj/effect/festive/street/streetlineeast,
-/obj/effect/turf_decal/arrows/white,
-/turf/open/floor/festive/cobblestone,
-/area/edina/street/intersection/servsuppaux)
-"ctN" = (
-/obj/structure/streetdecor/lampfestive{
- pixel_x = -8;
- pixel_y = 16
- },
-/turf/open/floor/festive/sidewalk,
-/area/edina/street/intersection/servsuppaux)
"ctO" = (
/obj/effect/turf_decal/weather/snow/corner,
/turf/open/floor/festive/sidewalk,
@@ -51135,21 +49180,6 @@
},
/turf/open/floor/festive/cobblestone,
/area/edina/street/intersection/servsuppaux)
-"ctQ" = (
-/obj/effect/turf_decal/weather/snow/corner,
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
-"ctR" = (
-/obj/effect/turf_decal/weather/snow/corner,
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 4
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"ctS" = (
/obj/effect/festive/street/sidewalkwem,
/obj/structure/disposalpipe/segment{
@@ -51957,10 +49987,6 @@
"cvS" = (
/turf/closed/wall/mineral/wood/nonmetal,
/area/maintenance/bar)
-"cvT" = (
-/obj/effect/festive/street/sidewalkn,
-/turf/open/floor/festive/cobblestone,
-/area/edina/street/intersection/princessperimeter/south)
"cvU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/wood,
@@ -52182,12 +50208,6 @@
},
/turf/open/floor/plasteel,
/area/cargo/storage)
-"cwz" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/cargo/storage)
"cwA" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall/mineral/wood/nonmetal,
@@ -52196,18 +50216,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/mineral/wood/nonmetal,
/area/maintenance/bar)
-"cwC" = (
-/obj/structure/window/reinforced/tinted{
- dir = 4
- },
-/obj/structure/window/reinforced/tinted{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/turf/open/floor/festive/trainplatform,
-/area/maintenance/bar)
"cwD" = (
/turf/open/floor/plating/beach/sand,
/area/edina)
@@ -52238,24 +50246,6 @@
/obj/structure/chair/stool/bar,
/turf/open/floor/light,
/area/maintenance/bar)
-"cwJ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/decal/festive/christmas_ivy_string,
-/turf/open/floor/festive/trainplatform,
-/area/maintenance/bar)
-"cwK" = (
-/turf/open/floor/festive/trainplatform,
-/area/maintenance/bar)
-"cwL" = (
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/decal/festive/christmas_ivy_string,
-/turf/open/floor/festive/trainplatform,
-/area/maintenance/bar)
"cwM" = (
/obj/structure/festive/trainplatform/edge_east,
/obj/structure/chair/stool/bar,
@@ -52311,26 +50301,6 @@
},
/turf/open/floor/festive/sidewalk,
/area/edina/street/primary/perimeter)
-"cwT" = (
-/obj/effect/festive/street/streetlinenorth,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/arrows/white{
- dir = 4
- },
-/turf/open/floor/festive/cobblestone,
-/area/edina/street/intersection/princessperimeter/south)
-"cwU" = (
-/obj/effect/festive/street/sidewalkn,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/festive/cobblestone,
-/area/edina/street/primary/perimeter)
-"cwV" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/festive/trainplatform,
-/area/maintenance/bar)
"cwW" = (
/obj/structure/festive/trainplatform/edge_east,
/obj/structure/chair/stool/bar,
@@ -52360,10 +50330,6 @@
},
/turf/open/floor/wood,
/area/maintenance/bar)
-"cxb" = (
-/obj/effect/festive/street/streetlineem,
-/turf/open/floor/festive/cobblestone,
-/area/edina/street)
"cxc" = (
/obj/effect/festive/street/sidewalknsm,
/obj/effect/festive/street/streetliftedtile1,
@@ -52522,10 +50488,6 @@
},
/turf/open/floor/wood,
/area/maintenance/bar)
-"cxH" = (
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/festive/trainplatform,
-/area/maintenance/bar)
"cxI" = (
/obj/structure/grille,
/obj/structure/festive/bluebrick/windowWERightEnd,
@@ -52731,63 +50693,12 @@
/obj/effect/decal/festive/fairylights,
/turf/open/floor/wood,
/area/maintenance/bar)
-"cyr" = (
-/obj/structure/chair/sofa/left{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/decal/festive/fairylights,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"cys" = (
-/obj/structure/table/glass,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/decal/festive/fairylights,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"cyt" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/airalarm/directional/north,
-/obj/effect/decal/festive/fairylights,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"cyu" = (
-/obj/structure/table/glass,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- dir = 1
- },
-/obj/effect/decal/festive/fairylights,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"cyv" = (
-/obj/structure/chair/sofa/right{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/decal/festive/fairylights,
-/turf/open/floor/wood,
-/area/maintenance/bar)
"cyw" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
/turf/open/floor/wood,
/area/maintenance/bar)
-"cyx" = (
-/obj/structure/floodlight_frame{
- density = 0;
- name = "dancing pole"
- },
-/turf/open/floor/festive/trainplatform,
-/area/maintenance/bar)
"cyA" = (
/obj/structure/grille,
/obj/structure/festive/bluebrick/windowWELeftEnd,
@@ -52912,13 +50823,6 @@
/obj/structure/table/glass,
/turf/open/floor/wood,
/area/maintenance/bar)
-"cyX" = (
-/obj/structure/table/glass,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 1
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
"cyY" = (
/obj/structure/chair/sofa{
dir = 8
@@ -53008,17 +50912,6 @@
/obj/structure/festive/trainplatform/necorner,
/turf/open/floor/light,
/area/maintenance/bar)
-"czq" = (
-/obj/structure/festive/trainplatform/edge_south,
-/obj/structure/chair/stool/bar,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/light,
-/area/maintenance/bar)
-"czr" = (
-/obj/structure/festive/trainplatform/edge_south,
-/obj/structure/chair/stool/bar,
-/turf/open/floor/light,
-/area/maintenance/bar)
"czs" = (
/obj/structure/festive/trainplatform/nwcorner,
/turf/open/floor/light,
@@ -53159,38 +51052,6 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/wood,
/area/maintenance/bar)
-"czP" = (
-/obj/structure/chair/sofa{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"czQ" = (
-/obj/structure/table/glass,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"czR" = (
-/obj/structure/table/glass,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"czS" = (
-/obj/structure/chair/sofa{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
"czT" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
@@ -53286,38 +51147,6 @@
},
/turf/open/floor/wood,
/area/maintenance/bar)
-"cAr" = (
-/obj/structure/chair/sofa/right{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"cAs" = (
-/obj/structure/table/glass,
-/obj/machinery/chem_dispenser/drinks/beer/fullupgrade,
-/obj/machinery/light{
- light_color = "#c9d3e8"
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"cAu" = (
-/obj/structure/table/glass,
-/obj/machinery/chem_dispenser/drinks/fullupgrade,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"cAv" = (
-/obj/structure/table/glass,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"cAw" = (
-/obj/structure/chair/sofa/left{
- dir = 8
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
"cAx" = (
/turf/closed/festive/greybrick/greybrickcornersw,
/area/edina/street/primary/perimeter)
@@ -53377,98 +51206,10 @@
},
/turf/open/floor/festive/alleyway,
/area/edina/backstreet)
-"cAH" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
-"cAI" = (
-/obj/effect/turf_decal/weather/snow/corner{
- dir = 1
- },
-/obj/structure/festive/trainplatform/necorner,
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
-"cAJ" = (
-/obj/structure/festive/trainplatform/edge_south,
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"cAL" = (
/obj/structure/fluff/lightpost/light,
/turf/open/floor/plasteel/freezer,
/area/maintenance/bar)
-"cAM" = (
-/obj/effect/festive/trainrails/north,
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
-"cAN" = (
-/obj/effect/festive/trainrails/north,
-/obj/effect/festive/trainrails/north,
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
-"cAO" = (
-/obj/effect/festive/trainrails/north,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
-"cAP" = (
-/obj/effect/festive/trainrails/north{
- icon_state = "trainrails_turn_int"
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
-"cAQ" = (
-/obj/effect/festive/trainrails/south,
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
-"cAR" = (
-/obj/effect/festive/trainrails/south,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
-"cAS" = (
-/obj/effect/festive/trainrails/north{
- icon_state = "trainrails_turn_ext"
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
-"cAT" = (
-/obj/effect/turf_decal/weather/snow/corner,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
- },
-/area/edina)
"cAV" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -53593,6 +51334,12 @@
},
/turf/open/floor/plasteel,
/area/engineering/main)
+"cFE" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/indestructible,
+/area/cargo/storage)
"cGh" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 4
@@ -53637,12 +51384,28 @@
},
/turf/open/floor/wood,
/area/maintenance/bar)
+"cOx" = (
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/closet/emcloset,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"cPd" = (
/obj/structure/table,
/obj/item/book/manual/wiki/cooking_to_serve_man,
/obj/item/kitchen/rollingpin,
/turf/open/floor/plasteel/cafeteria,
/area/maintenance/bar/cafe)
+"cPf" = (
+/obj/structure/bed/double,
+/obj/item/bedsheet/cmo/double,
+/turf/open/floor/carpet/royalblack,
+/area/command/heads_quarters/cmo)
"cRE" = (
/obj/machinery/light/small{
dir = 8
@@ -53661,6 +51424,12 @@
},
/turf/open/floor/wood,
/area/maintenance/bar)
+"cXP" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/rack,
+/turf/open/floor/festive/alleyway/safe,
+/area/service/bar/atrium)
"cZi" = (
/obj/structure/table,
/obj/machinery/microwave{
@@ -53669,6 +51438,17 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/maintenance/bar/cafe)
+"daq" = (
+/obj/machinery/door/airlock/wood/glass,
+/turf/open/floor/wood,
+/area/commons/dorms)
+"dbM" = (
+/obj/item/bedsheet/chaplain/double,
+/obj/structure/bed/double,
+/turf/open/floor/carpet{
+ icon_state = "carpetsymbol"
+ },
+/area/service/chapel/main/monastery)
"dfl" = (
/obj/structure/table,
/obj/item/reagent_containers/food/condiment/enzyme{
@@ -53687,12 +51467,26 @@
/obj/item/reagent_containers/food/snacks/cheesewedge,
/turf/open/floor/festive/wooden/wooden2,
/area/edina/crew_quarters/store/pet)
+"dkW" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/airlock/security/glass,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"dlA" = (
/obj/structure/fireplace{
dir = 8
},
/turf/open/floor/wood,
/area/maintenance/bar)
+"dlP" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/open/floor/carpet/red,
+/area/science/robotics)
"dnQ" = (
/mob/living/simple_animal/pet/penguin/emperor/shamebrero,
/turf/open/floor/holofloor/ice,
@@ -53708,11 +51502,28 @@
/mob/living/simple_animal/pet/cat/kitten,
/turf/open/floor/grass,
/area/edina/crew_quarters/store/pet)
+"drE" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/light,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"dtb" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
+/turf/open/indestructible,
+/area/cargo/storage)
"dts" = (
/obj/item/storage/fancy/cigarettes/cigpack_mindbreaker,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/edina)
+"dtC" = (
+/obj/effect/festive/street/streetlinenm,
+/turf/open/floor/festive/cobblestone/safe,
+/area/edina/street)
"duf" = (
/obj/effect/decal/festive/holly,
/turf/closed/indestructible/riveted/hierophant,
@@ -53733,11 +51544,33 @@
"dAt" = (
/turf/open/floor/festive/wooden/wooden1,
/area/service/theater)
+"dCD" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"dNO" = (
+/obj/structure/chair/sofa/right{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/command/heads_quarters/ce)
"dSL" = (
/turf/open/floor/wood{
icon_state = "wood-broken2"
},
/area/commons/dorms)
+"dTl" = (
+/obj/effect/decal/festive/red_stockings,
+/obj/structure/bed/double,
+/obj/item/bedsheet/hop/double,
+/turf/open/floor/wood,
+/area/command/heads_quarters/hop/private)
+"dTA" = (
+/obj/structure/flora/rock/pile/icy,
+/turf/open/floor/grass,
+/area/edina)
"dTR" = (
/obj/structure/table,
/obj/item/storage/box/lights/mixed,
@@ -53755,6 +51588,10 @@
},
/turf/open/floor/plasteel/showroomfloor,
/area/maintenance/bar)
+"dZc" = (
+/obj/structure/dresser,
+/turf/open/floor/wood,
+/area/command/heads_quarters/ce)
"ecw" = (
/turf/closed/festive/whitebrick,
/area/service/theater)
@@ -53768,6 +51605,10 @@
/obj/item/clothing/gloves/mittens/random,
/turf/open/floor/festive/wooden/wooden1,
/area/edina/crew_quarters/store/clothes)
+"edd" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/cargo/miningoffice)
"edV" = (
/turf/closed/indestructible/riveted/hierophant,
/area/science)
@@ -53775,6 +51616,11 @@
/obj/item/chair/wood,
/turf/open/floor/wood,
/area/commons/dorms)
+"emh" = (
+/obj/effect/turf_decal/weather/snow/corner,
+/obj/structure/fence,
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"emA" = (
/turf/open/floor/wood{
icon_state = "wood-broken4"
@@ -53789,6 +51635,13 @@
},
/turf/open/floor/festive/alleyway,
/area/edina)
+"epq" = (
+/obj/effect/turf_decal/weather/snow/corner,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 6
+ },
+/turf/open/floor/festive/alleyway,
+/area/edina/backstreet/supply)
"epO" = (
/obj/machinery/conveyor{
dir = 1;
@@ -53815,16 +51668,49 @@
},
/turf/open/floor/festive/alleyway,
/area/edina)
+"eqV" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"erg" = (
+/obj/effect/festive/trainrails/north{
+ icon_state = "trainrails_turn_int"
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
+"ess" = (
+/obj/effect/festive/street/streetlineem,
+/obj/effect/festive/street/streetlinewm,
+/obj/machinery/button/door{
+ id = "chemistry_shutters";
+ name = "chemical factory garage";
+ pixel_x = 24;
+ pixel_y = 7;
+ req_access_txt = "5; 33"
+ },
+/turf/open/floor/plasteel,
+/area/medical/chemistry)
"esO" = (
/obj/structure/bed/dogbed{
name = "cat bed"
},
/turf/open/floor/grass,
/area/edina/crew_quarters/store/pet)
+"eto" = (
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
+ },
+/obj/effect/landmark/start/head_of_personnel,
+/turf/open/floor/wood,
+/area/command/heads_quarters/hop/private)
"ett" = (
/obj/item/reagent_containers/food/drinks/bottle/whiskey,
/turf/open/floor/plasteel,
/area/edina)
+"etO" = (
+/turf/open/floor/festive/trainplatform/safe,
+/area/maintenance/bar)
"euK" = (
/obj/structure/bed,
/obj/item/bedsheet/random,
@@ -53844,6 +51730,11 @@
/obj/effect/overlay/palmtree_r,
/turf/open/floor/plating/beach/sand,
/area/edina)
+"ezA" = (
+/obj/effect/decal/festive/christmas_ivy_string,
+/obj/structure/chair/pew/right,
+/turf/open/floor/carpet/green,
+/area/medical/surgery)
"ezS" = (
/obj/effect/turf_decal/weather/snow/corner{
color = "#FFFFFE";
@@ -53855,6 +51746,16 @@
/obj/machinery/light/small,
/turf/open/floor/wood,
/area/maintenance/bar)
+"eDX" = (
+/obj/machinery/light/small{
+ dir = 4;
+ light_color = "#d8b1b1"
+ },
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/turf/open/floor/festive/sidewalk,
+/area/edina/street/secondary/command)
"eEU" = (
/obj/structure/fireplace{
dir = 4;
@@ -53862,11 +51763,44 @@
},
/turf/open/floor/wood,
/area/maintenance/bar)
+"eEV" = (
+/obj/effect/festive/street/streetlineem,
+/obj/vehicle/sealed/vectorcraft/hop{
+ dir = 1
+ },
+/turf/open/floor/festive/cobblestone/safe,
+/area/edina/street)
"eGN" = (
/turf/open/floor/wood{
icon_state = "wood-broken3"
},
/area/commons/dorms)
+"eHI" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"eJn" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"eJr" = (
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/rack,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"eKm" = (
/obj/structure/window/reinforced{
dir = 8
@@ -53878,6 +51812,18 @@
/obj/vehicle/sealed/vectorcraft/rideable/wheelchair,
/turf/open/floor/grass/snow/edina,
/area/edina)
+"eKN" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/structure/table,
+/obj/item/paper_bin{
+ pixel_x = -2;
+ pixel_y = 5
+ },
+/obj/item/storage/fancy/donut_box,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"ePE" = (
/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
pixel_x = -9;
@@ -53897,6 +51843,27 @@
},
/turf/closed/wall/r_wall,
/area/engineering/main)
+"eUi" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ color = "#FFFFFF";
+ dir = 4
+ },
+/obj/effect/turf_decal/weather/snow/corner{
+ color = "#FFFFFE";
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
+/turf/open/floor/festive/alleyway,
+/area/edina/backstreet/supply)
+"eVv" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/turf/open/floor/festive/trainplatform/safe,
+/area/maintenance/bar)
"eYQ" = (
/obj/structure/table/glass,
/obj/item/clothing/gloves/mittens/random,
@@ -53926,6 +51893,13 @@
color = "#967832"
},
/area/cargo/qm)
+"fcu" = (
+/obj/effect/turf_decal/weather/snow/corner,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/festive/alleyway,
+/area/edina/backstreet/supply)
"feR" = (
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 4;
@@ -53938,6 +51912,12 @@
},
/turf/open/floor/festive/alleyway,
/area/edina)
+"ffv" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/closet/wardrobe/mixed,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/festive/alleyway/safe,
+/area/service/bar/atrium)
"fhW" = (
/obj/structure/chair/stool,
/turf/open/floor/plasteel/freezer,
@@ -53953,6 +51933,18 @@
/mob/living/simple_animal/jacq/car_spawner,
/turf/open/floor/festive/cobblestone,
/area/edina/street/primary/progress)
+"fmG" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ color = "#FFFFFF";
+ dir = 4
+ },
+/obj/effect/turf_decal/weather/snow/corner{
+ color = "#FFFFFE";
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/festive/alleyway,
+/area/edina/backstreet/supply)
"fqI" = (
/obj/machinery/door/airlock{
glass = 1;
@@ -53977,6 +51969,11 @@
"fwK" = (
/turf/open/floor/plasteel/white,
/area/commons/dorms)
+"fxe" = (
+/obj/effect/festive/trainrails/north,
+/obj/effect/festive/trainrails/north,
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"fxy" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 1
@@ -53986,6 +51983,20 @@
},
/turf/open/floor/festive/alleyway,
/area/edina)
+"fyV" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/service/bar/atrium)
+"fAm" = (
+/obj/machinery/space_heater,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"fBZ" = (
/mob/living/simple_animal/crab,
/turf/open/floor/holofloor/beach,
@@ -53994,6 +52005,13 @@
/obj/effect/decal/festive/christmas_ivy_string,
/turf/open/floor/carpet/blue,
/area/commons/cryopod)
+"fFx" = (
+/obj/effect/festive/street/streetlinenm,
+/obj/vehicle/sealed/vectorcraft/auto{
+ dir = 8
+ },
+/turf/open/floor/festive/cobblestone/safe,
+/area/cargo/qm)
"fIm" = (
/obj/structure/fence,
/obj/structure/cable{
@@ -54001,6 +52019,24 @@
},
/turf/open/floor/grass/snow/edina,
/area/edina/backstreet/supply)
+"fIx" = (
+/obj/effect/festive/trainrails/north{
+ icon_state = "trainrails_west"
+ },
+/obj/structure/fence{
+ dir = 4
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
+"fKp" = (
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/table,
+/obj/item/poster/random_official,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"fKS" = (
/obj/machinery/light/small{
dir = 1
@@ -54036,6 +52072,10 @@
/obj/item/clothing/head/festive,
/turf/open/floor/carpet/orange,
/area/maintenance/bar)
+"fYM" = (
+/obj/structure/table/wood,
+/turf/open/floor/carpet/orange,
+/area/command/heads_quarters/ce)
"fZm" = (
/obj/structure/chair/sofa/left{
dir = 1;
@@ -54050,6 +52090,24 @@
/mob/living/simple_animal/jacq/car_spawner,
/turf/open/floor/festive/alleyway,
/area/edina/street/secondary/command)
+"gby" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ color = "#FFFFFE";
+ dir = 8
+ },
+/obj/effect/turf_decal/weather/snow/corner{
+ color = "#FFFFFE";
+ dir = 9
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
+"gdx" = (
+/obj/machinery/light/small{
+ brightness = 3;
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/commons/fitness/recreation)
"ggz" = (
/obj/machinery/light/small{
dir = 1
@@ -54072,6 +52130,17 @@
},
/turf/open/floor/festive/alleyway,
/area/edina/street/secondary/castle)
+"gjk" = (
+/obj/machinery/door/airlock/security/glass{
+ id_tag = "outerbrig";
+ name = "Brig";
+ req_access_txt = "63"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/service/bar/atrium)
"gpj" = (
/obj/structure/bed/dogbed,
/mob/living/simple_animal/pet/fox,
@@ -54093,6 +52162,10 @@
/obj/item/reagent_containers/food/snacks/taco,
/turf/open/floor/carpet/royalblack,
/area/maintenance/bar)
+"gAp" = (
+/obj/structure/flora/grass/both,
+/turf/open/floor/grass,
+/area/edina)
"gAS" = (
/mob/living/simple_animal/chick,
/turf/open/floor/grass,
@@ -54111,11 +52184,45 @@
/obj/item/reagent_containers/food/snacks/sausage,
/turf/open/floor/carpet/royalblack,
/area/maintenance/bar)
+"gCX" = (
+/obj/effect/festive/trainrails/south,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
+"gDP" = (
+/obj/structure/table,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/surgery)
"gFH" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks/beer/fullupgrade,
/turf/open/floor/wood,
/area/maintenance/bar)
+"gGE" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ color = "#FFFFFF";
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
+/turf/open/floor/festive/alleyway,
+/area/edina/backstreet/supply)
+"gHc" = (
+/obj/effect/festive/street/streetlinewest,
+/obj/effect/turf_decal/arrows/white{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/festive/cobblestone,
+/area/edina/street/primary/perimeter)
"gIU" = (
/obj/structure/table/wood,
/obj/structure/cable/yellow{
@@ -54126,6 +52233,18 @@
},
/turf/open/floor/carpet/red,
/area/security/brig)
+"gJG" = (
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/table,
+/obj/item/poster/random_official,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"gMa" = (
/obj/structure/curtain{
color = "#B22222"
@@ -54136,24 +52255,112 @@
/obj/machinery/deepfryer,
/turf/open/floor/plasteel/cafeteria,
/area/maintenance/bar/cafe)
+"gSl" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/turf/open/floor/festive/sidewalk,
+/area/edina/street/primary/perimeter)
+"gTI" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/closet/cardboard,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"gUK" = (
+/obj/machinery/atmospherics/components/trinary/mixer/airmix{
+ dir = 8;
+ node1_concentration = 0.21;
+ node2_concentration = 0.79;
+ piping_layer = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/yellow{
+ dir = 5
+ },
+/turf/open/floor/plasteel,
+/area/engineering/atmos)
+"gZa" = (
+/obj/effect/turf_decal/caution{
+ dir = 8;
+ pixel_x = 6;
+ pixel_y = 16
+ },
+/turf/open/floor/festive/cobblestone/safe,
+/area/cargo)
+"gZc" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/table,
+/obj/item/poster/random_official,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"gZg" = (
/obj/machinery/vending/tool,
/turf/open/floor/circuit/off,
/area/science)
+"gZz" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/table,
+/obj/item/flashlight/lamp,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"hbo" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ color = "#FFFFFE";
+ dir = 5
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"heG" = (
/obj/structure/mineral_door/wood{
name = "Bedroom"
},
/turf/open/floor/wood,
/area/commons/dorms)
+"hfZ" = (
+/obj/structure/fluff/lightpost/light,
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"hie" = (
/obj/structure/bookcase/random/adult,
/turf/open/floor/wood,
/area/maintenance/bar)
+"hii" = (
+/obj/structure/festive/trainplatform/edge_west,
+/obj/structure/fence{
+ dir = 4
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
+"hiA" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"hji" = (
/obj/structure/dresser,
/turf/open/floor/wood,
/area/maintenance/bar)
+"hjA" = (
+/obj/structure/chair/pew/left,
+/turf/open/floor/carpet/green,
+/area/medical/surgery)
"hki" = (
/obj/structure/window/reinforced{
dir = 8
@@ -54182,6 +52389,15 @@
},
/turf/open/floor/festive/alleyway,
/area/edina)
+"hom" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 8
+ },
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 1
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"hoN" = (
/mob/living/simple_animal/pet/penguin/emperor/shamebrero,
/turf/open/floor/holofloor/ice,
@@ -54200,6 +52416,36 @@
icon_state = "wood-broken5"
},
/area/commons/dorms)
+"hra" = (
+/obj/effect/landmark/start/medical_doctor,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/surgery)
+"hsj" = (
+/turf/open/floor/festive/alleyway/safe,
+/area/security/brig)
+"hsH" = (
+/obj/effect/decal/festive/fairylights,
+/turf/open/floor/wood,
+/area/command/heads_quarters/ce)
+"htH" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
+ },
+/obj/effect/decal/festive/fairylights,
+/obj/machinery/vending/boozeomat{
+ pixel_y = 31
+ },
+/turf/open/floor/wood,
+/area/maintenance/bar)
"huk" = (
/obj/structure/table/plasmaglass,
/obj/item/multitool,
@@ -54208,6 +52454,21 @@
/obj/item/multitool,
/turf/open/floor/circuit/off,
/area/science)
+"hvD" = (
+/obj/structure/flora/grass/brown,
+/turf/open/floor/grass,
+/area/edina)
+"hvF" = (
+/obj/effect/festive/street/sidewalkn,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/festive/cobblestone,
+/area/edina/street/primary/perimeter)
"hxw" = (
/obj/structure/mineral_door/wood,
/turf/closed/wall/mineral/wood,
@@ -54228,11 +52489,33 @@
},
/turf/open/floor/festive/wooden/wooden1,
/area/edina/crew_quarters/store/pet)
+"hzz" = (
+/obj/structure/streetdecor/lampfestive{
+ pixel_x = 8;
+ pixel_y = 16
+ },
+/turf/open/floor/festive/sidewalk,
+/area/edina/street/intersection/princessperimeter/south)
+"hBm" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
+/turf/open/floor/plasteel,
+/area/cargo/storage)
"hER" = (
/obj/machinery/rnd/production/circuit_imprinter,
/obj/effect/decal/festive/christmas_ivy_string,
/turf/open/floor/circuit/off,
/area/science)
+"hFc" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
+/turf/open/floor/festive/sidewalk,
+/area/edina/street/primary/servitor)
"hHy" = (
/obj/structure/closet/crate,
/obj/item/storage/fancy/candle_box,
@@ -54256,12 +52539,34 @@
/obj/effect/turf_decal/weather/snow/corner,
/turf/open/floor/festive/alleyway,
/area/edina/street/secondary/castle)
+"hPB" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/closet/firecloset,
+/turf/open/floor/festive/alleyway/safe,
+/area/service/bar/atrium)
"hPL" = (
/obj/structure/statue/gold/rd{
anchored = 1
},
/turf/open/floor/festive/alleyway,
/area/edina/street/secondary/castle)
+"hQq" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/effect/turf_decal/bot_white,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/command/gateway)
"hTY" = (
/obj/structure/bed/dogbed,
/turf/open/floor/grass,
@@ -54300,10 +52605,59 @@
/obj/effect/mob_spawn/human/bartender/alive,
/turf/open/floor/wood,
/area/maintenance/bar)
+"ids" = (
+/obj/effect/turf_decal/bot_white/right,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/command/gateway)
+"igY" = (
+/obj/structure/streetdecor/lampfestive{
+ pixel_x = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/festive/sidewalk,
+/area/edina/street/intersection/servsuppaux)
"ihe" = (
/obj/machinery/autolathe/hacked,
/turf/open/floor/circuit/off,
/area/science)
+"ihO" = (
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/closet/wardrobe/mixed,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"iiv" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/obj/structure/festive/trainplatform/necorner,
+/turf/open/floor/plating/dirt/space,
+/area/edina)
+"ikc" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/decal/festive/fairylights,
+/obj/structure/table/glass,
+/turf/open/floor/wood,
+/area/maintenance/bar)
"ikY" = (
/obj/structure/table/glass,
/obj/item/toy/fluff/tennis_poly,
@@ -54315,6 +52669,9 @@
},
/turf/open/floor/festive/wooden/wooden1,
/area/edina/crew_quarters/store/pet)
+"ims" = (
+/turf/open/floor/festive/cobblestone/safe,
+/area/cargo/qm)
"imW" = (
/obj/effect/decal/festive/holly,
/turf/closed/indestructible/riveted/boss,
@@ -54329,18 +52686,42 @@
/obj/machinery/vending/tool,
/turf/open/floor/circuit/off,
/area/science)
+"ipT" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 8
+ },
+/obj/structure/streetdecor/lampfestive{
+ pixel_y = 16
+ },
+/turf/open/floor/festive/sidewalk,
+/area/edina/street/primary/perimeter)
"iqa" = (
/obj/effect/festive/trainrails/north{
icon_state = "trainrails_east"
},
/turf/closed/indestructible/rock/snow,
/area/edina)
+"iqD" = (
+/turf/open/floor/festive/alleyway/safe,
+/area/service/bar/atrium)
"irN" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 8
},
/turf/closed/indestructible/rock/snow,
/area/edina)
+"irU" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/turf/open/floor/festive/trainplatform/safe,
+/area/maintenance/bar)
+"isz" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"iug" = (
/obj/effect/festive/trainrails/north{
icon_state = "trainrails_west"
@@ -54356,6 +52737,16 @@
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/wood,
/area/commons/dorms)
+"iyk" = (
+/obj/structure/table/glass,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 1
+ },
+/obj/machinery/chem_dispenser/drinks/fullupgrade{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/maintenance/bar)
"izr" = (
/obj/structure/table,
/obj/item/reagent_containers/food/condiment/flour{
@@ -54366,6 +52757,24 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/maintenance/bar/cafe)
+"iAx" = (
+/obj/structure/closet/secure_closet/engineering_chief,
+/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/command/heads_quarters/ce";
+ dir = 4;
+ name = "CE Office APC";
+ pixel_x = 24
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/item/key/CE,
+/turf/open/floor/plasteel/dark,
+/area/command/heads_quarters/ce)
"iAN" = (
/obj/machinery/light/floor{
alpha = 0;
@@ -54375,14 +52784,38 @@
},
/turf/open/indestructible/airblock,
/area/science)
+"iEF" = (
+/obj/effect/decal/festive/fairylights,
+/obj/structure/table/optable,
+/turf/open/floor/plasteel/white/side,
+/area/medical/surgery)
"iFP" = (
/mob/living/simple_animal/jacq/car_spawner,
/turf/open/floor/grass/snow/edina,
/area/edina)
+"iHO" = (
+/obj/structure/bed/double{
+ dir = 1
+ },
+/obj/item/bedsheet/ce/double{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/command/heads_quarters/ce)
"iIf" = (
/mob/living/simple_animal/babyKiwi,
/turf/open/floor/festive/wooden/wooden2,
/area/edina/crew_quarters/store/pet)
+"iJS" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
+ },
+/obj/structure/streetdecor/lampfestive{
+ pixel_x = -8;
+ pixel_y = 25
+ },
+/turf/open/floor/festive/sidewalk,
+/area/edina/street/primary/perimeter)
"iKG" = (
/obj/structure/closet/crate/bin{
pixel_y = 8
@@ -54409,6 +52842,13 @@
/obj/machinery/computer/nanite_cloud_controller,
/turf/open/floor/circuit/off,
/area/science)
+"iMw" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ color = "#FFFFFE";
+ dir = 8
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"iOS" = (
/obj/structure/table,
/obj/machinery/reagentgrinder{
@@ -54418,6 +52858,54 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/maintenance/bar/cafe)
+"iOU" = (
+/obj/structure/mineral_door/wood,
+/turf/open/floor/wood,
+/area/command/heads_quarters/ce)
+"iRB" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/indestructible,
+/area/cargo/storage)
+"iTj" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/table,
+/obj/item/folder/white,
+/obj/item/pen,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"iUf" = (
+/obj/effect/festive/trainrails/north,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
+"iWh" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/item/radio/intercom{
+ pixel_x = -26
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/security/processing)
+"jaX" = (
+/obj/structure/closet/crate/medical,
+/obj/effect/decal/festive/fairylights,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/indestructible,
+/area/cargo/warehouse)
"jdx" = (
/obj/machinery/door/airlock/wood/glass{
name = "Hotel"
@@ -54445,6 +52933,48 @@
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/carpet/red,
/area/commons/dorms)
+"jhn" = (
+/obj/machinery/button/door{
+ id = "rdgarage";
+ name = "Director's Garage Door";
+ pixel_x = -7;
+ pixel_y = -6;
+ req_access_txt = "30"
+ },
+/turf/closed/festive/whitebrick,
+/area/command/heads_quarters/rd)
+"jiq" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"jir" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/indestructible,
+/area/cargo/storage)
+"jiU" = (
+/obj/machinery/light{
+ light_color = "#c9d3e8"
+ },
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"jjm" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
+/turf/open/indestructible,
+/area/cargo/storage)
+"jkV" = (
+/obj/effect/landmark/start/chief_engineer,
+/turf/open/floor/carpet/orange,
+/area/command/heads_quarters/ce)
+"jnu" = (
+/obj/structure/festive/trainplatform/edge_south,
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"jqv" = (
/obj/structure/table/glass,
/obj/item/toy/fluff/tennis_poly/green,
@@ -54462,6 +52992,34 @@
/obj/machinery/light/small,
/turf/open/floor/wood,
/area/maintenance/bar)
+"jwW" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
+"jxv" = (
+/obj/machinery/shower{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/medical/surgery)
+"jyZ" = (
+/obj/machinery/computer/gateway_control,
+/turf/open/floor/plasteel,
+/area/command/gateway)
"jzG" = (
/obj/structure/table,
/obj/machinery/smartfridge/disks,
@@ -54511,10 +53069,41 @@
/obj/effect/decal/festive/christmas_ivy_string,
/turf/open/floor/circuit/off,
/area/science)
+"jLx" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/service/bar/atrium)
+"jSd" = (
+/obj/effect/festive/trainrails/north,
+/obj/structure/fence,
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"jUo" = (
/obj/structure/table/plasmaglass,
/turf/open/floor/circuit/off,
/area/science)
+"jVu" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/festive/alleyway/safe,
+/area/security/processing)
+"jXQ" = (
+/obj/machinery/door/firedoor,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock/security{
+ id_tag = "laborexit";
+ name = "Labor Shuttle";
+ req_access_txt = "63"
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/security/processing)
"jZF" = (
/obj/structure/chair/comfy/brown{
buildstackamount = 0;
@@ -54525,6 +53114,17 @@
},
/turf/open/floor/wood,
/area/commons/dorms)
+"kcU" = (
+/obj/machinery/button/door{
+ id = "qm_warehouse";
+ name = "Warehouse Door Control";
+ pixel_y = -8;
+ req_access_txt = "31"
+ },
+/turf/closed/festive/whitebrick{
+ color = "#967832"
+ },
+/area/cargo/warehouse)
"kda" = (
/obj/structure/window/reinforced{
dir = 8
@@ -54553,6 +53153,16 @@
/obj/effect/decal/festive/holly,
/turf/open/indestructible/airblock,
/area/science)
+"kgC" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/decal/festive/fairylights,
+/obj/structure/chair/sofa/right{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/maintenance/bar)
"klL" = (
/obj/structure/bed,
/obj/item/bedsheet,
@@ -54570,6 +53180,14 @@
/obj/item/reagent_containers/food/drinks/ale,
/turf/open/floor/wood,
/area/maintenance/bar)
+"knX" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/decal/festive/christmas_ivy_string,
+/turf/open/floor/festive/trainplatform/safe,
+/area/maintenance/bar)
"kpp" = (
/obj/structure/table/wood,
/obj/item/clothing/glasses/sunglasses,
@@ -54577,10 +53195,34 @@
/obj/item/reagent_containers/food/drinks/beer,
/turf/open/floor/wood,
/area/maintenance/bar)
+"krj" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/table/glass,
+/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/maintenance/bar)
"ksx" = (
/obj/structure/barricade/sandbags,
/turf/open/indestructible/airblock,
/area/science)
+"ktV" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/light,
+/turf/open/floor/festive/alleyway/safe,
+/area/service/bar/atrium)
+"kuv" = (
+/obj/effect/festive/street/streetlinenorth,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
+/turf/open/floor/festive/cobblestone,
+/area/edina/street/primary/perimeter)
"kwB" = (
/obj/effect/turf_decal/stripes/white/corner,
/obj/effect/turf_decal/stripes/white/line{
@@ -54588,6 +53230,12 @@
},
/turf/open/floor/plating/beach/sand,
/area/edina)
+"kxn" = (
+/obj/effect/festive/trainrails/north{
+ icon_state = "trainrails_turn_ext"
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"kyR" = (
/mob/living/simple_animal/pet/dog/corgi,
/turf/open/floor/grass,
@@ -54598,6 +53246,45 @@
},
/turf/open/floor/festive/alleyway,
/area/edina/street/secondary/castle)
+"kBc" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
+/turf/open/floor/festive/alleyway,
+/area/edina/backstreet/med)
+"kBg" = (
+/obj/structure/streetdecor/lampfestive{
+ pixel_x = -8;
+ pixel_y = 20
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/festive/sidewalk,
+/area/edina/street/intersection/princessservitor)
+"kEA" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/festive/alleyway,
+/area/edina/backstreet/med)
+"kFU" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/closet/wardrobe/mixed,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"kIp" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/sign/poster/contraband/yes_erp{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel/white,
+/area/commons/fitness)
"kSC" = (
/obj/structure/toilet{
dir = 4
@@ -54631,6 +53318,11 @@
},
/turf/open/floor/wood,
/area/maintenance/bar)
+"kZK" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/rack,
+/turf/open/floor/festive/alleyway/safe,
+/area/service/bar/atrium)
"kZN" = (
/obj/machinery/light,
/turf/open/floor/plasteel/white/side{
@@ -54651,6 +53343,9 @@
/obj/machinery/nanite_program_hub,
/turf/open/floor/circuit/off,
/area/science)
+"lhG" = (
+/turf/open/floor/festive/alleyway/safe,
+/area/security/processing)
"lhY" = (
/obj/structure/closet/secure_closet/bar,
/obj/item/storage/box/drinkingglasses,
@@ -54661,11 +53356,38 @@
/obj/item/storage/box/drinkingglasses,
/turf/open/floor/wood,
/area/maintenance/bar)
+"llh" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/machinery/status_display{
+ pixel_x = 32
+ },
+/obj/item/bedsheet/rd/double,
+/obj/structure/bed/double,
+/turf/open/floor/holofloor/wood,
+/area/command/heads_quarters/rd/private)
+"lnf" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/rack,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"lnp" = (
+/obj/structure/festive/trainplatform/edge_west,
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"loi" = (
/obj/structure/table/wood/fancy/red,
/obj/item/reagent_containers/food/snacks/cubancarp,
/turf/open/floor/carpet/royalblack,
/area/maintenance/bar)
+"lpr" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/table/glass,
+/turf/open/floor/wood,
+/area/maintenance/bar)
"lpy" = (
/obj/structure/statue/sandstone/assistant{
anchored = 1
@@ -54677,10 +53399,32 @@
/obj/effect/decal/festive/christmas_reef,
/turf/closed/indestructible/riveted/hierophant,
/area/science)
+"lwU" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"lyO" = (
/obj/item/lighter/greyscale,
/turf/open/floor/wood,
/area/commons/dorms)
+"lzC" = (
+/obj/structure/table,
+/obj/structure/window/reinforced{
+ dir = 4;
+ layer = 2.9
+ },
+/obj/effect/decal/festive/fairylights,
+/obj/item/storage/backpack/duffelbag/med/surgery,
+/turf/open/floor/plasteel,
+/area/medical/surgery)
"lzS" = (
/obj/structure/chair/comfy/beige,
/turf/open/floor/circuit/off,
@@ -54691,6 +53435,15 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/maintenance/bar/cafe)
+"lCN" = (
+/obj/machinery/button/door{
+ id = "weewoo";
+ name = "Ambulance Garage button";
+ pixel_y = -5;
+ req_access_txt = "5"
+ },
+/turf/closed/festive/whitebrick,
+/area/medical/cryo)
"lDE" = (
/obj/structure/fence/post{
dir = 8
@@ -54706,6 +53459,18 @@
/obj/structure/flora/tree/pine/xmas,
/turf/open/floor/grass/snow/edina,
/area/science)
+"lGt" = (
+/obj/effect/festive/street/streetlineeast,
+/obj/effect/turf_decal/arrows/white,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/festive/cobblestone,
+/area/edina/street/intersection/servsuppaux)
+"lHd" = (
+/obj/machinery/gateway,
+/turf/open/floor/plasteel/dark,
+/area/command/gateway)
"lIt" = (
/obj/item/flashlight/glowstick/cyan,
/turf/open/floor/wood,
@@ -54716,6 +53481,13 @@
},
/turf/open/floor/plating/beach/sand,
/area/edina)
+"lLN" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/obj/structure/festive/trainplatform/edge_west,
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"lLP" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime,
@@ -54725,15 +53497,33 @@
/mob/living/simple_animal/mouse/white,
/turf/open/floor/grass,
/area/edina)
+"lMs" = (
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/open/floor/festive/alleyway/safe,
+/area/service/bar/atrium)
"lNo" = (
/obj/effect/decal/festive/christmas_ivy_string,
/turf/open/indestructible/airblock,
/area/science)
+"lNw" = (
+/obj/structure/reagent_dispensers/watertank,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"lNU" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/rag,
/turf/open/floor/wood,
/area/maintenance/bar)
+"lOl" = (
+/obj/effect/festive/trainrails/north{
+ icon_state = "trainrails_west"
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
+"lOs" = (
+/obj/effect/festive/street/streetlineem,
+/turf/open/floor/festive/cobblestone/safe,
+/area/edina/street)
"lPf" = (
/obj/machinery/rnd/production/circuit_imprinter,
/turf/open/floor/circuit/off,
@@ -54746,6 +53536,22 @@
/obj/item/storage/box/handcuffs,
/turf/open/floor/grass/fakebasalt,
/area/edina)
+"lUJ" = (
+/obj/machinery/door/airlock/security/glass{
+ id_tag = "outerbrig";
+ name = "Brig";
+ req_access_txt = "63"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/festive/alleyway/safe,
+/area/security/brig)
"lVW" = (
/obj/structure/fluff/lightpost/light,
/turf/open/floor/plating/beach/sand,
@@ -54758,6 +53564,16 @@
/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind,
/turf/open/floor/plating/beach/sand,
/area/edina)
+"lYf" = (
+/obj/structure/rack,
+/obj/item/lighter,
+/obj/item/clothing/glasses/meson{
+ pixel_y = 4
+ },
+/obj/item/stock_parts/cell/high/plus,
+/obj/item/reagent_containers/pill/patch/silver_sulf,
+/turf/open/floor/plasteel/dark,
+/area/command/heads_quarters/ce)
"lYh" = (
/obj/structure/fence{
dir = 4
@@ -54773,11 +53589,28 @@
},
/turf/open/floor/circuit/off,
/area/science)
+"lZg" = (
+/obj/effect/festive/street/streetlinenm,
+/obj/vehicle/sealed/vectorcraft/auto{
+ dir = 8
+ },
+/turf/open/floor/festive/cobblestone/safe,
+/area/edina/street)
"mdc" = (
/obj/structure/table/wood/fancy/red,
/obj/item/reagent_containers/food/snacks/soup/hotchili,
/turf/open/floor/carpet/royalblack,
/area/maintenance/bar)
+"mdW" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/festive/cobblestone,
+/area/edina/street/intersection/servsuppaux)
+"mhn" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/festive/trainplatform/safe,
+/area/maintenance/bar)
"miw" = (
/obj/structure/rack,
/obj/item/clothing/neck/stripedbluescarf,
@@ -54786,6 +53619,16 @@
/obj/item/clothing/gloves/mittens/random,
/turf/open/floor/festive/wooden/wooden1,
/area/edina/crew_quarters/store/clothes)
+"mkJ" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/festive/alleyway/safe,
+/area/security/processing)
"mkV" = (
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/grenade/chem_grenade/cleaner,
@@ -54804,6 +53647,12 @@
dir = 8
},
/area/commons/dorms)
+"mlQ" = (
+/obj/structure/festive/trainplatform/edge_north{
+ pixel_y = -7
+ },
+/turf/open/floor/festive/trainplatform/safe,
+/area/maintenance/bar)
"mmZ" = (
/turf/open/floor/plasteel/showroomfloor,
/area/maintenance/bar)
@@ -54811,6 +53660,9 @@
/obj/machinery/light/small,
/turf/open/floor/carpet/red,
/area/commons/dorms)
+"mra" = (
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"mrd" = (
/obj/structure/table/wood,
/obj/machinery/microwave,
@@ -54821,6 +53673,18 @@
/obj/structure/barricade/security,
/turf/open/indestructible/airblock,
/area/science)
+"msf" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/table/glass,
+/obj/item/reagent_containers/food/drinks/shaker{
+ pixel_x = -9;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/rag,
+/turf/open/floor/wood,
+/area/maintenance/bar)
"msV" = (
/obj/structure/chair/wood/normal,
/turf/open/floor/carpet/orange,
@@ -54828,12 +53692,45 @@
"mua" = (
/turf/open/floor/carpet/royalblack,
/area/maintenance/bar)
+"mud" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/table,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"mvL" = (
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"mwj" = (
+/obj/effect/festive/street/streetlinenm,
+/obj/effect/festive/street/streetlinesm,
+/turf/open/floor/festive/cobblestone/safe,
+/area/edina/street)
"mwL" = (
/obj/structure/cable/yellow{
icon_state = "1-4"
},
/turf/open/floor/festive/alleyway,
/area/science)
+"mAf" = (
+/obj/effect/decal/festive/fairylights,
+/obj/structure/chair/sofa/corner{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/command/heads_quarters/ce)
+"mCD" = (
+/obj/effect/turf_decal/weather/snow/corner,
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"mGF" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 8
@@ -54846,10 +53743,37 @@
/mob/living/simple_animal/jacq/car_spawner,
/turf/open/floor/festive/sidewalk,
/area/edina/street/primary/perimeter)
+"mIM" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/turf/open/floor/festive/trainplatform/safe,
+/area/maintenance/bar)
+"mJc" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 1
+ },
+/obj/structure/festive/trainplatform/nwcorner,
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"mJQ" = (
/obj/effect/decal/festive/christmas_ivy_string,
/turf/open/floor/circuit/off,
/area/science)
+"mLs" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"mOZ" = (
+/obj/structure/bed/double,
+/obj/structure/sign/poster/official/nt_storm_officer{
+ pixel_y = 32
+ },
+/obj/item/bedsheet/hos/double,
+/turf/open/floor/carpet/red,
+/area/command/heads_quarters/hos)
"mRx" = (
/obj/machinery/light/floor{
alpha = 0;
@@ -54873,6 +53797,28 @@
/obj/item/stock_parts/cell/hyper,
/turf/open/floor/circuit/off,
/area/science)
+"mTy" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/plasteel/white,
+/area/medical/surgery)
"mUg" = (
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/machinery/light{
@@ -54880,6 +53826,30 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/maintenance/bar/cafe)
+"mUJ" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"mVK" = (
+/obj/docking_port/stationary{
+ dir = 4;
+ dwidth = 3;
+ height = 5;
+ id = "mining_home";
+ name = "mining shuttle bay";
+ roundstart_template = /datum/map_template/shuttle/mining/delta;
+ width = 7
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"mWJ" = (
/obj/structure/chair/wood/normal,
/turf/open/floor/wood,
@@ -54898,9 +53868,41 @@
/obj/effect/decal/festive/christmas_reef,
/turf/closed/festive/greybrick,
/area/service/cafeteria/lunchroom)
+"mYA" = (
+/obj/machinery/button/door{
+ id = "clowngarage";
+ name = "Garage Door";
+ pixel_y = -4
+ },
+/turf/closed/festive/whitebrick{
+ color = "#fff200"
+ },
+/area/service/theater)
+"naH" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/closet/wardrobe/mixed,
+/turf/open/floor/festive/alleyway/safe,
+/area/service/bar/atrium)
"nbP" = (
/turf/open/floor/carpet/orange,
/area/commons/storage/tools)
+"neg" = (
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer1,
+/obj/machinery/atmospherics/components/unary/portables_connector/layer3{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/yellow/visible,
+/turf/open/floor/plasteel,
+/area/engineering/atmos)
+"nek" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/portables_connector/layer3{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/engineering/atmos)
"nij" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 8
@@ -54919,12 +53921,33 @@
},
/turf/open/floor/festive/alleyway,
/area/edina/backstreet/supply)
+"nmk" = (
+/turf/open/floor/carpet/orange,
+/area/command/heads_quarters/ce)
+"nmm" = (
+/obj/effect/turf_decal/weather/snow/corner,
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"noa" = (
/obj/structure/mineral_door/wood{
name = "bar"
},
/turf/open/floor/wood,
/area/maintenance/bar)
+"nsT" = (
+/obj/effect/turf_decal/bot_white,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/command/gateway)
"nsX" = (
/obj/machinery/door/window/westleft,
/turf/open/floor/holofloor/ice,
@@ -54937,23 +53960,63 @@
/obj/effect/turf_decal/weather/snow/corner,
/turf/open/floor/festive/alleyway,
/area/edina)
+"nvq" = (
+/obj/structure/chair/pew/right,
+/turf/open/floor/carpet/green,
+/area/medical/surgery)
"nvy" = (
/obj/structure/table/wood/fancy/red,
/obj/machinery/chem_dispenser/drinks/beer/fullupgrade,
/turf/open/floor/wood,
/area/maintenance/bar)
+"nvz" = (
+/turf/open/floor/festive/cobblestone/safe,
+/area/cargo)
+"nvQ" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp,
+/turf/open/floor/wood,
+/area/command/heads_quarters/ce)
"nzc" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/turf/open/floor/carpet/royalblue,
/area/edina/crew_quarters/store/pet)
+"nCs" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 8
+ },
+/obj/structure/fence{
+ dir = 4
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"nEs" = (
/obj/structure/statue/gold/ce{
anchored = 1
},
/turf/open/floor/festive/alleyway,
/area/edina/street/secondary/castle)
+"nGA" = (
+/obj/machinery/door/airlock/security/glass{
+ name = "Equipment Room";
+ req_access_txt = "1"
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/festive/alleyway/safe,
+/area/security/office)
+"nIs" = (
+/obj/machinery/door/poddoor/shutters{
+ id = "parkcomm";
+ name = "Command Parking"
+ },
+/turf/open/floor/festive/cobblestone/safe,
+/area/edina/street)
"nII" = (
/mob/living/simple_animal/pet/fox,
/turf/open/floor/grass,
@@ -54993,17 +54056,53 @@
},
/turf/open/floor/holofloor/beach,
/area/edina/crew_quarters/store/pet)
+"nXj" = (
+/obj/effect/spawner/structure/window,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "patientB";
+ name = "privacy shutters"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/carpet/cyan,
+/area/medical/storage)
"nZW" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 8
},
/turf/open/floor/festive/alleyway,
/area/science)
+"ocs" = (
+/obj/item/radio/intercom{
+ name = "Station Intercom (General)";
+ pixel_x = -30
+ },
+/obj/item/paper/pamphlet/gateway,
+/obj/structure/table,
+/turf/open/floor/plasteel,
+/area/command/gateway)
+"ocG" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/festive/trainplatform/edge_north{
+ pixel_y = -7
+ },
+/turf/open/floor/festive/trainplatform/safe,
+/area/maintenance/bar)
"oeX" = (
/obj/machinery/mecha_part_fabricator,
/obj/effect/decal/festive/christmas_ivy_string,
/turf/open/floor/circuit/off,
/area/science)
+"ofV" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/table,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 8;
+ name = "8maintenance loot spawner"
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/service/bar/atrium)
"ohM" = (
/mob/living/simple_animal/pet/redpanda,
/turf/open/floor/grass,
@@ -55037,10 +54136,30 @@
/obj/structure/fireplace,
/turf/open/floor/wood,
/area/commons/dorms)
+"onC" = (
+/turf/open/floor/wood,
+/area/command/heads_quarters/ce)
+"onK" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ color = "#FFFFFF";
+ dir = 4
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"orN" = (
/obj/machinery/light/small,
/turf/open/floor/mineral/titanium/blue,
/area/commons/dorms)
+"osT" = (
+/obj/effect/landmark/xmastree/rdrod,
+/turf/open/floor/festive/trainplatform/safe,
+/area/maintenance/bar)
+"otG" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/security/brig)
"oua" = (
/obj/item/storage/pill_bottle/penis_enlargement,
/turf/open/floor/wood,
@@ -55063,6 +54182,29 @@
},
/turf/open/floor/festive/alleyway,
/area/edina/street/secondary/castle)
+"oAk" = (
+/obj/structure/dresser,
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_x = 32;
+ pixel_y = 32
+ },
+/obj/machinery/newscaster/security_unit{
+ pixel_y = 32
+ },
+/obj/item/storage/fancy/donut_box{
+ pixel_y = 8
+ },
+/turf/open/floor/carpet/red,
+/area/command/heads_quarters/hos)
+"oBN" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/obj/structure/fence{
+ dir = 4
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"oCy" = (
/obj/structure/table/wood/fancy/red,
/obj/machinery/light/small{
@@ -55070,10 +54212,28 @@
},
/turf/open/floor/wood,
/area/maintenance/bar)
+"oDr" = (
+/obj/structure/chair/stool/bar,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/light,
+/area/maintenance/bar)
+"oHO" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/science)
"oIz" = (
/obj/machinery/jukebox/disco/indestructible,
/turf/open/floor/holofloor/ice,
/area/edina)
+"oIQ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/table/glass,
+/turf/open/floor/wood,
+/area/maintenance/bar)
"oKt" = (
/obj/effect/turf_decal/weather/snow/corner{
color = "#FFFFFF";
@@ -55085,6 +54245,25 @@
},
/turf/open/floor/festive/alleyway,
/area/edina)
+"oKJ" = (
+/obj/structure/chair/sofa,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/indestructible/hotelwood,
+/area/service/chapel/main/monastery)
+"oLZ" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"oMB" = (
/obj/item/integrated_circuit_printer,
/obj/structure/table/plasmaglass,
@@ -55107,10 +54286,27 @@
/obj/item/scythe,
/turf/open/floor/wood,
/area/commons/dorms)
+"oPS" = (
+/obj/machinery/status_display{
+ pixel_y = -32
+ },
+/obj/machinery/vending/cola/random,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/science)
"oTd" = (
/obj/structure/fluff/broken_flooring,
/turf/open/floor/plating,
/area/edina)
+"oTD" = (
+/obj/machinery/door/poddoor/shutters{
+ id = "QMgarage";
+ name = "QM's Garage"
+ },
+/turf/open/floor/festive/cobblestone/safe,
+/area/cargo/qm)
"oUj" = (
/mob/living/simple_animal/jacq/car_spawner,
/turf/open/floor/festive/sidewalk,
@@ -55173,6 +54369,13 @@
/obj/effect/decal/festive/fairylights,
/turf/open/indestructible/airblock,
/area/science)
+"pga" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/festive/alleyway/safe,
+/area/service/bar/atrium)
"phl" = (
/obj/machinery/vending/boozeomat,
/turf/open/floor/wood,
@@ -55184,6 +54387,14 @@
/obj/machinery/vending/assist,
/turf/open/floor/circuit/off,
/area/science)
+"poJ" = (
+/obj/structure/table/wood/fancy/blue,
+/obj/item/flashlight/lamp{
+ pixel_x = 4;
+ pixel_y = 8
+ },
+/turf/open/floor/carpet/blue,
+/area/commons/cryopod)
"poQ" = (
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plasteel,
@@ -55202,6 +54413,15 @@
/mob/living/simple_animal/crab,
/turf/open/floor/plating/beach/sand,
/area/edina)
+"psv" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"psQ" = (
/obj/structure/table/wood,
/obj/item/clothing/head/festive,
@@ -55213,11 +54433,28 @@
},
/turf/open/floor/wood,
/area/commons/dorms)
+"pvo" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 1
+ },
+/obj/structure/fence,
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"pwQ" = (
/obj/structure/table/wood,
/obj/item/phone,
/turf/open/floor/wood,
/area/maintenance/bar)
+"pAr" = (
+/obj/structure/streetdecor/lampfestive{
+ pixel_x = 8;
+ pixel_y = 16
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/festive/sidewalk,
+/area/edina/street/intersection/servsuppaux)
"pBd" = (
/mob/living/simple_animal/jacq/car_spawner,
/turf/open/floor/festive/alleyway,
@@ -55261,12 +54498,61 @@
/obj/effect/decal/festive/green_stockings,
/turf/closed/indestructible/riveted/boss,
/area/science)
+"pFs" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/layer3{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/engineering/atmos)
+"pHa" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/festive/alleyway/safe,
+/area/security/brig)
+"pHo" = (
+/obj/effect/turf_decal/delivery/white,
+/turf/open/floor/festive/cobblestone/safe,
+/area/edina/street)
+"pMm" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/decal/festive/fairylights,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/wood,
+/area/maintenance/bar)
"pOy" = (
/obj/effect/turf_decal/bot,
/obj/machinery/hydroponics/constructable,
/obj/machinery/light/small,
/turf/open/floor/plasteel/dark,
/area/service/hydroponics)
+"pPh" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 1
+ },
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = -12;
+ pixel_y = 2
+ },
+/obj/structure/mirror{
+ pixel_x = -24
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/surgery)
+"pPR" = (
+/obj/machinery/door/airlock/security/glass,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"pQk" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -55316,10 +54602,31 @@
color = "#967832"
},
/area/cargo/warehouse)
+"qad" = (
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/festive/trainplatform/safe,
+/area/maintenance/bar)
+"qal" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/closet/emcloset,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"qaD" = (
+/obj/effect/decal/festive/christmas_ivy_string,
+/obj/structure/chair/pew/left,
+/turf/open/floor/carpet/green,
+/area/medical/surgery)
"qaU" = (
/obj/structure/flora/ausbushes/brflowers,
/turf/open/floor/grass,
/area/edina)
+"qbg" = (
+/obj/effect/turf_decal/weather/snow/corner,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"qcl" = (
/obj/machinery/rnd/production/protolathe/department/science{
acted_explosions = "Dumbasses";
@@ -55328,14 +54635,81 @@
},
/turf/open/floor/circuit/off,
/area/science)
+"qcN" = (
+/obj/structure/streetdecor/lampfestive{
+ pixel_x = -8;
+ pixel_y = 16
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/festive/sidewalk,
+/area/edina/street/intersection/servsuppaux)
+"qkq" = (
+/obj/machinery/door/airlock/security/glass{
+ id_tag = "outerbrig";
+ name = "Brig";
+ req_access_txt = "63"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/festive/alleyway/safe,
+/area/service/bar/atrium)
"qkz" = (
/obj/effect/decal/festive/fairylights,
/turf/open/floor/carpet/royalblue,
/area/service/cafeteria)
+"qot" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/festive/white_alleyway{
+ color = "#967832"
+ },
+/area/edina/backstreet/supply)
+"qpQ" = (
+/obj/structure/table/wood,
+/obj/item/grenade/chem_grenade,
+/obj/item/grenade/chem_grenade,
+/obj/item/grenade/chem_grenade,
+/obj/item/stack/cable_coil,
+/obj/item/assembly/igniter{
+ pixel_x = 3;
+ pixel_y = -7
+ },
+/obj/item/assembly/timer{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/screwdriver{
+ pixel_x = -2;
+ pixel_y = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/medical/chemistry";
+ name = "Chemistry Lab APC";
+ pixel_y = -24
+ },
+/obj/structure/cable/yellow,
+/turf/open/floor/festive/wooden/wooden1,
+/area/medical/chemistry)
"qua" = (
/obj/machinery/door/airlock/wood/glass,
/turf/open/floor/plasteel/dark,
/area/service/cafeteria/lunchroom)
+"qvh" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
+ },
+/obj/structure/closet/toolcloset,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"qvz" = (
/obj/effect/turf_decal/weather/snow/corner{
color = "#FFFFFE";
@@ -55357,6 +54731,24 @@
},
/turf/open/floor/wood,
/area/commons/dorms)
+"qwA" = (
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"qyd" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer1{
+ dir = 10
+ },
+/obj/machinery/atmospherics/components/unary/portables_connector/layer3{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/engineering/atmos)
"qzd" = (
/obj/machinery/computer/rdconsole{
dir = 1
@@ -55369,6 +54761,74 @@
/obj/item/stack/sheet/bone,
/turf/open/floor/carpet/royalblue,
/area/edina/crew_quarters/store/pet)
+"qAE" = (
+/obj/structure/window/reinforced/tinted{
+ dir = 4
+ },
+/obj/structure/window/reinforced/tinted{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/turf/open/floor/festive/trainplatform/safe,
+/area/maintenance/bar)
+"qAV" = (
+/obj/effect/decal/festive/christmas_ivy_string,
+/obj/structure/chair/pew,
+/turf/open/floor/carpet/green,
+/area/medical/surgery)
+"qBw" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/decal/festive/christmas_ivy_string,
+/obj/structure/chair/pew,
+/turf/open/floor/carpet/green,
+/area/medical/surgery)
+"qEf" = (
+/obj/effect/landmark/start/head_of_security,
+/turf/open/floor/carpet/red,
+/area/command/heads_quarters/hos)
+"qHx" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/closet/wardrobe/mixed,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"qJC" = (
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
+ },
+/turf/open/indestructible/hotelwood,
+/area/service/chapel/office)
+"qLc" = (
+/obj/structure/filingcabinet/chestdrawer,
+/mob/living/simple_animal/parrot/Poly,
+/turf/open/floor/plasteel/dark,
+/area/command/heads_quarters/ce)
"qPh" = (
/obj/structure/mineral_door/woodrustic,
/turf/open/floor/wood,
@@ -55377,6 +54837,14 @@
/obj/effect/turf_decal/weather/snow/corner,
/turf/open/floor/festive/alleyway,
/area/edina/street/secondary/castle)
+"qQt" = (
+/obj/effect/festive/street/streetlinewest,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/festive/cobblestone,
+/area/edina/street/intersection/servsuppaux)
"qRm" = (
/obj/machinery/light/small{
dir = 4;
@@ -55407,6 +54875,15 @@
/mob/living/simple_animal/chicken/rabbit,
/turf/open/floor/grass,
/area/edina/crew_quarters/store/pet)
+"rbj" = (
+/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/portables_connector/layer3{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/engineering/atmos)
"rbl" = (
/obj/structure/janitorialcart,
/obj/item/mop,
@@ -55425,6 +54902,9 @@
/obj/item/gun/magic/staff/healing,
/turf/open/floor/circuit/off,
/area/science)
+"rfO" = (
+/turf/open/floor/plasteel/dark,
+/area/command/heads_quarters/ce)
"rgC" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 1
@@ -55458,16 +54938,73 @@
"rni" = (
/turf/closed/indestructible/rock,
/area/edina)
+"rpG" = (
+/obj/structure/streetdecor/lampfestive{
+ pixel_x = -8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/festive/sidewalk,
+/area/edina/street/intersection/servsuppaux)
"rqO" = (
/obj/structure/table/wood,
/obj/machinery/microwave,
/turf/open/floor/wood,
/area/maintenance/bar)
+"rrI" = (
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/closet/crate{
+ icon_state = "crateopen"
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"rsL" = (
+/obj/machinery/button/door{
+ id = "chemistry_shutters";
+ name = "chemical factory garage";
+ pixel_x = -8;
+ pixel_y = -6;
+ req_access_txt = "5; 33"
+ },
+/turf/closed/festive/whitebrick{
+ color = "#ffe6a8"
+ },
+/area/medical/chemistry)
+"rtq" = (
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow,
+/obj/machinery/power/apc/auto_name{
+ dir = 4;
+ pixel_x = 30
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
"ruk" = (
/turf/open/floor/plasteel/white/side{
dir = 1
},
/area/commons/dorms)
+"ruH" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"rvH" = (
/obj/structure/window/reinforced{
dir = 8
@@ -55492,6 +55029,10 @@
/obj/effect/landmark/start/janitor,
/turf/open/floor/plasteel/white,
/area/commons/dorms)
+"rxz" = (
+/obj/effect/festive/street/sidewalknsm,
+/turf/open/floor/festive/cobblestone/safe,
+/area/edina/street)
"rxI" = (
/obj/item/chair/stool,
/turf/open/floor/wood,
@@ -55501,6 +55042,27 @@
/obj/effect/decal/festive/christmas_ivy_string,
/turf/open/floor/carpet/blue,
/area/commons/cryopod)
+"rxR" = (
+/obj/machinery/button/door{
+ id = "QMgarage";
+ name = "Garage door button";
+ pixel_x = -28
+ },
+/obj/effect/festive/street/streetlinenm,
+/turf/open/floor/festive/cobblestone/safe,
+/area/cargo/qm)
+"ryA" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/machinery/light_switch{
+ pixel_x = -28;
+ pixel_y = 17
+ },
+/turf/open/floor/plasteel/white/side{
+ dir = 4
+ },
+/area/medical/surgery)
"ryU" = (
/obj/structure/rack,
/obj/item/stack/sheet/mineral/wood,
@@ -55510,6 +55072,17 @@
"ryV" = (
/turf/closed/wall/rust,
/area/edina)
+"rzl" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/festive/alleyway,
+/area/edina/backstreet/med)
+"rAX" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 1
+ },
+/obj/structure/festive/trainplatform/necorner,
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"rCM" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -55539,6 +55112,15 @@
},
/turf/open/floor/festive/alleyway,
/area/science)
+"rGc" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"rKc" = (
/obj/structure/sign/poster/contraband/lusty_xenomorph{
pixel_x = 32
@@ -55551,6 +55133,19 @@
/obj/structure/flora/ausbushes/ywflowers,
/turf/open/floor/grass,
/area/edina)
+"rMw" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/festive/sidewalk,
+/area/edina/street/primary/perimeter)
+"rPg" = (
+/obj/structure/flora/tree/dead,
+/turf/open/floor/grass,
+/area/edina)
"rRn" = (
/obj/structure/closet/secure_closet/freezer/meat,
/obj/item/stamp/hop,
@@ -55597,6 +55192,20 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/edina)
+"sgV" = (
+/obj/structure/bookcase/random/reference,
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/festive/wooden/wooden1,
+/area/commons/lounge)
+"shi" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/obj/structure/festive/trainplatform/secorner,
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"shm" = (
/obj/structure/table/glass,
/obj/item/reagent_containers/food/snacks/cheesewedge,
@@ -55606,6 +55215,17 @@
/obj/machinery/door/airlock/wood,
/turf/open/floor/wood,
/area/maintenance/bar)
+"siw" = (
+/obj/effect/festive/street/streetlinenorth,
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/arrows/white{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/festive/cobblestone,
+/area/edina/street/intersection/princessperimeter/south)
"skd" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/westleft{
@@ -55629,6 +55249,15 @@
dir = 4
},
/area/commons/dorms)
+"soh" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/festive/white_alleyway{
+ color = "#967832"
+ },
+/area/edina/backstreet/supply)
"sol" = (
/obj/effect/turf_decal/delivery,
/obj/effect/decal/festive/fairylights,
@@ -55652,11 +55281,50 @@
},
/turf/open/floor/wood,
/area/commons/dorms)
+"suq" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"suD" = (
+/obj/structure/table/glass,
+/obj/item/reagent_containers/food/drinks/bottle/patron{
+ pixel_x = -6;
+ pixel_y = 16
+ },
+/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium{
+ pixel_x = 7;
+ pixel_y = 14
+ },
+/obj/item/reagent_containers/food/drinks/bottle/fernet{
+ pixel_y = 11
+ },
+/obj/item/reagent_containers/food/drinks/bottle/gin{
+ pixel_x = -7;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/food/drinks/bottle/whiskey{
+ pixel_x = 7;
+ pixel_y = 4
+ },
+/turf/open/floor/wood,
+/area/maintenance/bar)
"suS" = (
/obj/structure/table/wood,
/obj/effect/decal/festive/christmas_reef,
/turf/open/floor/wood,
/area/service/cafeteria/lunchroom)
+"sDo" = (
+/obj/effect/festive/street/streetlinewest,
+/obj/effect/turf_decal/arrows/white{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/festive/cobblestone,
+/area/edina/street/intersection/servsuppaux)
"sEK" = (
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";
@@ -55678,6 +55346,14 @@
/obj/effect/decal/festive/fairylights,
/turf/open/indestructible,
/area/cargo)
+"sMX" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/closet/firecloset,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"sOj" = (
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"sQo" = (
/turf/open/floor/plasteel/white/side{
dir = 4
@@ -55693,6 +55369,25 @@
/obj/item/flashlight/lantern,
/turf/open/floor/plating/beach/sand,
/area/edina)
+"sSC" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/table,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 8;
+ name = "8maintenance loot spawner"
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"sSJ" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ color = "#FFFFFE";
+ dir = 8
+ },
+/obj/structure/fence{
+ dir = 4
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"sVS" = (
/obj/structure/table/wood,
/obj/machinery/light{
@@ -55707,6 +55402,17 @@
},
/turf/open/floor/grass/snow/edina,
/area/edina)
+"sWC" = (
+/obj/structure/flora/tree/pine/xmas{
+ pixel_x = 2;
+ pixel_y = 14
+ },
+/turf/open/floor/carpet,
+/area/commons/dorms)
+"sWE" = (
+/obj/effect/festive/trainrails/south,
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"sYK" = (
/obj/structure/chair/sofa/left{
dir = 1
@@ -55752,6 +55458,12 @@
},
/turf/open/floor/carpet/red,
/area/maintenance/bar)
+"tcz" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 8
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"tek" = (
/obj/structure/table,
/obj/machinery/light{
@@ -55760,11 +55472,76 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/maintenance/bar/cafe)
+"tfP" = (
+/obj/item/bedsheet/captain/double{
+ dir = 1
+ },
+/obj/structure/bed/double{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/command/heads_quarters/captain/private)
+"thW" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 1
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
+"tjo" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/festive/alleyway/safe,
+/area/service/bar/atrium)
+"tkn" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/decal/festive/christmas_ivy_string,
+/turf/open/floor/festive/trainplatform/safe,
+/area/maintenance/bar)
"tmZ" = (
/obj/structure/bedsheetbin/towel,
/obj/structure/table,
/turf/open/floor/plasteel/white,
/area/commons/dorms)
+"toq" = (
+/obj/effect/decal/festive/fairylights,
+/obj/machinery/computer/operating,
+/turf/open/floor/plasteel/white/side,
+/area/medical/surgery)
+"tpO" = (
+/obj/machinery/button/door{
+ id = "parkcomm";
+ name = "Command Parking";
+ pixel_x = 28;
+ pixel_y = 7;
+ req_one_access_txt = "2;19"
+ },
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
+ },
+/turf/open/floor/festive/cobblestone/safe,
+/area/edina/street)
+"tpX" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"tvS" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/decal/festive/fairylights,
+/obj/structure/chair/sofa/left{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/maintenance/bar)
"twg" = (
/obj/structure/fence{
dir = 4
@@ -55775,6 +55552,12 @@
/obj/effect/decal/festive/green_stockings,
/turf/closed/indestructible/riveted/hierophant,
/area/science)
+"txP" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 5
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"tyL" = (
/obj/structure/streetdecor/lampfestive{
pixel_x = 8
@@ -55794,6 +55577,13 @@
color = "#967832"
},
/area/cargo)
+"tFD" = (
+/obj/structure/fence,
+/obj/structure/streetdecor/lampfestive{
+ pixel_x = 16
+ },
+/turf/open/floor/grass/snow/edina,
+/area/edina)
"tHL" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 4
@@ -55827,6 +55617,11 @@
/obj/structure/chair/wood/wings,
/turf/open/floor/carpet/royalblack,
/area/maintenance/bar)
+"tSx" = (
+/obj/item/bedsheet/qm/double,
+/obj/structure/bed/double,
+/turf/open/floor/carpet/orange,
+/area/cargo/qm)
"tTL" = (
/obj/machinery/door/window/westleft,
/turf/open/floor/carpet/royalblue,
@@ -55840,6 +55635,19 @@
/obj/item/toy/fluff/tennis_poly/tri/squeak/rainbow,
/turf/open/floor/carpet/royalblue,
/area/edina/crew_quarters/store/pet)
+"tXi" = (
+/obj/structure/flora/grass/green,
+/turf/open/floor/grass,
+/area/edina)
+"ucu" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/festive/sidewalk,
+/area/edina/street/intersection/servsuppaux)
"udo" = (
/obj/structure/chair,
/turf/open/floor/plating/beach/sand,
@@ -55850,6 +55658,14 @@
},
/turf/open/floor/festive/alleyway,
/area/edina/street/secondary/castle)
+"uhL" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/closed/festive/whitebrick{
+ color = "#967832"
+ },
+/area/cargo/storage)
"uja" = (
/obj/structure/table/wood,
/obj/item/clothing/head/festive,
@@ -55865,6 +55681,20 @@
/obj/effect/decal/festive/christmas_ivy_string,
/turf/open/indestructible/airblock,
/area/science)
+"ujj" = (
+/obj/effect/turf_decal/bot_white/left,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/command/gateway)
"ukq" = (
/mob/living/simple_animal/mouse/white,
/turf/open/floor/festive/wooden/wooden2,
@@ -55873,6 +55703,28 @@
/obj/structure/bonfire,
/turf/open/floor/wood,
/area/commons/dorms)
+"unv" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/extinguisher_cabinet{
+ pixel_y = 32
+ },
+/turf/open/indestructible/hotelwood,
+/area/service/chapel/main/monastery)
+"usL" = (
+/obj/effect/festive/street/streetlinenorth,
+/obj/effect/turf_decal/arrows/white{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/festive/cobblestone,
+/area/edina/street/primary/perimeter)
"uvz" = (
/turf/open/floor/circuit/off,
/area/science)
@@ -55886,6 +55738,34 @@
/obj/effect/decal/festive/fairylights,
/turf/open/indestructible/airblock,
/area/science)
+"uwv" = (
+/obj/structure/chair/pew,
+/turf/open/floor/carpet/green,
+/area/medical/surgery)
+"uwK" = (
+/obj/machinery/door/poddoor/shutters{
+ id = "cargocars";
+ name = "Cargo Loading dock"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/festive/cobblestone/safe,
+/area/cargo)
+"uxQ" = (
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
+/obj/structure/table,
+/obj/structure/window/reinforced{
+ dir = 4;
+ layer = 2.9
+ },
+/obj/item/clothing/gloves/color/latex,
+/obj/item/clothing/mask/surgical,
+/obj/item/clothing/suit/apron/surgical,
+/turf/open/floor/plasteel/white/side{
+ dir = 8
+ },
+/area/medical/surgery)
"uAY" = (
/turf/closed/festive/redbrick/redbrickcornersw,
/area/commons/dorms)
@@ -55912,11 +55792,30 @@
},
/turf/open/floor/wood,
/area/commons/dorms)
+"uEt" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/chair/sofa/left{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/maintenance/bar)
"uHF" = (
/obj/machinery/computer/rdconsole/robotics,
/obj/effect/decal/festive/christmas_ivy_string,
/turf/open/floor/circuit/off,
/area/science)
+"uIo" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/plasteel/white,
+/area/medical/surgery)
"uIG" = (
/obj/structure/fluff/lightpost/light,
/turf/open/floor/grass,
@@ -55931,6 +55830,20 @@
},
/turf/open/floor/festive/wooden/wooden1,
/area/maintenance/bar)
+"uOD" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/chair/office/dark{
+ dir = 1
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"uOH" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/closet/wardrobe/mixed,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"uSp" = (
/obj/structure/reagent_dispensers/keg/milk,
/turf/open/floor/wood,
@@ -55962,6 +55875,13 @@
"uZS" = (
/turf/open/indestructible/cobble,
/area/edina)
+"vdL" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/closet/wardrobe/mixed,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"vgD" = (
/obj/structure/sign/directions/cells,
/turf/closed/wall/mineral/iron,
@@ -55978,6 +55898,10 @@
/mob/living/simple_animal/pet/penguin/emperor,
/turf/open/floor/holofloor/ice,
/area/edina/crew_quarters/store/pet)
+"vpi" = (
+/obj/structure/festive/trainplatform/edge_east,
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"vsn" = (
/obj/item/reagent_containers/food/drinks/soda_cans/cola{
pixel_x = -8;
@@ -55985,6 +55909,13 @@
},
/turf/open/floor/plating/beach/sand,
/area/edina)
+"vtD" = (
+/obj/machinery/suit_storage_unit/ce,
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/turf/open/floor/plasteel/white,
+/area/command/heads_quarters/ce)
"vyi" = (
/obj/item/toy/cattoy,
/obj/structure/bed/dogbed{
@@ -56010,12 +55941,15 @@
/obj/item/gun/magic/wand/resurrection,
/turf/open/floor/plating/beach/sand,
/area/edina)
-"vAa" = (
-/obj/structure/fluff/lightpost/light,
-/turf/open/floor/plating/dirt{
- initial_gas_mix = "o2=21.78;n2=82.36;TEMP=293.15"
+"vAT" = (
+/obj/structure/table/wood,
+/obj/structure/sign/poster/official/report_crimes{
+ pixel_y = 32
},
-/area/edina)
+/obj/item/storage/box/donkpockets,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/floor/wood,
+/area/science)
"vBV" = (
/obj/structure/window/reinforced{
dir = 8
@@ -56041,10 +55975,36 @@
color = "#967832"
},
/area/edina/backstreet/supply)
+"vEk" = (
+/obj/effect/festive/trainrails/north{
+ icon_state = "trainrails_east"
+ },
+/obj/structure/fence{
+ dir = 4
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"vIN" = (
/obj/structure/statue/snow/snowman,
/turf/open/floor/grass/snow/edina,
/area/science)
+"vJr" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/festive/alleyway/safe,
+/area/security/brig)
+"vKx" = (
+/obj/structure/chair/stool/bar,
+/turf/open/floor/light,
+/area/maintenance/bar)
"vLq" = (
/obj/machinery/vending/boozeomat{
pixel_x = 32;
@@ -56053,6 +56013,39 @@
},
/turf/open/floor/wood,
/area/maintenance/bar)
+"vNk" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ color = "#FFFFFF";
+ dir = 4
+ },
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 1
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
+"vNz" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/festive/sidewalk,
+/area/edina/street/intersection/servsuppaux)
+"vOh" = (
+/obj/effect/turf_decal/weather/snow/corner,
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 8
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
+"vOS" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/chair/sofa/right{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/maintenance/bar)
"vPw" = (
/obj/structure/window/reinforced{
name = "Exam Room 4";
@@ -56060,7 +56053,18 @@
},
/turf/open/floor/carpet/royalblue,
/area/edina/crew_quarters/store/pet)
-"vZM" = (
+"vQh" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/festive/alleyway,
+/area/science)
+"vWp" = (
+/obj/machinery/light/small{
+ dir = 1;
+ light_color = "#ffc1c1"
+ },
+/turf/open/floor/festive/cobblestone/safe,
+/area/edina/street)
+"vYF" = (
/obj/structure/dresser,
/turf/open/floor/wood,
/area/security/prison)
@@ -56099,6 +56103,9 @@
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plasteel,
/area/edina)
+"wjF" = (
+/turf/open/floor/festive/cobblestone/safe,
+/area/edina/street)
"wlp" = (
/obj/machinery/door/window/westleft{
dir = 2;
@@ -56112,6 +56119,15 @@
},
/turf/open/floor/plasteel,
/area/service/electronic_marketing_den)
+"wpm" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/layer3{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/engineering/atmos)
"wpT" = (
/obj/structure/fence,
/turf/open/floor/plating/beach/sand,
@@ -56149,6 +56165,25 @@
/obj/effect/spawner/trap,
/turf/open/indestructible/airblock,
/area/science)
+"wya" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/closet/toolcloset,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"wzQ" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/table,
+/turf/open/floor/festive/alleyway/safe,
+/area/service/bar/atrium)
+"wCg" = (
+/obj/machinery/light,
+/turf/open/indestructible/hotelwood,
+/area/service/chapel/office)
"wHw" = (
/mob/living/simple_animal/pet/penguin/emperor,
/turf/open/floor/holofloor/ice,
@@ -56157,6 +56192,10 @@
/mob/living/simple_animal/pet/dog/corgi/Ian,
/turf/open/floor/grass,
/area/edina)
+"wJy" = (
+/obj/effect/festive/trainrails/north,
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"wJY" = (
/obj/effect/decal/festive/christmas_ivy_string,
/turf/open/floor/plasteel/dark,
@@ -56170,6 +56209,30 @@
},
/turf/open/floor/plasteel/freezer,
/area/maintenance/bar)
+"wMT" = (
+/obj/effect/decal/festive/fairylights,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/indestructible,
+/area/cargo/warehouse)
+"wOb" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 8
+ },
+/obj/docking_port/stationary{
+ dir = 4;
+ dwidth = 5;
+ height = 7;
+ id = "supply_home";
+ name = "Cargo Bay";
+ width = 12
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"wQd" = (
/obj/effect/decal/festive/fairylights,
/turf/open/floor/circuit/off,
@@ -56262,6 +56325,17 @@
/obj/item/clothing/shoes/winterboots,
/turf/open/floor/festive/trainplatform,
/area/edina/street/primary/perimeter)
+"wRt" = (
+/obj/structure/bookcase/random/religion,
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/festive/wooden/wooden1,
+/area/commons/lounge)
+"wUU" = (
+/obj/structure/reagent_dispensers/watertank,
+/turf/open/floor/festive/alleyway/safe,
+/area/service/bar/atrium)
"wWV" = (
/obj/item/toy/cattoy,
/turf/open/floor/grass,
@@ -56288,6 +56362,17 @@
},
/turf/open/floor/festive/alleyway,
/area/edina)
+"xfn" = (
+/obj/effect/decal/festive/fairylights,
+/obj/structure/chair/sofa/left,
+/turf/open/floor/wood,
+/area/command/heads_quarters/ce)
+"xfZ" = (
+/obj/structure/grille,
+/obj/structure/festive/redbrick/windowNSRightEnd,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/festive/redbrick,
+/area/security/checkpoint/supply)
"xkz" = (
/obj/effect/festive/street/streetlineem,
/mob/living/simple_animal/jacq/car_spawner,
@@ -56333,21 +56418,51 @@
},
/turf/open/floor/plating/beach/sand,
/area/edina)
-"xyu" = (
-/obj/effect/decal/festive/fairylights,
-/obj/structure/cable{
- icon_state = "4-8"
+"xwd" = (
+/obj/structure/cable/yellow,
+/obj/machinery/power/apc{
+ areastring = "/area/maintenance/starboard/fore";
+ dir = 1;
+ name = "Starboard Bow Maintenance APC";
+ pixel_y = -24
},
-/turf/open/indestructible,
-/area/cargo/warehouse)
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"xwF" = (
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/command/heads_quarters/ce)
+"xwJ" = (
+/obj/structure/sign/poster/contraband/donut_corp{
+ pixel_y = -32
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"xzs" = (
/obj/effect/decal/festive/red_stockings,
/turf/closed/indestructible/riveted/hierophant,
/area/science)
+"xzF" = (
+/obj/effect/festive/trainrails/south,
+/obj/structure/fence,
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"xAC" = (
/obj/structure/mineral_door/wood,
/turf/open/floor/wood,
/area/commons/dorms)
+"xBZ" = (
+/obj/machinery/light/small,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/machinery/button/door{
+ id = "patientA";
+ name = "Privacy Shutters";
+ pixel_y = -25
+ },
+/turf/open/floor/carpet/purple,
+/area/medical/storage)
"xEb" = (
/obj/structure/table/wood,
/obj/machinery/light{
@@ -56356,11 +56471,38 @@
/obj/item/phone,
/turf/open/floor/wood,
/area/maintenance/bar)
+"xEN" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"xFN" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/festive/alleyway/safe,
+/area/service/bar/atrium)
"xGM" = (
/obj/structure/table/wood/fancy/red,
/obj/item/reagent_containers/food/snacks/waffles,
/turf/open/floor/wood,
/area/maintenance/bar)
+"xHK" = (
+/obj/effect/festive/street/streetlineeast,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/festive/cobblestone,
+/area/edina/street/intersection/servsuppaux)
+"xIn" = (
+/obj/machinery/button/door{
+ id = "QMgarage";
+ name = "Garage door button";
+ pixel_y = -4
+ },
+/turf/closed/festive/greybrick,
+/area/service/kitchen)
"xJM" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 1
@@ -56377,6 +56519,12 @@
},
/turf/open/floor/grass/snow/edina,
/area/edina/backstreet/supply)
+"xNb" = (
+/obj/effect/festive/trainrails/north{
+ icon_state = "trainrails_east"
+ },
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"xQh" = (
/obj/structure/table,
/obj/machinery/reagentgrinder{
@@ -56406,6 +56554,28 @@
},
/turf/open/floor/grass/snow/edina,
/area/edina)
+"xTA" = (
+/obj/machinery/button/door{
+ id = "parkcomm";
+ name = "Command Parking";
+ pixel_x = -4;
+ pixel_y = 7;
+ req_one_access_txt = "2;19"
+ },
+/turf/closed/festive/whitebrick,
+/area/edina/street)
+"xTO" = (
+/obj/machinery/button/door{
+ id = "ceprivacy";
+ name = "Privacy Shutters Control";
+ pixel_y = 26
+ },
+/obj/machinery/holopad,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/command/heads_quarters/ce)
"xVS" = (
/obj/structure/reagent_dispensers/keg/gargle,
/turf/open/floor/wood,
@@ -56418,6 +56588,14 @@
/obj/effect/landmark/start/assistant,
/turf/open/floor/carpet/royalblue,
/area/edina/crew_quarters/store/pet)
+"yeF" = (
+/obj/machinery/door/airlock/security/glass,
+/obj/machinery/door/firedoor,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
"ygB" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -56447,6 +56625,43 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/maintenance/bar/cafe)
+"yjl" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 8;
+ name = "8maintenance loot spawner"
+ },
+/obj/structure/table,
+/turf/open/floor/festive/alleyway/safe,
+/area/maintenance/starboard/fore)
+"yjX" = (
+/obj/structure/sign/warning/nosmoking{
+ pixel_x = -28
+ },
+/obj/structure/table,
+/obj/item/book/manual/wiki/surgery,
+/obj/item/razor{
+ pixel_y = 5
+ },
+/turf/open/floor/plasteel,
+/area/medical/surgery)
+"ykd" = (
+/obj/docking_port/stationary{
+ dir = 8;
+ dwidth = 4;
+ height = 15;
+ id = "emergency_home";
+ name = "PubbyStation emergency evac bay";
+ width = 20
+ },
+/obj/structure/festive/trainplatform/edge_west,
+/turf/open/floor/plating/dirt/space,
+/area/edina)
"ylJ" = (
/obj/machinery/light/floor{
alpha = 0;
@@ -60029,7 +60244,7 @@ aad
aac
aZu
aac
-cAM
+wJy
aac
aac
aZu
@@ -60285,9 +60500,9 @@ aad
aad
aac
aZu
-btg
-cAM
-cAQ
+mra
+wJy
+sWE
aac
aZu
aac
@@ -60542,10 +60757,10 @@ aad
aad
aac
aZu
-btg
-cAM
-cAQ
-btg
+mra
+wJy
+sWE
+mra
aZu
aac
aac
@@ -60799,10 +61014,10 @@ aad
aad
aac
aZu
-btg
-cAM
-cAQ
-btg
+mra
+wJy
+sWE
+mra
aZu
aac
aac
@@ -61056,10 +61271,10 @@ aad
aad
aac
aZu
-btg
-cAM
-cAQ
-btg
+mra
+wJy
+sWE
+mra
aZu
aac
aac
@@ -61313,10 +61528,10 @@ aal
aad
aad
aZu
-btg
-cAM
-cAQ
-btg
+mra
+wJy
+sWE
+mra
aZu
aac
aac
@@ -61570,10 +61785,10 @@ aal
aal
aad
aac
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aad
aac
aac
@@ -61827,10 +62042,10 @@ aal
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aad
aad
aac
@@ -62084,10 +62299,10 @@ aad
aad
aad
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aad
aad
aad
@@ -62341,10 +62556,10 @@ aad
aad
aad
aac
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aad
aad
aad
@@ -62598,10 +62813,10 @@ aad
aad
aad
aac
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aad
aad
aad
@@ -62855,10 +63070,10 @@ aad
aad
aad
aac
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aad
aad
aad
@@ -63112,10 +63327,10 @@ aad
aad
aad
aac
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aad
aad
aad
@@ -63369,10 +63584,10 @@ aad
aad
aad
aac
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aad
aad
aad
@@ -63505,9 +63720,9 @@ auf
atc
aub
auN
-avz
+neg
awB
-axo
+gUK
aoQ
atB
ayZ
@@ -63626,10 +63841,10 @@ aad
aad
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aad
aad
aad
@@ -63883,10 +64098,10 @@ aad
aad
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aad
aad
aad
@@ -64140,10 +64355,10 @@ aad
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aad
aad
aad
@@ -64343,7 +64558,7 @@ btS
bed
bft
bqA
-bsn
+dbM
btT
bvh
bqA
@@ -64397,10 +64612,10 @@ aal
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aad
aad
aad
@@ -64540,25 +64755,25 @@ awE
aoQ
azc
aoQ
-azX
+wpm
aoQ
aoQ
aoQ
azc
aoQ
-azX
+rbj
aoQ
aoQ
aoQ
azc
aoQ
-azX
+rbj
aoQ
aoQ
aoQ
aGv
aoQ
-aIc
+qyd
aGr
aoQ
akI
@@ -64654,10 +64869,10 @@ aal
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aad
aad
@@ -64911,10 +65126,10 @@ aal
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aad
@@ -65047,7 +65262,7 @@ aug
ate
aud
auS
-avz
+neg
awF
axr
axP
@@ -65098,7 +65313,7 @@ aal
aal
aVV
aVV
-aXL
+qJC
aZx
bbq
bcG
@@ -65168,10 +65383,10 @@ aal
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -65372,7 +65587,7 @@ bgM
bfq
bcH
bqA
-btW
+unv
bvl
bwt
bqA
@@ -65425,10 +65640,10 @@ aal
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -65548,12 +65763,12 @@ aal
aal
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
+amu
+amu
+amu
+amu
+amu
+amu
akI
aoQ
atB
@@ -65682,10 +65897,10 @@ aal
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -65805,12 +66020,12 @@ aal
aal
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
+amu
+mAf
+dNO
+onC
+iHO
+nvQ
akI
aoQ
atA
@@ -65939,10 +66154,10 @@ aal
aal
acZ
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -66062,12 +66277,12 @@ aal
aal
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
+amu
+xfn
+fYM
+nmk
+nmk
+xwF
akI
asK
aoQ
@@ -66127,7 +66342,7 @@ aal
aVV
aWB
aXW
-aZC
+wCg
aVV
bcI
bee
@@ -66143,9 +66358,9 @@ bee
bfr
bqC
bqA
-btZ
+oKJ
bvn
-bww
+bwv
bqA
aal
aal
@@ -66196,10 +66411,10 @@ aal
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -66319,12 +66534,12 @@ aal
aal
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
+amu
+hsH
+nmk
+jkV
+nmk
+dZc
ajK
ajK
ajK
@@ -66453,10 +66668,10 @@ amF
amF
amF
amF
-bIf
-bKY
-bMl
-bMR
+pvo
+jSd
+xzF
+emh
bNz
aal
aal
@@ -66576,12 +66791,12 @@ aal
aal
aal
aad
-aad
-aad
-aad
-aad
-aad
-aad
+amu
+hsH
+onC
+onC
+onC
+vtD
ajK
arf
arS
@@ -66710,10 +66925,10 @@ aal
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -66834,7 +67049,7 @@ aal
aal
aad
amu
-amu
+iOU
amu
amu
amu
@@ -66967,10 +67182,10 @@ aal
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -67091,7 +67306,7 @@ aal
aal
aal
amu
-anb
+rfO
amu
aom
apg
@@ -67224,10 +67439,10 @@ aal
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -67348,7 +67563,7 @@ aal
aal
aal
amu
-anc
+xTO
anq
aon
aon
@@ -67481,10 +67696,10 @@ aal
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -67605,7 +67820,7 @@ aal
aal
aal
amv
-and
+lYf
anr
aoo
aph
@@ -67690,58 +67905,58 @@ bqA
bqA
bqA
aal
-alK
+gby
+iMw
+iMw
+iMw
+sSJ
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
btf
-btf
-btf
-bjS
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btf
-btg
-cAM
-cAQ
-ctQ
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+iMw
+mra
+wJy
+sWE
+nmm
aal
aal
aal
@@ -67862,7 +68077,7 @@ aal
aal
aal
amw
-ane
+qLc
anr
aop
api
@@ -67947,58 +68162,58 @@ bvt
bqA
aal
aal
-brL
-aaf
-aaf
-aaf
-brK
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-cAM
-cAQ
-ctQ
+thW
+lOl
+lOl
+lOl
+fIx
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+wJy
+sWE
+nmm
aal
aal
aal
@@ -68119,7 +68334,7 @@ aal
aal
aal
amx
-anf
+iAx
anu
aoq
apj
@@ -68204,58 +68419,58 @@ bvu
bqH
aal
aal
-brL
+thW
+xNb
+xNb
+xNb
+vEk
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
aag
-aag
-aag
-brM
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-cAM
-cAQ
-ctQ
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+wJy
+sWE
+nmm
aal
aal
aal
@@ -68405,13 +68620,13 @@ aoQ
aoQ
aoQ
aoQ
-aBM
+nek
aoQ
aCM
aoQ
aoQ
aoQ
-aBM
+pFs
aoQ
aIf
aoQ
@@ -68461,58 +68676,58 @@ bvv
bqA
aal
aal
-alN
-amq
-ams
-ams
-bGq
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-bId
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-ams
-bIe
-aah
-aah
-aah
-aah
-btg
-cAM
-cAQ
-ctQ
+hbo
+shi
+lnp
+lnp
+hii
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+ykd
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+lnp
+iiv
+jwW
+jwW
+jwW
+jwW
+mra
+wJy
+sWE
+nmm
aal
aal
aal
@@ -68766,10 +68981,10 @@ aal
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
acZ
@@ -69023,10 +69238,10 @@ aal
aal
acZ
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -69280,10 +69495,10 @@ aal
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -69537,10 +69752,10 @@ aal
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -69794,10 +70009,10 @@ aal
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -70051,10 +70266,10 @@ aal
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -70308,10 +70523,10 @@ aal
aal
aal
acZ
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -70565,10 +70780,10 @@ aal
aal
aal
aal
-brL
-cAN
-cAQ
-ctQ
+thW
+fxe
+sWE
+nmm
aal
aal
aal
@@ -70774,7 +70989,10 @@ aIz
aGl
aGl
aGl
-ckP
+aGl
+aGl
+aGl
+aIz
aGl
aGl
aGl
@@ -70792,9 +71010,6 @@ aGl
aGl
aGl
aGl
-aGl
-aGl
-aGl
ckP
aGl
aGl
@@ -70822,10 +71037,10 @@ chY
aal
aal
aal
-brL
-cAN
-cAQ
-ctQ
+thW
+fxe
+sWE
+nmm
aal
aal
aal
@@ -71079,10 +71294,10 @@ chZ
chB
chB
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -71336,10 +71551,10 @@ cia
cie
chB
chB
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -71593,10 +71808,10 @@ cib
chW
cif
chB
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -71850,10 +72065,10 @@ cic
chW
cig
chC
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
acZ
@@ -72107,10 +72322,10 @@ cid
chW
cih
chB
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -72364,10 +72579,10 @@ chW
chW
cii
chB
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -72516,7 +72731,7 @@ aVf
aZr
aTU
bco
-aJq
+gSl
bfl
bkl
brV
@@ -72528,8 +72743,8 @@ bkl
bkl
brV
bkl
-aGl
-aGl
+bkl
+bkl
bkl
bkl
bkl
@@ -72547,7 +72762,7 @@ bkl
bkl
bkl
bkl
-caz
+brV
bkl
bkl
bkl
@@ -72558,10 +72773,10 @@ brV
bkl
bkl
bkl
-aGl
+bkl
cfb
cgD
-cjT
+iJS
bkl
bkl
bkl
@@ -72612,7 +72827,7 @@ aWt
aRT
aFK
aVo
-ckP
+aGl
biS
chD
chP
@@ -72621,10 +72836,10 @@ chX
chX
cij
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -72878,10 +73093,10 @@ chQ
chQ
cik
ciq
-cAH
-cAO
-cAR
-cAT
+hiA
+iUf
+gCX
+qbg
cwY
cwY
cwY
@@ -73126,7 +73341,7 @@ aVo
aZH
aFK
bdM
-aGl
+ckP
aGl
acQ
acQ
@@ -73135,10 +73350,10 @@ acQ
acQ
cno
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -73392,10 +73607,10 @@ acQ
acQ
cno
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -73649,10 +73864,10 @@ acQ
chR
cil
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -73906,10 +74121,10 @@ acQ
chU
cim
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -74163,10 +74378,10 @@ acQ
chT
cin
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -74420,10 +74635,10 @@ acQ
acQ
cno
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -74677,10 +74892,10 @@ acQ
chR
cil
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -74903,7 +75118,7 @@ bCv
bMt
bNF
bPh
-bRe
+rtq
bTh
ckc
cqr
@@ -74925,7 +75140,7 @@ aVo
aQG
aFK
aVo
-ckP
+aGl
cpE
chJ
chU
@@ -74934,10 +75149,10 @@ acQ
chS
cio
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -75191,10 +75406,10 @@ acQ
chT
cin
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -75439,7 +75654,7 @@ aVo
aQG
aUY
aVo
-aGl
+ckP
cpE
chK
bdI
@@ -75448,10 +75663,10 @@ bdI
bdI
cip
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -75673,7 +75888,7 @@ bJL
bDM
bMw
bIi
-bPj
+ess
bpP
bSF
ckj
@@ -75705,10 +75920,10 @@ aal
aal
aal
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -75915,10 +76130,10 @@ bjY
bdd
bdd
bdd
+gdx
bdd
bdd
-bdd
-bdd
+gdx
bdd
bdd
bdd
@@ -75932,7 +76147,7 @@ bIi
bIi
bIi
bIi
-bIi
+rsL
cjY
bHZ
bUJ
@@ -75962,10 +76177,10 @@ aal
aal
aal
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -76157,7 +76372,7 @@ bel
bfC
aVv
bFs
-bFu
+kEA
bNb
bNb
bNb
@@ -76219,10 +76434,10 @@ aal
aal
aal
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -76414,7 +76629,7 @@ bem
bfC
aVv
bFs
-bFu
+kEA
bNt
bNt
bNt
@@ -76476,10 +76691,10 @@ aal
aal
aal
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -76671,7 +76886,7 @@ aYd
bfD
aVv
bFs
-bHZ
+bHQ
bNu
bkF
blD
@@ -76733,10 +76948,10 @@ aal
aal
aal
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
acZ
@@ -76928,7 +77143,7 @@ aYd
bfE
aVv
bFs
-bHZ
+bHQ
bNw
bkG
blE
@@ -76964,7 +77179,7 @@ cjm
cki
bHZ
bLi
-caO
+kIp
cfl
bLi
cfO
@@ -76990,10 +77205,10 @@ aal
aal
aal
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -77185,7 +77400,7 @@ ben
bfF
aVv
bFs
-bHZ
+bHQ
bNu
bkH
blF
@@ -77247,10 +77462,10 @@ aal
aal
aal
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -77442,7 +77657,7 @@ beo
bfG
aVv
bFs
-bHZ
+bHQ
bNu
bkI
blG
@@ -77504,10 +77719,10 @@ aal
aal
aal
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -77699,7 +77914,7 @@ bep
bfH
aVv
bFs
-bHZ
+bHQ
bNu
bkJ
blH
@@ -77761,10 +77976,10 @@ aal
aal
aal
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -77956,7 +78171,7 @@ aYe
bfI
aVv
bFs
-bHZ
+bHQ
bNu
bkG
blI
@@ -78018,10 +78233,10 @@ aal
aal
aal
acO
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -78213,7 +78428,7 @@ bbw
aVv
aVv
bFs
-bHZ
+bHQ
bNu
bkF
blJ
@@ -78275,10 +78490,10 @@ cxf
cxf
cxf
cxf
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -78407,14 +78622,14 @@ amF
amF
amF
amF
-asL
+tFD
atu
amF
amF
amF
amF
+tFD
amF
-asL
amF
amF
amF
@@ -78464,13 +78679,13 @@ cdw
cdw
cdw
cdw
-ezS
-aKT
-ezS
+cdw
+vQh
cdw
cdw
-bFu
-bFu
+cdw
+rzl
+kBc
bNb
bkK
blK
@@ -78532,10 +78747,10 @@ cxf
czu
cAa
cxf
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -78789,10 +79004,10 @@ cxf
cxN
cyE
cxf
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -78996,13 +79211,13 @@ aVt
aTt
aUh
bwE
-bxn
-byk
+qaD
+hjA
bzc
-bzN
-bAu
-bBn
-bCe
+yjX
+ryA
+pPh
+mTy
bDd
bbR
aTt
@@ -79046,10 +79261,10 @@ cxf
cxN
cAb
cxf
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -79253,12 +79468,12 @@ aVt
aTt
aUh
bwE
-bxo
-byk
+qBw
+uwv
bzd
-bzO
-bAv
-bBo
+iEF
+hra
+bBp
bCf
bDe
bbR
@@ -79273,8 +79488,8 @@ bFw
bNM
bPs
bRk
-bnJ
-bTk
+lCN
+bTl
akc
cub
aGl
@@ -79303,10 +79518,10 @@ cyZ
cxN
cxN
cxf
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -79482,7 +79697,7 @@ aPL
aMb
aSD
aTf
-aSG
+oHO
aUe
aUH
aMb
@@ -79510,11 +79725,11 @@ aVt
aTt
aUh
bwE
-bxn
-byk
+qAV
+uwv
bzd
-bzP
-bAw
+toq
+uIo
bBp
bCg
bDf
@@ -79560,10 +79775,10 @@ cza
czv
cxN
cxf
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -79736,10 +79951,10 @@ aOP
aOP
aOP
aOP
-aMb
-aSE
-aTg
-aTg
+aRW
+vAT
+aUf
+aUf
aUf
aUI
beI
@@ -79767,11 +79982,11 @@ aVt
aTt
aUh
bwD
-bxn
-byk
+ezA
+nvq
bze
-bzQ
-bAx
+lzC
+uxQ
bBq
bCh
bDg
@@ -79817,10 +80032,10 @@ cxf
cxf
cAc
cxf
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -79998,7 +80213,7 @@ aSF
aTg
aTg
aTg
-aUJ
+oPS
aMb
rEg
aVO
@@ -80031,7 +80246,7 @@ bzR
bAy
bBr
bCi
-bDh
+jxv
bDY
aTt
aUh
@@ -80074,10 +80289,10 @@ cxN
cyE
cyE
cxf
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
acZ
@@ -80184,7 +80399,7 @@ age
age
ahn
ahK
-aik
+ocs
ahM
ahM
ajD
@@ -80265,7 +80480,7 @@ bnv
bvX
bbA
bcT
-bes
+llh
bfO
bbA
bFZ
@@ -80284,7 +80499,7 @@ bwD
bxu
bym
bbR
-bzS
+gDP
bAy
bBr
bCi
@@ -80331,10 +80546,10 @@ cyE
czw
cxN
cxf
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -80436,11 +80651,11 @@ aal
aal
aal
aeY
-afE
-agf
-agH
+ids
+nsT
+ujj
ahn
-ahL
+jyZ
ail
ahM
ajn
@@ -80588,10 +80803,10 @@ czb
cxP
cAd
czb
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -80693,9 +80908,9 @@ aal
acZ
aal
aeY
-afF
-agg
-agI
+nsT
+lHd
+hQq
aho
ahM
ahM
@@ -80845,10 +81060,10 @@ cxf
cxN
cxN
cxf
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -80950,9 +81165,9 @@ aal
aal
aal
aeY
-afG
-agh
-agJ
+ujj
+nsT
+ids
ahn
ahN
ahM
@@ -81102,10 +81317,10 @@ cxf
cxR
cyE
cxf
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -81295,8 +81510,8 @@ aYf
aVO
aVO
aVO
-aVO
-bGo
+jhn
+bFZ
bHZ
bjZ
bkO
@@ -81359,10 +81574,10 @@ cxf
czx
cAe
cxf
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -81616,10 +81831,10 @@ cxf
cxf
cxf
cxf
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -81873,10 +82088,10 @@ aal
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -82095,7 +82310,7 @@ aTt
aUh
bIx
bKc
-bLv
+xBZ
bMB
bNS
bPD
@@ -82130,10 +82345,10 @@ cna
cna
cna
cna
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -82354,7 +82569,7 @@ bIy
bKd
bLw
bMB
-bNT
+nXj
bPE
bRs
bON
@@ -82387,10 +82602,10 @@ cna
czA
coR
cAA
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -82644,10 +82859,10 @@ cna
czB
coR
cAB
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -82740,7 +82955,7 @@ aal
abZ
adg
ajt
-ajN
+eDX
aka
aka
aka
@@ -82883,8 +83098,8 @@ bUd
ecw
bUd
ecw
-bUd
-cnS
+mYA
+cnO
bdS
coU
aFK
@@ -82901,10 +83116,10 @@ cna
czC
coR
cAC
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -82995,9 +83210,9 @@ aal
aal
aal
aba
-acj
-acj
-aba
+nIs
+nIs
+xTA
aba
aba
aeG
@@ -83158,10 +83373,10 @@ cna
cna
bDp
cAD
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -83252,11 +83467,11 @@ aqf
aqf
bQh
aba
-alT
-alT
+wjF
+wjF
aba
-alT
-alT
+wjF
+wjF
aeG
adL
adM
@@ -83415,10 +83630,10 @@ bDp
bDp
bDp
cna
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -83509,11 +83724,11 @@ aqg
aqg
ayF
aba
-ack
-alT
+vWp
+wjF
aba
-ack
-alT
+vWp
+wjF
adq
adM
adM
@@ -83649,10 +83864,10 @@ bUf
bUR
bUS
bWT
-bXO
+wRt
bXO
bWT
-caa
+sgV
caa
bUf
cnO
@@ -83672,10 +83887,10 @@ czf
czD
cAj
cna
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -83766,11 +83981,11 @@ acL
acL
awM
aba
-alT
-alT
+wjF
+wjF
aba
-alT
-alT
+wjF
+wjF
aeG
adN
adM
@@ -83929,10 +84144,10 @@ cna
cna
cna
cna
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -84023,11 +84238,11 @@ acf
aaS
acf
aba
-alT
-alT
+wjF
+wjF
aba
-alT
-alT
+wjF
+wjF
aeG
adP
adM
@@ -84186,10 +84401,10 @@ cpU
cpN
cpW
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -84280,14 +84495,14 @@ aal
aal
aal
aba
-ack
-alT
+vWp
+wjF
aba
-ack
-alT
+vWp
+wjF
aeG
-adQ
-aeg
+dTl
+eto
aet
aeG
afe
@@ -84443,10 +84658,10 @@ aFK
cpO
cpX
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -84537,11 +84752,11 @@ aaL
aaL
aaL
aaL
-alT
-alT
+wjF
+wjF
aba
-aEr
-aEr
+rxz
+rxz
aeG
aeG
aeG
@@ -84700,10 +84915,10 @@ aFK
cpO
cpY
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -84794,15 +85009,15 @@ abE
aaY
abR
aaL
-alT
-alT
-alT
-alT
-alT
-alT
-alT
-alT
-cxb
+wjF
+wjF
+wjF
+wjF
+wjF
+wjF
+wjF
+wjF
+lOs
aba
aff
afN
@@ -84957,10 +85172,10 @@ aFK
cpO
cpY
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -85051,15 +85266,15 @@ abq
abh
aaU
aaL
-ack
-alT
-alT
-alT
-alT
-alT
-alT
-alT
-aeu
+vWp
+wjF
+wjF
+wjF
+wjF
+wjF
+wjF
+wjF
+eEV
aba
afg
afO
@@ -85214,10 +85429,10 @@ aFK
cpO
cpY
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -85308,15 +85523,15 @@ aaU
abh
abS
aaL
-alT
-alT
-alT
-alT
-alT
-alT
-alT
-alT
-cxb
+wjF
+wjF
+wjF
+wjF
+wjF
+wjF
+wjF
+wjF
+lOs
aba
afh
afp
@@ -85471,10 +85686,10 @@ aFK
cpO
cpZ
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -85565,15 +85780,15 @@ abh
abh
abT
aaL
-alT
-alT
-alT
-alT
-acX
-adr
-adR
-aeh
-aev
+wjF
+wjF
+wjF
+wjF
+tpO
+dtC
+lZg
+mwj
+pHo
aba
afh
afp
@@ -85728,10 +85943,10 @@ aFK
cpO
cpY
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -85985,10 +86200,10 @@ aFK
cpO
cpX
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -86242,10 +86457,10 @@ aFK
cpO
cpY
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -86499,10 +86714,10 @@ aFK
cpO
cpX
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -86682,7 +86897,7 @@ aLv
aUo
aUT
aVl
-aVy
+dlP
aVl
aWo
aXg
@@ -86756,10 +86971,10 @@ cpV
cpR
cqa
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -87013,10 +87228,10 @@ cxm
cxm
cxm
cxm
-cAI
-cAM
-cAQ
-ctQ
+rAX
+wJy
+sWE
+nmm
aal
aal
aal
@@ -87270,10 +87485,10 @@ bvU
bvU
bvU
bvU
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
acZ
@@ -87527,10 +87742,10 @@ bvU
bvU
bvU
bvU
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -87784,10 +87999,10 @@ bvU
bvU
bvU
bvU
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -88041,10 +88256,10 @@ bvU
bvU
bvU
bvU
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -88298,10 +88513,10 @@ bvU
bvU
bvU
bvU
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -88555,10 +88770,10 @@ bvU
bvU
bvU
bvU
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -88812,10 +89027,10 @@ bvU
bvU
bvU
bvU
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -88981,7 +89196,7 @@ aKo
aMv
aKT
aws
-aMH
+aRF
aNw
aOm
aPj
@@ -89069,10 +89284,10 @@ bvU
bvU
aXQ
cAx
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -89178,7 +89393,7 @@ afP
afq
aha
ahx
-ahV
+tfP
ais
afq
akg
@@ -89326,10 +89541,10 @@ czc
czy
cxT
cxp
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -89552,7 +89767,7 @@ bLH
bMU
bOk
bPZ
-bRP
+qpQ
bNd
bFs
bHZ
@@ -89583,10 +89798,10 @@ bvU
czy
bvU
cxq
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -89840,10 +90055,10 @@ bvU
czy
bvU
cxp
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -89890,7 +90105,7 @@ alv
aTz
apa
apa
-apa
+daq
apa
apa
apa
@@ -90097,10 +90312,10 @@ bvU
czy
cxU
cxq
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -90354,10 +90569,10 @@ bvU
bvU
aXQ
cAy
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -90553,7 +90768,7 @@ bIY
bHZ
aWA
bmp
-bXA
+cPf
boI
bpZ
brA
@@ -90611,10 +90826,10 @@ bvU
bvU
bvU
wQO
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -90868,10 +91083,10 @@ bvU
bvU
bvU
bvU
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -91125,10 +91340,10 @@ bvU
bvU
bvU
bvU
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -91382,10 +91597,10 @@ bvU
bvU
bvU
bvU
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -91518,7 +91733,7 @@ aEA
aEA
aEA
aEA
-aEW
+aEA
aEA
aEA
aEA
@@ -91630,7 +91845,7 @@ ctv
ctz
cts
ctF
-ctH
+hzz
pVt
wQO
bvU
@@ -91639,10 +91854,10 @@ bvU
bvU
bvU
wQO
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -91896,10 +92111,10 @@ bvU
bvU
aXQ
cAx
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -91946,7 +92161,7 @@ alv
aTz
apa
apa
-apa
+daq
apa
apa
apa
@@ -92153,10 +92368,10 @@ czc
czy
cxT
cxp
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -92410,10 +92625,10 @@ bvU
czy
bvU
cxq
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -92667,10 +92882,10 @@ bvU
czy
bvU
cxp
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -92924,10 +93139,10 @@ bvU
czy
cxU
cxq
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
acZ
@@ -93181,10 +93396,10 @@ bvU
bvU
aXQ
cAy
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -93318,7 +93533,7 @@ aCT
aCT
aCT
aCT
-aFa
+aCT
aCT
aCT
aCT
@@ -93397,7 +93612,7 @@ cqZ
crr
cod
crR
-csj
+kBg
clh
aCT
aCT
@@ -93423,7 +93638,7 @@ aCT
aCT
csV
cte
-cwT
+siw
cts
ctv
ctC
@@ -93438,10 +93653,10 @@ bvU
bvU
bvU
bvU
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -93654,7 +93869,7 @@ cra
cpr
crE
crS
-clh
+bke
csC
clt
clt
@@ -93679,8 +93894,8 @@ clt
clt
clt
cvN
-ctH
-cvT
+cvQ
+cvR
ctu
cty
ctu
@@ -93695,10 +93910,10 @@ bvU
bvU
bvU
bvU
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -93833,7 +94048,7 @@ aED
aED
aED
aED
-aED
+aEG
alo
akz
akQ
@@ -93936,8 +94151,8 @@ csP
ccV
csW
cnO
-aGl
-aQG
+bdS
+coU
aFK
aVo
aZH
@@ -93952,10 +94167,10 @@ bvU
bvU
bvU
bvU
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -94193,8 +94408,8 @@ cde
cde
csX
cnO
-aGl
-aQG
+bdS
+coU
aFK
cpq
aQG
@@ -94209,10 +94424,10 @@ bvU
bvU
bvU
bvU
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -94333,21 +94548,21 @@ aln
alP
amf
alR
-ank
-ank
-ank
-apo
-ank
-ank
-ank
-ank
-ank
-ank
-aur
-ank
-ank
-ank
-ank
+isz
+isz
+isz
+lwU
+isz
+isz
+isz
+isz
+isz
+isz
+eJn
+isz
+isz
+isz
+isz
axZ
ayH
alP
@@ -94451,7 +94666,7 @@ cde
ctf
cnO
bdS
-aQG
+coU
aFK
aVo
aQG
@@ -94466,10 +94681,10 @@ bvU
bvU
bvU
bvU
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -94591,19 +94806,19 @@ alo
amg
alo
alo
-amm
-amM
-app
-aqi
-aqi
-arw
-aqi
-aqi
-atC
-aus
-amM
-avQ
-amm
+sOj
+uOH
+qwA
+eHI
+eHI
+yjl
+eHI
+eHI
+wya
+qvh
+uOH
+mud
+sOj
alo
alo
amg
@@ -94690,7 +94905,7 @@ ciR
bOs
boV
cbu
-ceU
+tSx
boV
aSx
aSL
@@ -94701,14 +94916,14 @@ ccV
ccV
ccV
rxL
-cdh
+poJ
cjR
cde
cde
ccV
cnH
bdS
-aQG
+coU
aFK
aVo
aQG
@@ -94723,10 +94938,10 @@ bvU
bvU
bvU
bvU
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -94845,7 +95060,7 @@ aal
aal
aal
alo
-amh
+xEN
alo
anl
anl
@@ -94863,7 +95078,7 @@ anl
anl
anl
alo
-amh
+xEN
azp
cnB
cnB
@@ -94964,8 +95179,8 @@ cdf
cdf
ctg
cvO
-aGl
-aQG
+bdS
+coU
aUm
aVo
aQG
@@ -94980,10 +95195,10 @@ bvU
bvU
bvU
bvU
-cAJ
-cAM
-cAQ
-ctQ
+jnu
+wJy
+sWE
+nmm
aal
aal
aal
@@ -95102,8 +95317,8 @@ aal
aal
aal
alo
-amh
-amm
+xEN
+sOj
anl
anD
anD
@@ -95119,8 +95334,8 @@ apq
anD
anD
anl
-amm
-amh
+sOj
+xEN
azp
cnB
cnB
@@ -95221,8 +95436,8 @@ cdi
cdi
cto
bgn
-aGl
-aQG
+bdS
+coU
aFK
aVo
aQG
@@ -95237,10 +95452,10 @@ cos
cos
cos
cos
-cdn
-cAM
-cAQ
-ctQ
+mJc
+wJy
+sWE
+nmm
aal
aal
aal
@@ -95359,8 +95574,8 @@ aal
aal
aal
alo
-amh
-amL
+xEN
+gZc
anl
anD
aoE
@@ -95376,8 +95591,8 @@ asM
avR
anD
anl
-amW
-amh
+lnf
+xEN
azp
cnB
cnB
@@ -95478,14 +95693,14 @@ cde
cde
ccV
cnO
-aGl
-aQG
+cow
+coU
aFK
aVo
aQG
aFK
aVo
-aGl
+bfc
cpF
aal
aal
@@ -95494,10 +95709,10 @@ aal
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -95616,8 +95831,8 @@ aal
aal
aal
alo
-ami
-amM
+rGc
+uOH
anl
anE
aoF
@@ -95633,8 +95848,8 @@ avf
avS
awN
anl
-aya
-ayI
+eJr
+psv
azp
cnB
cnB
@@ -95736,7 +95951,7 @@ cde
csX
cnO
bdS
-aQG
+coU
aFK
aVo
aQG
@@ -95751,10 +95966,10 @@ bAd
bAd
bAd
byv
-btg
-cAM
-cAQ
-ctQ
+mra
+wJy
+sWE
+nmm
aal
aal
aal
@@ -95784,7 +95999,7 @@ aTz
aTz
bKC
cbh
-apa
+daq
alv
cgU
ciL
@@ -95873,8 +96088,8 @@ aal
aal
aal
alo
-amh
-amN
+xEN
+fKp
anm
anD
aoH
@@ -95890,8 +96105,8 @@ apt
avT
anD
axB
-ayb
-ayJ
+qHx
+drE
azp
cnB
cnB
@@ -95960,7 +96175,7 @@ cdy
cdy
cdy
clw
-coH
+cre
crf
cpc
crW
@@ -95993,7 +96208,7 @@ cde
ctp
cnO
bdS
-aQG
+coU
aFK
aVo
aQG
@@ -96008,10 +96223,10 @@ cxA
cxA
cxA
aSx
-btg
-cAM
-cAQ
-ctQ
+mra
+wJy
+sWE
+nmm
aal
aal
aal
@@ -96130,10 +96345,10 @@ aal
aal
aal
alo
-amh
-amO
+xEN
+cOx
anm
-vZM
+vYF
aoI
apu
aqk
@@ -96147,8 +96362,8 @@ asN
avU
anD
axB
-ayc
-amh
+gTI
+xEN
azp
cnB
cnB
@@ -96217,7 +96432,7 @@ cef
cef
cef
clw
-cpa
+igY
crf
cpc
crX
@@ -96227,8 +96442,8 @@ csI
cre
ctO
boV
-ciH
-chu
+fFx
+rxR
bwl
bqt
bqt
@@ -96249,14 +96464,14 @@ cde
cde
ctf
cnO
-coI
-aQG
+bdS
+coU
aFK
aVo
aQG
aFK
bdM
-bfc
+aGl
cpF
cxA
cyb
@@ -96265,10 +96480,10 @@ czg
cyc
cxA
aSx
-btg
-cAM
-cAQ
-ctQ
+mra
+wJy
+sWE
+nmm
aal
aal
aal
@@ -96387,8 +96602,8 @@ aal
aal
aal
alo
-amh
-amP
+xEN
+gJG
anm
anF
aoJ
@@ -96404,8 +96619,8 @@ asN
avY
awO
axB
-ayd
-amh
+ruH
+xEN
azp
cnB
cnB
@@ -96474,7 +96689,7 @@ cjW
cjW
cjW
clx
-cpb
+sDo
crg
cpc
cpc
@@ -96484,8 +96699,8 @@ csI
cre
ctO
boV
-bwk
-bwk
+ims
+ims
boV
bqt
bqt
@@ -96506,8 +96721,8 @@ evB
evB
ccV
cnO
-aGl
-aQG
+bdS
+coU
aFK
aVo
aQG
@@ -96522,10 +96737,10 @@ cyc
cyc
cxA
aSx
-btg
-cAM
-cAQ
-ctQ
+mra
+wJy
+sWE
+nmm
aal
aal
aal
@@ -96644,8 +96859,8 @@ aal
aal
aal
alo
-amh
-amQ
+xEN
+ihO
anm
anH
anD
@@ -96661,8 +96876,8 @@ anD
anD
awR
axB
-ayd
-amh
+ruH
+xEN
azp
cnB
cnB
@@ -96731,7 +96946,7 @@ ceL
ceL
ceL
clL
-cpc
+mdW
cpc
cpc
cpc
@@ -96741,8 +96956,8 @@ csI
cre
ctO
boV
-bxY
-bxY
+oTD
+oTD
boV
boV
bwn
@@ -96764,7 +96979,7 @@ ccV
ccV
cnO
bdS
-aSB
+usL
aFK
aWt
aQG
@@ -96779,10 +96994,10 @@ cyd
cyd
cxC
aSx
-btg
-cAM
-cAQ
-ctQ
+mra
+wJy
+sWE
+nmm
aal
aal
aal
@@ -96901,8 +97116,8 @@ aal
aal
aal
alo
-amh
-amR
+xEN
+rrI
anm
anI
anD
@@ -96918,8 +97133,8 @@ anD
avZ
awS
axB
-aye
-amh
+gZz
+xEN
azp
cnB
cnB
@@ -96988,14 +97203,14 @@ cfe
cfe
ckE
clM
-cpJ
+xHK
crh
cpc
cpc
cpc
cpc
crW
-coH
+cre
coH
clv
cmk
@@ -97020,8 +97235,8 @@ clv
clv
clv
cvP
-aHh
-cwU
+rMw
+hvF
cwZ
cwZ
cxc
@@ -97036,10 +97251,10 @@ cye
cye
cxD
aSx
-btg
-cAM
-cAQ
-ctQ
+mra
+wJy
+sWE
+nmm
aal
aal
aal
@@ -97158,8 +97373,8 @@ aal
aal
aal
alo
-amh
-amR
+xEN
+rrI
anm
anJ
aoK
@@ -97175,8 +97390,8 @@ anD
awa
awT
axB
-ayf
-ayK
+iTj
+uOD
azp
cnB
cnB
@@ -97245,14 +97460,14 @@ cef
cef
cef
clw
-cqj
+rpG
crf
cpc
cpc
cpc
cpc
crW
-ctK
+pAr
coH
clz
cml
@@ -97277,8 +97492,8 @@ clz
clz
clz
bgn
-coI
-aQG
+cow
+coU
aFK
aVo
aZH
@@ -97293,10 +97508,10 @@ czh
czh
cxD
aSx
-btg
-cAM
-cAQ
-ctQ
+mra
+wJy
+sWE
+nmm
aal
aal
acZ
@@ -97415,8 +97630,8 @@ aal
aal
aal
alo
-amh
-amR
+xEN
+rrI
anm
anK
anD
@@ -97432,8 +97647,8 @@ anD
awb
awU
axB
-ayg
-amh
+eKN
+xEN
azp
cnB
cnB
@@ -97502,14 +97717,14 @@ clp
ckA
ckA
clN
-crd
+vNz
cri
crG
crY
crY
csG
csJ
-ctL
+qQt
ctP
cmf
cmm
@@ -97534,8 +97749,8 @@ cmB
cmB
cmB
coh
-aMl
-aSw
+gHc
+coY
aFK
aYV
aSw
@@ -97550,10 +97765,10 @@ cyc
cyc
cxE
aSx
-btg
-cAM
-cAQ
-ctQ
+mra
+wJy
+sWE
+nmm
aal
aal
aal
@@ -97672,8 +97887,8 @@ aal
aal
aal
alo
-amj
-amS
+mUJ
+kFU
anl
anK
anD
@@ -97689,8 +97904,8 @@ avg
awc
awV
anl
-ayh
-amh
+sSC
+xEN
azp
cnB
cnB
@@ -97766,7 +97981,7 @@ cpc
cpc
cpc
cpc
-cpc
+mdW
ctS
cmg
cmg
@@ -97791,14 +98006,14 @@ cmg
cmg
cmg
cnM
-aFK
-aFK
+cht
+ceP
aFK
aFK
aFK
aFK
aVo
-beB
+ipT
cpF
cxA
cxA
@@ -97807,10 +98022,10 @@ czi
czi
cAk
aSx
-btg
-cAM
-cAQ
-ctQ
+mra
+wJy
+sWE
+nmm
aal
aal
aal
@@ -97929,8 +98144,8 @@ aqg
aqf
bQh
alo
-amh
-amm
+xEN
+sOj
anl
anl
aoM
@@ -97946,8 +98161,8 @@ anl
anl
anl
anl
-ayi
-ayJ
+vdL
+drE
azp
cnB
cnB
@@ -98023,7 +98238,7 @@ csl
crh
cpc
csl
-ctM
+lGt
ctT
cmh
cmh
@@ -98048,8 +98263,8 @@ cmh
cmh
cnF
cnN
-aIO
-aPv
+cox
+coZ
aFK
aVe
aPv
@@ -98064,10 +98279,10 @@ cyM
cyM
cxA
aSx
-btg
-cAM
-cAQ
-ctQ
+mra
+wJy
+sWE
+nmm
aal
aal
aal
@@ -98186,8 +98401,8 @@ aqg
aqg
ayF
alo
-amh
-amm
+xEN
+sOj
anl
anL
anD
@@ -98203,8 +98418,8 @@ aux
awd
awW
anl
-ayj
-amh
+eqV
+xEN
azp
cnB
cnB
@@ -98280,7 +98495,7 @@ csm
crf
cpc
crW
-ctN
+qcN
ctU
clz
clz
@@ -98305,14 +98520,14 @@ clz
clz
clz
bgn
-coJ
-aSB
+coy
+usL
aFK
aWt
aQG
aFK
aVo
-cxs
+beB
cpF
cnB
cxA
@@ -98321,10 +98536,10 @@ czj
cyM
cxA
aSx
-btg
-cAM
-cAQ
-ctQ
+mra
+wJy
+sWE
+nmm
aal
aal
aal
@@ -98443,8 +98658,8 @@ aqg
aqg
ayF
alo
-amh
-amm
+xEN
+sOj
anl
anM
aoN
@@ -98460,8 +98675,8 @@ avh
anl
anl
anl
-ayk
-amh
+tpX
+xEN
azp
cnB
cnB
@@ -98537,7 +98752,7 @@ cuI
cuJ
cuH
cuK
-cuF
+ucu
cuL
cuM
aZa
@@ -98562,8 +98777,8 @@ cmi
cmi
cmi
coi
-aGl
-aTy
+bdS
+coX
cpo
aTV
aTV
@@ -98578,10 +98793,10 @@ cyM
cyM
cxA
aSx
-btg
-cAM
-cAQ
-ctQ
+mra
+wJy
+sWE
+nmm
aal
aal
aal
@@ -98700,8 +98915,8 @@ aqg
aqg
ayF
alo
-amh
-amm
+xEN
+sOj
anl
anN
anD
@@ -98717,8 +98932,8 @@ aux
awe
awX
anl
-amm
-amh
+sOj
+xEN
azp
cnB
cnB
@@ -98835,10 +99050,10 @@ czk
cxA
cxA
aSx
-btg
-cAM
-cAQ
-ctQ
+mra
+wJy
+sWE
+nmm
aal
aal
aal
@@ -98957,8 +99172,8 @@ aqg
aqg
ayF
alo
-amh
-aod
+xEN
+xwJ
anl
anl
aoO
@@ -98975,7 +99190,7 @@ anl
anl
anl
alo
-ayM
+yeF
azp
aBP
cnB
@@ -99092,10 +99307,10 @@ cyM
czG
cxA
cAE
-btg
-cAM
-cAQ
-ctQ
+mra
+wJy
+sWE
+nmm
aal
aal
aal
@@ -99214,8 +99429,8 @@ aqg
aqg
ayF
alo
-amh
-amm
+xEN
+sOj
anl
anO
anD
@@ -99231,9 +99446,9 @@ avi
avi
avi
auI
-ayl
-ayN
-ayl
+hsj
+otG
+hsj
azI
azI
aHZ
@@ -99349,10 +99564,10 @@ czl
czl
cxA
cAF
-btg
-cAM
-cAQ
-ctQ
+mra
+wJy
+sWE
+nmm
aal
aal
aal
@@ -99471,8 +99686,8 @@ aqh
aqh
bQU
alo
-amh
-amT
+xEN
+oLZ
anl
anP
anD
@@ -99488,11 +99703,11 @@ avj
awf
awZ
axC
-aym
-ayO
-aym
-aym
-aAa
+pHa
+vJr
+pHa
+pHa
+lUJ
bjN
aAr
aAB
@@ -99503,23 +99718,23 @@ aAQ
aBm
aBB
aBX
-aCw
-aAE
-aEm
+qkq
+pga
+tjo
azo
aFY
azo
-aEm
-aAE
-aAE
-aAE
-aAE
-aAE
-aKW
-aAE
-aAE
-aAE
-aAE
+tjo
+pga
+pga
+pga
+pga
+pga
+fyV
+pga
+pga
+pga
+pga
aOx
aPq
aQf
@@ -99606,10 +99821,10 @@ cxA
cxA
cxA
cAG
-btg
-cAM
-cAQ
-ctQ
+mra
+wJy
+sWE
+nmm
aal
aal
aal
@@ -99728,7 +99943,7 @@ akQ
alf
alo
alo
-amk
+dkW
alo
anl
anl
@@ -99768,14 +99983,14 @@ aFZ
aEV
aoe
aoe
-aJr
-aJY
-aJY
-aKJ
-aKJ
-aLF
-aLF
-aJr
+iqD
+xFN
+xFN
+ffv
+ffv
+cXP
+cXP
+iqD
aoe
aoe
aPr
@@ -99848,7 +100063,7 @@ cat
ceZ
cok
coK
-aQG
+coW
aFK
aVo
aQG
@@ -99863,10 +100078,10 @@ aal
aal
aal
aal
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -99985,8 +100200,8 @@ akR
ali
alp
alQ
-amh
-amm
+xEN
+sOj
anl
anQ
anD
@@ -100035,7 +100250,7 @@ aoe
aoe
aoe
aoe
-aPs
+jLx
aBQ
bzs
bzs
@@ -100120,10 +100335,10 @@ cvS
cvS
cvS
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -100242,8 +100457,8 @@ akS
ali
ali
alQ
-amh
-amm
+xEN
+sOj
anl
anR
anD
@@ -100291,8 +100506,8 @@ bLL
aMf
aMO
aoe
-aJr
-aPs
+iqD
+jLx
aBQ
bzs
bzs
@@ -100377,10 +100592,10 @@ czm
cyg
cAl
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aal
@@ -100499,8 +100714,8 @@ akW
ali
ali
alQ
-amh
-amm
+xEN
+sOj
anl
anQ
aoR
@@ -100548,8 +100763,8 @@ azo
aMg
aMP
aoe
-aoh
-aPs
+kZK
+jLx
aBQ
bzs
bzs
@@ -100634,10 +100849,10 @@ cyR
czI
cwj
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aad
@@ -100756,8 +100971,8 @@ akY
alj
alq
alR
-aml
-amU
+mvL
+xwd
ann
ann
ann
@@ -100805,8 +101020,8 @@ aqp
aqp
aMQ
aoe
-aoh
-aPs
+kZK
+jLx
aBQ
bzs
bzs
@@ -100891,10 +101106,10 @@ cyR
cwa
cvY
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aad
@@ -101013,8 +101228,8 @@ akW
ali
ali
alQ
-amm
-amm
+sOj
+sOj
ann
anS
aoS
@@ -101062,8 +101277,8 @@ aHO
aHO
aHO
aoe
-aOy
-aPt
+wzQ
+ktV
aBQ
bzs
bzs
@@ -101148,10 +101363,10 @@ czn
czK
cwl
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aad
@@ -101270,8 +101485,8 @@ akZ
ali
ali
alQ
-amm
-amm
+sOj
+sOj
ann
anT
aoT
@@ -101319,8 +101534,8 @@ aqp
aqp
aMR
aoe
-aOz
-aPs
+hPB
+jLx
aBQ
bzs
bzs
@@ -101364,7 +101579,7 @@ crb
cmv
bQG
crb
-ckO
+hFc
csN
ciz
cuN
@@ -101405,10 +101620,10 @@ cyT
czL
cAm
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aad
@@ -101527,8 +101742,8 @@ akR
ali
alr
alQ
-amm
-amm
+sOj
+sOj
ann
anU
aoU
@@ -101576,8 +101791,8 @@ aqy
aqy
aMS
aoe
-aOB
-aPs
+wUU
+jLx
aBQ
bzs
bzs
@@ -101612,8 +101827,8 @@ bWs
bWs
bwz
bWs
-bWs
-cho
+xIn
+ccr
ckO
cmv
bQG
@@ -101662,10 +101877,10 @@ cwl
czM
cAn
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aad
@@ -101784,7 +101999,7 @@ akQ
alf
alo
alo
-amn
+pPR
alo
ann
anV
@@ -101833,8 +102048,8 @@ aLH
aMh
aqp
aoe
-aOC
-aPs
+ofV
+jLx
aBQ
bzs
bzs
@@ -101919,10 +102134,10 @@ cwl
czM
cAo
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aad
@@ -102041,8 +102256,8 @@ aqf
aqf
bQh
alo
-amm
-amV
+sOj
+dCD
ann
anW
aoU
@@ -102090,8 +102305,8 @@ aLI
aMh
aqp
aoe
-aOD
-aPs
+lMs
+jLx
aBQ
bzt
bzs
@@ -102176,10 +102391,10 @@ cwl
czN
cAp
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
acZ
aad
@@ -102298,8 +102513,8 @@ aqg
aqg
ayF
alo
-amm
-amm
+sOj
+sOj
ann
anX
aoU
@@ -102347,8 +102562,8 @@ aLJ
aMh
aqp
aoe
-aOE
-aPs
+naH
+jLx
aBQ
bzs
bzs
@@ -102433,10 +102648,10 @@ cwl
czM
cAq
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aad
@@ -102555,8 +102770,8 @@ aqg
aqg
ayF
alo
-amm
-amm
+sOj
+sOj
ann
anY
aoU
@@ -102604,8 +102819,8 @@ aLK
aMh
aqp
aoe
-aOE
-aPs
+naH
+jLx
aBQ
bzs
bzs
@@ -102663,8 +102878,8 @@ bSv
bSR
bTv
bDN
-bQO
-bVF
+epq
+xfZ
cej
cer
cey
@@ -102690,10 +102905,10 @@ czo
czO
cAn
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aad
@@ -102812,8 +103027,8 @@ aqg
aqg
ayF
alo
-amm
-amm
+sOj
+sOj
ann
anZ
aoU
@@ -102861,8 +103076,8 @@ aLL
aMh
aqp
aoe
-aOE
-aPt
+naH
+ktV
aBQ
bzs
bzs
@@ -102920,7 +103135,7 @@ bSv
bSR
bTw
bDN
-bQO
+fcu
bVG
cek
ces
@@ -102947,10 +103162,10 @@ cwl
czM
cAo
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aad
@@ -103069,8 +103284,8 @@ aqg
aqg
ayF
alo
-amm
-amm
+sOj
+sOj
ann
aoa
aoV
@@ -103118,8 +103333,8 @@ aLM
aMh
aMT
aoe
-aoh
-aPs
+kZK
+jLx
aBQ
bzs
bzs
@@ -103158,10 +103373,10 @@ bNi
cjt
bWy
bWy
-bAX
-bAX
-bAX
-bAX
+uwK
+uwK
+uwK
+uwK
bEo
bWy
bWy
@@ -103177,7 +103392,7 @@ cjL
cjN
bOM
bDN
-bQO
+fcu
bVG
cel
cet
@@ -103204,10 +103419,10 @@ cwl
czN
cAp
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aad
@@ -103326,8 +103541,8 @@ aqg
aqg
ayF
alo
-amm
-amm
+sOj
+sOj
ann
aob
aoY
@@ -103375,8 +103590,8 @@ aqy
aqy
aqp
aoe
-aoh
-aPs
+kZK
+jLx
aBQ
bzs
bzs
@@ -103415,10 +103630,10 @@ bTM
bKV
bWy
sMS
-bgY
-bgY
-bgY
-bgY
+nvz
+nvz
+nvz
+nvz
bAc
cha
cir
@@ -103431,10 +103646,10 @@ chv
bDB
cjg
cbC
-cjv
+soh
bDB
bEP
-bQO
+fcu
bVI
cem
ceu
@@ -103461,10 +103676,10 @@ cwl
czM
cAq
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aad
@@ -103583,8 +103798,8 @@ aqg
aqg
ayF
alo
-amo
-amW
+suq
+lnf
ano
ano
ano
@@ -103632,8 +103847,8 @@ aEX
aMi
aqp
aoe
-aJr
-aPs
+iqD
+jLx
aBQ
bzs
bzs
@@ -103672,10 +103887,10 @@ bTM
bKV
bWy
sMS
-bgY
-bgY
-bCN
-bgY
+nvz
+nvz
+gZa
+nvz
bAc
bAc
bAY
@@ -103688,10 +103903,10 @@ chv
bEP
cjg
cbC
-cjv
+soh
bEP
bEP
-bQO
+fcu
bVJ
bVJ
bVJ
@@ -103703,7 +103918,7 @@ cwP
cwP
cwQ
cwS
-aQG
+kuv
aFK
aVo
aQG
@@ -103712,16 +103927,16 @@ aVo
aGl
cpF
cvS
-cyr
-cyQ
-cyQ
-czP
-cAr
+cym
+cwl
+cwl
+czM
+cwl
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aad
@@ -103840,10 +104055,10 @@ aqg
aqg
ayF
alo
-amm
-amW
+sOj
+lnf
ano
-aoc
+oAk
aoZ
apb
aqA
@@ -103890,7 +104105,7 @@ aMj
aMU
aoe
aoe
-aPu
+gjk
aBQ
bzs
bzs
@@ -103945,12 +104160,12 @@ chv
bEV
cjh
cbC
-cjv
+soh
bEV
bEV
-bEV
-cqC
-cqC
+gGE
+fmG
+eUi
cqC
cqC
cqC
@@ -103969,16 +104184,16 @@ aVo
aGl
cpF
cvS
-cys
-cyW
-cyW
-czQ
-cyW
+tvS
+cyQ
+cyQ
+vOS
+cwl
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aad
@@ -104097,11 +104312,11 @@ aqg
aqg
ayF
alo
-amm
-amX
+sOj
+fAm
ano
-arF
-apb
+mOZ
+qEf
apb
aqB
ard
@@ -104207,7 +104422,7 @@ bTz
bTQ
bUt
bDF
-bDF
+uhL
bDF
bDF
bDF
@@ -104225,17 +104440,17 @@ aFK
aVo
aGl
aGl
-cxF
-cyl
-cwl
-cwl
-czM
-cAs
cvS
-brL
-cAM
-cAQ
-ctQ
+lpr
+cyW
+cyW
+oIQ
+jiU
+cvS
+thW
+wJy
+sWE
+nmm
aal
aal
aad
@@ -104354,8 +104569,8 @@ aqg
aqg
ayF
alo
-amm
-amX
+sOj
+fAm
ano
aof
apc
@@ -104459,7 +104674,7 @@ ciJ
bDF
cjJ
cck
-bQQ
+jir
bQQ
bQQ
bQQ
@@ -104482,17 +104697,17 @@ aFK
aVo
aGl
cpF
-cvS
-cyt
+cxF
+cym
cwl
cwl
-czM
-cyW
+krj
+cwl
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aad
@@ -104611,8 +104826,8 @@ aqg
aqg
ayF
alo
-amm
-amY
+sOj
+sMX
ano
ano
ano
@@ -104716,7 +104931,7 @@ bDF
bDF
cjK
ccM
-bQQ
+jir
bQQ
bQQ
bQQ
@@ -104740,16 +104955,16 @@ aVo
bfd
cpF
cvS
-cyn
+pMm
+suD
cwl
+msf
cwl
-czM
-cAu
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aal
aad
@@ -104868,8 +105083,8 @@ aqg
aqg
ayF
alo
-amm
-amY
+sOj
+sMX
anp
aog
apd
@@ -104972,18 +105187,18 @@ cbb
cjw
cjx
bOQ
-bQQ
-bQQ
-bQQ
-bQQ
-bQQ
-bQQ
+cFE
+dtb
+iRB
+iRB
+iRB
+iRB
bWK
bXE
bYs
bYQ
bZO
-cwz
+hBm
bQQ
ccn
coj
@@ -104997,16 +105212,16 @@ cpx
aGl
cpF
cvS
-cyu
-cyX
-cyW
-czR
-cAv
+htH
+mLs
+cwl
+iyk
+jiq
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aad
aad
@@ -105125,8 +105340,8 @@ aqg
aqg
ayF
alo
-amm
-amZ
+sOj
+qal
anp
aoi
aol
@@ -105254,16 +105469,16 @@ aGl
aGl
cpF
cvS
-cyv
-cyY
-cyY
-czS
-cAw
+ikc
+cyW
+cyW
+oIQ
+cwl
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aad
aad
@@ -105382,8 +105597,8 @@ aqg
aqg
ayF
alo
-amm
-amZ
+sOj
+qal
anp
aoj
ape
@@ -105473,8 +105688,8 @@ byT
byT
byT
byT
-byT
-bUs
+kcU
+bDN
bUE
bUH
bUC
@@ -105486,7 +105701,7 @@ ceX
bDF
cjz
bQQ
-bQQ
+cFE
bQQ
bOR
bQQ
@@ -105511,16 +105726,16 @@ coO
coO
cpM
cvS
-cym
-cwl
-cwl
-czM
+kgC
+cyY
+cyY
+uEt
cwl
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aad
aad
@@ -105639,8 +105854,8 @@ aqg
aqg
ayF
alo
-amo
-ana
+suq
+lNw
anp
aok
aol
@@ -105743,7 +105958,7 @@ bVL
bNy
bOQ
bQQ
-bQQ
+cFE
bQQ
bQQ
bQQ
@@ -105774,10 +105989,10 @@ cwl
czM
cwl
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aad
aad
@@ -105896,8 +106111,8 @@ aqg
aqg
ayF
alo
-amm
-ana
+sOj
+lNw
anp
aol
apf
@@ -105989,8 +106204,8 @@ bBb
bBN
bCQ
bSt
-bUG
-bVp
+qot
+bSu
bSu
bSu
bSu
@@ -106000,7 +106215,7 @@ bSu
bSU
bTx
caD
-bQQ
+jjm
bQQ
bOR
bQQ
@@ -106031,10 +106246,10 @@ cwl
czM
cwl
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aad
aad
@@ -106153,8 +106368,8 @@ aqg
aqg
ayF
alo
-amm
-ana
+sOj
+lNw
anp
anp
anp
@@ -106288,10 +106503,10 @@ cwl
czM
cAo
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aad
aad
@@ -106410,8 +106625,8 @@ aqg
aqg
ayF
alo
-amm
-amm
+sOj
+sOj
amz
apG
ant
@@ -106489,7 +106704,7 @@ bSl
bSl
bnY
bpb
-bqw
+btL
bqw
bqw
bqw
@@ -106545,10 +106760,10 @@ czp
czM
cAp
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aad
aad
@@ -106667,7 +106882,7 @@ aqg
aqg
bQU
alo
-amm
+sOj
alo
amz
apG
@@ -106790,22 +107005,22 @@ aal
cvS
bSj
ccO
-cwl
+czT
cwq
cwB
-cwJ
-bcC
-cwV
-cwV
-cwV
-czq
+knX
+eVv
+mhn
+mhn
+ocG
+oDr
czT
cAq
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aad
aad
@@ -106945,17 +107160,17 @@ ayA
axl
axl
axl
-aAc
-aAo
-aAo
-aAK
-aAo
-aBa
-aAo
-aAK
-aAo
-aAo
-aBZ
+jXQ
+jVu
+jVu
+mkJ
+jVu
+iWh
+jVu
+mkJ
+jVu
+jVu
+nGA
aCD
aDM
aEv
@@ -107005,7 +107220,7 @@ bnY
bpd
bqy
bsh
-btM
+edd
bvd
bwr
bnY
@@ -107049,20 +107264,20 @@ cvS
ccP
aZb
cwr
-cwC
-aZh
-bdu
-cxH
-cyx
-cwK
-czr
+qAE
+irU
+mIM
+qad
+osT
+mlQ
+vKx
cwl
cAn
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aad
aad
@@ -107203,15 +107418,15 @@ ayX
awz
azT
amd
-aAy
-aAy
-aAy
-aAy
-aAy
-aAy
-aAy
-aAy
-aAy
+lhG
+lhG
+lhG
+lhG
+lhG
+lhG
+lhG
+lhG
+lhG
amz
aCE
aDN
@@ -107268,7 +107483,7 @@ bws
aGk
xMH
byT
-bOO
+jaX
bzG
bAi
bzG
@@ -107307,19 +107522,19 @@ ccQ
cwl
cws
cvS
-cwL
-cwK
-cwK
-cwK
-cwK
-czr
+tkn
+etO
+etO
+etO
+mlQ
+vKx
cwl
cwl
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aad
aad
@@ -107452,11 +107667,11 @@ amz
amz
amz
amd
-awA
+awz
amd
amd
amd
-ayY
+awz
amd
amd
amd
@@ -107525,7 +107740,7 @@ bnY
bnY
fIm
byT
-xyu
+wMT
bzG
bzG
bzG
@@ -107573,10 +107788,10 @@ czs
cwl
cAo
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aad
aad
@@ -107708,13 +107923,13 @@ aal
aal
aal
aal
+amd
+ayY
+amd
aal
-ayL
-aal
-aal
-aal
-aal
-aal
+amd
+ayY
+amd
aal
aal
aal
@@ -107797,21 +108012,21 @@ aal
aal
aal
aal
-bOY
-aae
-aae
-aae
-aae
-bTY
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-cbJ
+hom
+tcz
+tcz
+tcz
+tcz
+wOb
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+vOh
aal
aal
aal
@@ -107830,10 +108045,10 @@ czt
czU
cAp
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aad
aad
@@ -107937,10 +108152,10 @@ aac
aac
aac
aac
-btg
-btg
-btg
-ctQ
+mra
+mra
+mra
+nmm
aal
aal
aal
@@ -107966,7 +108181,7 @@ aal
aal
aal
aal
-aal
+ayL
aal
aal
aal
@@ -108054,21 +108269,21 @@ aal
aal
aal
aal
-brL
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-ctQ
+thW
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+nmm
aal
aal
aal
@@ -108087,10 +108302,10 @@ cvS
cvS
cvS
cvS
-brL
-cAM
-cAQ
-ctQ
+thW
+wJy
+sWE
+nmm
aal
aad
aad
@@ -108170,184 +108385,184 @@ aad
aad
aac
aZu
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
aac
-btg
-btg
-btg
-btg
-aae
-aae
-aae
-aae
-bxO
-bxO
-bxO
-bxO
-bxO
-bxO
-bxO
-aae
-aae
-aae
-apI
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-apI
-aae
-aae
-aae
-aae
-aae
-aae
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-apI
-aae
-aae
-btg
-bKf
-btg
-aae
-aae
-aae
-apI
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-apI
-aae
-aae
-aae
-aae
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-aae
-btg
-cAM
-cAQ
-ctQ
+mra
+mra
+mra
+mra
+tcz
+tcz
+tcz
+tcz
+vpi
+vpi
+vpi
+vpi
+vpi
+vpi
+vpi
+tcz
+tcz
+tcz
+nCs
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+nCs
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+nCs
+tcz
+tcz
+mra
+mVK
+mra
+tcz
+tcz
+tcz
+nCs
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+nCs
+tcz
+tcz
+tcz
+tcz
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+tcz
+mra
+wJy
+sWE
+nmm
aal
aad
aad
@@ -108427,184 +108642,184 @@ aad
aad
aac
aZu
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-aaf
-cAP
-cAQ
-ctQ
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+lOl
+erg
+sWE
+nmm
aal
aad
aad
@@ -108684,184 +108899,184 @@ aad
aad
aac
aZu
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-aag
-cAS
-ctQ
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+xNb
+kxn
+nmm
aal
aad
aad
@@ -108941,184 +109156,184 @@ aad
aad
aac
aZu
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
aac
-btg
-btg
-btg
-btg
-aah
-aah
-aah
-aah
-bLQ
-bLQ
-bLQ
-bLQ
-bLQ
-bLQ
-bLQ
-aah
-aah
-aah
-apJ
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-apJ
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-apJ
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-apJ
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-apJ
-aah
-aah
-aah
-aah
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-btg
-btg
-btg
-ctQ
+mra
+mra
+mra
+mra
+jwW
+jwW
+jwW
+jwW
+lLN
+lLN
+lLN
+lLN
+lLN
+lLN
+lLN
+jwW
+jwW
+jwW
+oBN
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+oBN
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+oBN
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+oBN
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+oBN
+jwW
+jwW
+jwW
+jwW
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+jwW
+mra
+mra
+mra
+nmm
aad
aad
aad
@@ -109223,9 +109438,9 @@ aac
aac
aac
aac
-btg
-btg
-ctQ
+mra
+mra
+nmm
aal
aal
aal
@@ -109339,21 +109554,21 @@ aal
aal
aal
aal
-brL
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-btg
-ctQ
+thW
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+mra
+nmm
aal
aal
aal
@@ -109372,10 +109587,10 @@ aad
aad
aad
aad
-brL
-btg
-btg
-ctQ
+thW
+mra
+mra
+nmm
aad
aad
aad
@@ -109596,21 +109811,21 @@ aal
aal
aal
aal
-cfE
-chs
-chs
-chs
-chs
-chs
-chs
-chs
-chs
-chs
-chs
-chs
-chs
-chs
-ctR
+vNk
+onK
+onK
+onK
+onK
+onK
+onK
+onK
+onK
+onK
+onK
+onK
+onK
+onK
+mCD
aal
aal
aal
@@ -109629,10 +109844,10 @@ aad
aad
aad
aad
-brL
-vAa
-btg
-ctQ
+thW
+hfZ
+mra
+nmm
aad
aad
aad
@@ -109886,10 +110101,10 @@ aad
aad
aad
aad
-brL
-btg
-btg
-ctQ
+thW
+mra
+mra
+nmm
aad
aad
aad
@@ -110143,10 +110358,10 @@ aad
aad
aad
aad
-brL
-btg
-btg
-ctQ
+thW
+mra
+mra
+nmm
aad
aad
aad
@@ -110400,10 +110615,10 @@ aad
aad
aad
aad
-brL
-btg
-btg
-ctQ
+thW
+mra
+mra
+nmm
aad
aad
aad
@@ -110657,7 +110872,7 @@ aad
aad
aad
aad
-brL
+thW
rvT
bMk
bMk
@@ -110914,7 +111129,7 @@ aad
aad
aad
aad
-brL
+thW
rvT
uvz
uvz
@@ -111153,7 +111368,7 @@ cqD
aEQ
aTz
cpt
-cpt
+tXi
aad
aad
aad
@@ -111171,7 +111386,7 @@ aad
aad
aad
aad
-brL
+thW
bMk
uvz
uvz
@@ -111411,7 +111626,7 @@ crJ
aTz
cpt
cpt
-cpt
+dTA
aad
aad
aad
@@ -111428,7 +111643,7 @@ aad
aad
aal
aal
-bKX
+txP
bMk
uvz
uvz
@@ -111667,7 +111882,7 @@ aER
crK
aTz
cpt
-cpt
+rKC
cpt
aad
aad
@@ -112179,7 +112394,7 @@ apa
apa
adO
apa
-apa
+daq
cpt
cpt
cpt
@@ -112695,7 +112910,7 @@ cqH
aDn
aTz
cpt
-cpt
+rPg
cpt
aad
aad
@@ -112945,7 +113160,7 @@ aad
aad
aTz
cnl
-cnl
+sWC
apa
cqf
aDn
@@ -113465,7 +113680,7 @@ aTz
aTz
aTz
aTz
-cpt
+hvD
cpt
aad
aad
@@ -113717,7 +113932,7 @@ aad
aad
aad
aad
-cpt
+gAp
cpt
cpt
cpt
diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm
index 1c6b7c21d4..c1e4f0af9b 100644
--- a/code/__DEFINES/atmospherics.dm
+++ b/code/__DEFINES/atmospherics.dm
@@ -160,6 +160,9 @@
//SNOSTATION
#define ICEMOON_DEFAULT_ATMOS "ICEMOON_ATMOS"
+//FESTIVESTATION
+#define FESTIVE_ATMOS "o2=22;n2=82;TEMP=266" //this goes here right putnam??
+
//ATMOSIA GAS MONITOR TAGS
#define ATMOS_GAS_MONITOR_INPUT_O2 "o2_in"
#define ATMOS_GAS_MONITOR_OUTPUT_O2 "o2_out"
diff --git a/code/__DEFINES/logging.dm b/code/__DEFINES/logging.dm
index ecb58f1291..bde3189272 100644
--- a/code/__DEFINES/logging.dm
+++ b/code/__DEFINES/logging.dm
@@ -40,15 +40,16 @@
#define LOG_ASAY (1 << 15)
#define LOG_VIRUS (1 << 16)
#define LOG_SHUTTLE (1 << 18)
+#define LOG_VICTIM (1 << 19)
//Individual logging panel pages
-#define INDIVIDUAL_ATTACK_LOG (LOG_ATTACK)
+#define INDIVIDUAL_ATTACK_LOG (LOG_ATTACK | LOG_VICTIM)
#define INDIVIDUAL_SAY_LOG (LOG_SAY | LOG_WHISPER | LOG_DSAY)
#define INDIVIDUAL_EMOTE_LOG (LOG_EMOTE | LOG_SUBTLER)
#define INDIVIDUAL_COMMS_LOG (LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS)
#define INDIVIDUAL_OOC_LOG (LOG_OOC | LOG_ADMIN)
#define INDIVIDUAL_OWNERSHIP_LOG (LOG_OWNERSHIP)
-#define INDIVIDUAL_SHOW_ALL_LOG (LOG_ATTACK | LOG_SAY | LOG_WHISPER | LOG_EMOTE | LOG_DSAY | LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS | LOG_OOC | LOG_ADMIN | LOG_OWNERSHIP | LOG_GAME)
+#define INDIVIDUAL_SHOW_ALL_LOG (LOG_ATTACK | LOG_SAY | LOG_WHISPER | LOG_EMOTE | LOG_DSAY | LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS | LOG_OOC | LOG_ADMIN | LOG_OWNERSHIP | LOG_GAME | LOG_VICTIM)
#define LOGSRC_CLIENT "Client"
#define LOGSRC_MOB "Mob"
diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index 41c94ee5c1..a745dadccf 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -301,7 +301,7 @@
#define APPRENTICE_AGE_MIN 29 // youngest an apprentice can be
#define SHOES_SLOWDOWN 0 // How much shoes slow you down by default. Negative values speed you up
#define SHOES_SPEED_SLIGHT SHOES_SLOWDOWN - 1 // slightest speed boost to movement
-#define POCKET_STRIP_DELAY 40 // time taken (in deciseconds) to search somebody's pockets
+#define POCKET_STRIP_DELAY (4 SECONDS) //time taken to search somebody's pockets
#define DOOR_CRUSH_DAMAGE 15 // the amount of damage that airlocks deal when they crush you
#define HUNGER_FACTOR 0.06 // factor at which mob nutrition decreases
diff --git a/code/__DEFINES/sandcode/strippable.dm b/code/__DEFINES/sandcode/strippable.dm
new file mode 100644
index 0000000000..176953b2e2
--- /dev/null
+++ b/code/__DEFINES/sandcode/strippable.dm
@@ -0,0 +1,5 @@
+#define STRIPPABLE_ITEM_EARS_EXTRA "ears_extra"
+#define STRIPPABLE_ITEM_WRISTS "wrists"
+#define STRIPPABLE_ITEM_SOCKS "socks"
+#define STRIPPABLE_ITEM_UNDERSHIRT "undershirt"
+#define STRIPPABLE_ITEM_UNDERWEAR "underwear"
diff --git a/code/__DEFINES/strippable.dm b/code/__DEFINES/strippable.dm
new file mode 100644
index 0000000000..a660e82784
--- /dev/null
+++ b/code/__DEFINES/strippable.dm
@@ -0,0 +1,31 @@
+// All of these must be matched in StripMenu.js.
+#define STRIPPABLE_ITEM_HEAD "head"
+#define STRIPPABLE_ITEM_BACK "back"
+#define STRIPPABLE_ITEM_MASK "mask"
+#define STRIPPABLE_ITEM_NECK "neck"
+#define STRIPPABLE_ITEM_EYES "eyes"
+#define STRIPPABLE_ITEM_EARS "ears"
+#define STRIPPABLE_ITEM_JUMPSUIT "jumpsuit"
+#define STRIPPABLE_ITEM_SUIT "suit"
+#define STRIPPABLE_ITEM_GLOVES "gloves"
+#define STRIPPABLE_ITEM_FEET "shoes"
+#define STRIPPABLE_ITEM_SUIT_STORAGE "suit_storage"
+#define STRIPPABLE_ITEM_ID "id"
+#define STRIPPABLE_ITEM_BELT "belt"
+#define STRIPPABLE_ITEM_LPOCKET "left_pocket"
+#define STRIPPABLE_ITEM_RPOCKET "right_pocket"
+#define STRIPPABLE_ITEM_LHAND "left_hand"
+#define STRIPPABLE_ITEM_RHAND "right_hand"
+#define STRIPPABLE_ITEM_HANDCUFFS "handcuffs"
+#define STRIPPABLE_ITEM_LEGCUFFS "legcuffs"
+#define STRIPPABLE_ITEM_CORGI_COLLAR "corgi_collar"
+#define STRIPPABLE_ITEM_PARROT_HEADSET "parrot_headset"
+
+/// This slot is not obscured.
+#define STRIPPABLE_OBSCURING_NONE 0
+
+/// This slot is completely obscured, and cannot be accessed.
+#define STRIPPABLE_OBSCURING_COMPLETELY 1
+
+/// This slot can't be seen, but can be accessed.
+#define STRIPPABLE_OBSCURING_HIDDEN 2
diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm
index 70793d7a1d..c858d30ba3 100644
--- a/code/__HELPERS/_lists.dm
+++ b/code/__HELPERS/_lists.dm
@@ -9,7 +9,7 @@
* Misc
*/
-#define LAZYINITLIST(L) if (!L) L = list()
+#define LAZYINITLIST(L) if (!L) { L = list(); }
#define UNSETEMPTY(L) if (L && !length(L)) L = null
#define LAZYCOPY(L) (L ? L.Copy() : list() )
#define LAZYREMOVE(L, I) if(L) { L -= I; if(!length(L)) { L = null; } }
@@ -28,6 +28,12 @@
#define LAZYREMOVEASSOC(L, K, V) if(L) { if(L[K]) { L[K] -= V; if(!length(L[K])) L -= K; } if(!length(L)) L = null; }
#define LAZYACCESSASSOC(L, I, K) L ? L[I] ? L[I][K] ? L[I][K] : null : null : null
+/// Performs an insertion on the given lazy list with the given key and value. If the value already exists, a new one will not be made.
+#define LAZYORASSOCLIST(lazy_list, key, value) \
+ LAZYINITLIST(lazy_list); \
+ LAZYINITLIST(lazy_list[key]); \
+ lazy_list[key] |= value;
+
/// Passed into BINARY_INSERT to compare keys
#define COMPARE_KEY __BIN_LIST[__BIN_MID]
/// Passed into BINARY_INSERT to compare values
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index 91bd163d9c..4252e1558b 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -478,6 +478,18 @@ GLOBAL_LIST_EMPTY(species_datums)
if(!HAS_TRAIT(L, TRAIT_PASSTABLE))
L.pass_flags &= ~PASSTABLE
+/proc/dance_rotate(atom/movable/AM, datum/callback/callperrotate, set_original_dir=FALSE)
+ set waitfor = FALSE
+ var/originaldir = AM.dir
+ for(var/i in list(NORTH,SOUTH,EAST,WEST,EAST,SOUTH,NORTH,SOUTH,EAST,WEST,EAST,SOUTH))
+ if(!AM)
+ return
+ AM.setDir(i)
+ callperrotate?.Invoke()
+ sleep(1)
+ if(set_original_dir)
+ AM.setDir(originaldir)
+
/// Gets the client of the mob, allowing for mocking of the client.
/// You only need to use this if you know you're going to be mocking clients somewhere else.
#define GET_CLIENT(mob) (##mob.client || ##mob.mock_client)
diff --git a/code/datums/elements/mob_holder.dm b/code/datums/elements/mob_holder.dm
index 6057eaee6b..6c613db660 100644
--- a/code/datums/elements/mob_holder.dm
+++ b/code/datums/elements/mob_holder.dm
@@ -168,7 +168,7 @@
L.visible_message("[held_mob] escapes from [L]!", "[held_mob] escapes your grip!")
release()
-/obj/item/clothing/head/mob_holder/mob_can_equip(mob/living/M, mob/living/equipper, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE)
+/obj/item/clothing/head/mob_holder/mob_can_equip(M, equipper, slot, disable_warning, bypass_equip_delay_self)
if(M == held_mob || !ishuman(M)) //monkeys holding monkeys holding monkeys...
return FALSE
return ..()
diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm
new file mode 100644
index 0000000000..e67120f254
--- /dev/null
+++ b/code/datums/elements/strippable.dm
@@ -0,0 +1,517 @@
+/// An element for atoms that, when dragged and dropped onto a mob, opens a strip panel.
+/datum/element/strippable
+ element_flags = ELEMENT_BESPOKE | ELEMENT_DETACH
+ id_arg_index = 2
+
+ /// An assoc list of keys to /datum/strippable_item
+ var/list/items
+
+ /// A proc path that returns TRUE/FALSE if we should show the strip panel for this entity.
+ /// If it does not exist, the strip menu will always show.
+ /// Will be called with (mob/user).
+ var/should_strip_proc_path
+
+ /// An existing strip menus
+ var/list/strip_menus
+
+/datum/element/strippable/Attach(datum/target, list/items, should_strip_proc_path)
+ . = ..()
+ if (!isatom(target))
+ return ELEMENT_INCOMPATIBLE
+
+ RegisterSignal(target, COMSIG_MOUSEDROP_ONTO, .proc/mouse_drop_onto)
+
+ src.items = items
+ src.should_strip_proc_path = should_strip_proc_path
+
+/datum/element/strippable/Detach(datum/source)
+ . = ..()
+
+ UnregisterSignal(source, COMSIG_MOUSEDROP_ONTO)
+
+ if (!isnull(strip_menus))
+ qdel(strip_menus[source])
+ strip_menus -= source
+
+/datum/element/strippable/proc/mouse_drop_onto(datum/source, atom/over, mob/user)
+ SIGNAL_HANDLER
+
+ if (user == source)
+ return
+
+ if (over != user)
+ return
+
+ // Cyborgs buckle people by dragging them onto them, unless in combat mode.
+ if (iscyborg(user))
+ var/mob/living/silicon/robot/cyborg_user = user
+ if (cyborg_user.a_intent == INTENT_HARM)
+ return
+
+ if (!isnull(should_strip_proc_path) && !call(source, should_strip_proc_path)(user))
+ return
+
+ var/datum/strip_menu/strip_menu
+
+ if (isnull(strip_menu))
+ strip_menu = new(source, src)
+ LAZYSET(strip_menus, source, strip_menu)
+
+ INVOKE_ASYNC(strip_menu, /datum/.proc/ui_interact, user)
+
+/// A representation of an item that can be stripped down
+/datum/strippable_item
+ /// The STRIPPABLE_ITEM_* key
+ var/key
+
+ /// Should we warn about dangerous clothing?
+ var/warn_dangerous_clothing = TRUE
+
+/// Gets the item from the given source.
+/datum/strippable_item/proc/get_item(atom/source)
+
+/// Tries to equip the item onto the given source.
+/// Returns TRUE/FALSE depending on if it is allowed.
+/// This should be used for checking if an item CAN be equipped.
+/// It should not perform the equipping itself.
+/datum/strippable_item/proc/try_equip(atom/source, obj/item/equipping, mob/user)
+ if (HAS_TRAIT(equipping, TRAIT_NODROP))
+ to_chat(user, span_warning("You can't put [equipping] on [source], it's stuck to your hand!"))
+ return FALSE
+
+ return TRUE
+
+/// Start the equipping process. This is the proc you should yield in.
+/// Returns TRUE/FALSE depending on if it is allowed.
+/datum/strippable_item/proc/start_equip(atom/source, obj/item/equipping, mob/user)
+ if (warn_dangerous_clothing && isclothing(source))
+ source.visible_message(
+ span_notice("[user] tries to put [equipping] on [source]."),
+ span_notice("[user] tries to put [equipping] on you."),
+ ignored_mobs = user,
+ )
+
+ if(ishuman(source))
+ var/mob/living/carbon/human/victim_human = source
+ if(victim_human.key && !victim_human.client) // AKA braindead
+ if(victim_human.stat <= SOFT_CRIT && LAZYLEN(victim_human.afk_thefts) <= AFK_THEFT_MAX_MESSAGES)
+ var/list/new_entry = list(list(user.name, "tried equipping you with [equipping]", world.time))
+ LAZYADD(victim_human.afk_thefts, new_entry)
+
+ to_chat(user, span_notice("You try to put [equipping] on [source]..."))
+
+ var/log = "[key_name(source)] is having [equipping] put on them by [key_name(user)]"
+ user.log_message(log, LOG_ATTACK, color="red")
+ source.log_message(log, LOG_VICTIM, color="red", log_globally=FALSE)
+
+ return TRUE
+
+/// The proc that places the item on the source. This should not yield.
+/datum/strippable_item/proc/finish_equip(atom/source, obj/item/equipping, mob/user)
+ SHOULD_NOT_SLEEP(TRUE)
+ return TRUE
+
+/// Tries to unequip the item from the given source.
+/// Returns TRUE/FALSE depending on if it is allowed.
+/// This should be used for checking if it CAN be unequipped.
+/// It should not perform the unequipping itself.
+/datum/strippable_item/proc/try_unequip(atom/source, mob/user)
+ SHOULD_NOT_SLEEP(TRUE)
+
+ var/obj/item/item = get_item(source)
+ if (isnull(item))
+ return FALSE
+
+ if (ismob(source))
+ var/mob/mob_source = source
+ if (!item.canStrip(user, mob_source))
+ return FALSE
+
+ return TRUE
+
+/// Start the unequipping process. This is the proc you should yield in.
+/// Returns TRUE/FALSE depending on if it is allowed.
+/datum/strippable_item/proc/start_unequip(atom/source, mob/user)
+ var/obj/item/item = get_item(source)
+ if (isnull(item))
+ return FALSE
+
+ source.visible_message(
+ span_warning("[user] tries to remove [source]'s [item.name]."),
+ span_userdanger("[user] tries to remove your [item.name]."),
+ ignored_mobs = user,
+ )
+
+ to_chat(user, span_danger("You try to remove [source]'s [item]..."))
+ user.log_message("[key_name(source)] is being stripped of [item] by [key_name(user)]", LOG_ATTACK, color="red")
+ source.log_message("[key_name(source)] is being stripped of [item] by [key_name(user)]", LOG_VICTIM, color="red", log_globally=FALSE)
+ item.add_fingerprint(source)
+
+ if(ishuman(source))
+ var/mob/living/carbon/human/victim_human = source
+ if(victim_human.key && !victim_human.client) // AKA braindead
+ if(victim_human.stat <= SOFT_CRIT && LAZYLEN(victim_human.afk_thefts) <= AFK_THEFT_MAX_MESSAGES)
+ var/list/new_entry = list(list(user.name, "tried unequipping your [item.name]", world.time))
+ LAZYADD(victim_human.afk_thefts, new_entry)
+
+ return TRUE
+
+/// The proc that unequips the item from the source. This should not yield.
+/datum/strippable_item/proc/finish_unequip(atom/source, mob/user)
+
+/// Returns a STRIPPABLE_OBSCURING_* define to report on whether or not this is obscured.
+/datum/strippable_item/proc/get_obscuring(atom/source)
+ SHOULD_NOT_SLEEP(TRUE)
+ return STRIPPABLE_OBSCURING_NONE
+
+/// Returns the ID of this item's strippable action.
+/// Return `null` if there is no alternate action.
+/// Any return value of this must be in StripMenu.
+/datum/strippable_item/proc/get_alternate_action(atom/source, mob/user)
+ if(get_obscuring(source) == STRIPPABLE_OBSCURING_COMPLETELY)
+ return FALSE
+ return null
+
+/// Performs an alternative action on this strippable_item.
+/// `has_alternate_action` needs to be TRUE.
+/datum/strippable_item/proc/alternate_action(atom/source, mob/user)
+ if(get_obscuring(source) == STRIPPABLE_OBSCURING_COMPLETELY)
+ return null
+ return TRUE
+
+/// Returns whether or not this item should show.
+/datum/strippable_item/proc/should_show(atom/source, mob/user)
+ return TRUE
+
+/// A preset for equipping items onto mob slots
+/datum/strippable_item/mob_item_slot
+ /// The ITEM_SLOT_* to equip to.
+ var/item_slot
+
+/datum/strippable_item/mob_item_slot/get_item(atom/source)
+ if (!ismob(source))
+ return null
+
+ var/mob/mob_source = source
+ return mob_source.get_item_by_slot(item_slot)
+
+/datum/strippable_item/mob_item_slot/try_equip(atom/source, obj/item/equipping, mob/user)
+ . = ..()
+ if (!.)
+ return
+
+ if (!ismob(source))
+ return FALSE
+
+ if (!equipping.mob_can_equip(
+ source,
+ user,
+ item_slot,
+ disable_warning = TRUE,
+ bypass_equip_delay_self = TRUE,
+ ))
+ to_chat(user, span_warning("\The [equipping] doesn't fit in that place!"))
+ return FALSE
+
+ return TRUE
+
+/datum/strippable_item/mob_item_slot/start_equip(atom/source, obj/item/equipping, mob/user)
+ . = ..()
+ if (!.)
+ return
+
+ if (!ismob(source))
+ return FALSE
+
+ if (!do_mob(user, source, get_equip_delay(equipping)))
+ return FALSE
+
+ if(get_obscuring(source) == STRIPPABLE_OBSCURING_COMPLETELY)
+ return FALSE
+
+ if (!equipping.mob_can_equip(
+ source,
+ user,
+ item_slot,
+ disable_warning = TRUE,
+ bypass_equip_delay_self = TRUE,
+ ))
+ return FALSE
+
+ if (!user.temporarilyRemoveItemFromInventory(equipping))
+ return FALSE
+
+ return TRUE
+
+/datum/strippable_item/mob_item_slot/finish_equip(atom/source, obj/item/equipping, mob/user)
+ if(!..())
+ return FALSE
+ if (!ismob(source))
+ return FALSE
+
+ var/mob/mob_source = source
+ mob_source.equip_to_slot(equipping, item_slot)
+
+/datum/strippable_item/mob_item_slot/get_obscuring(atom/source)
+ if (iscarbon(source))
+ var/mob/living/carbon/carbon_source = source
+ return (item_slot in carbon_source.check_obscured_slots()) \
+ ? STRIPPABLE_OBSCURING_COMPLETELY \
+ : STRIPPABLE_OBSCURING_NONE
+
+ return FALSE
+
+/datum/strippable_item/mob_item_slot/start_unequip(atom/source, mob/user)
+ . = ..()
+ if (!.)
+ return
+
+ return start_unequip_mob(get_item(source), source, user)
+
+/datum/strippable_item/mob_item_slot/finish_unequip(atom/source, mob/user)
+ var/obj/item/item = get_item(source)
+ if (isnull(item))
+ return FALSE
+
+ if (!ismob(source))
+ return FALSE
+
+ return finish_unequip_mob(item, source, user)
+
+/// Returns the delay of equipping this item to a mob
+/datum/strippable_item/mob_item_slot/proc/get_equip_delay(obj/item/equipping)
+ return equipping.equip_delay_other
+
+/// A utility function for `/datum/strippable_item`s to start unequipping an item from a mob.
+/proc/start_unequip_mob(obj/item/item, mob/source, mob/user, strip_delay)
+ if (!do_mob(user, source, strip_delay || item.strip_delay, ignorehelditem = TRUE))
+ return FALSE
+
+ return TRUE
+
+/// A utility function for `/datum/strippable_item`s to finish unequipping an item from a mob.
+/proc/finish_unequip_mob(obj/item/item, mob/source, mob/user)
+ if (!item.doStrip(user, source))
+ return FALSE
+
+ user.log_message("[key_name(source)] has been stripped of [item] by [key_name(user)]", LOG_ATTACK, color="red")
+ source.log_message("[key_name(source)] has been stripped of [item] by [key_name(user)]", LOG_VICTIM, color="red", log_globally=FALSE)
+
+ // Updates speed in case stripped speed affecting item
+ source.update_equipment_speed_mods()
+
+/// A representation of the stripping UI
+/datum/strip_menu
+ /// The owner who has the element /datum/element/strippable
+ var/atom/movable/owner
+
+ /// The strippable element itself
+ var/datum/element/strippable/strippable
+
+ /// A lazy list of user mobs to a list of strip menu keys that they're interacting with
+ var/list/interactions
+
+/datum/strip_menu/New(atom/movable/owner, datum/element/strippable/strippable)
+ . = ..()
+ src.owner = owner
+ src.strippable = strippable
+
+/datum/strip_menu/Destroy()
+ owner = null
+ strippable = null
+
+ return ..()
+
+/datum/strip_menu/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if (!ui)
+ ui = new(user, src, "StripMenu")
+ ui.open()
+
+/datum/strip_menu/ui_assets(mob/user)
+ return list(
+ get_asset_datum(/datum/asset/simple/inventory),
+ )
+
+/datum/strip_menu/ui_data(mob/user)
+ var/list/data = list()
+
+ var/list/items = list()
+
+ for (var/strippable_key in strippable.items)
+ var/datum/strippable_item/item_data = strippable.items[strippable_key]
+
+ if (!item_data.should_show(owner, user))
+ continue
+
+ var/list/result
+
+ if(strippable_key in LAZYACCESS(interactions, user))
+ LAZYSET(result, "interacting", TRUE)
+
+ var/obscuring = item_data.get_obscuring(owner)
+ if (obscuring != STRIPPABLE_OBSCURING_NONE)
+ LAZYSET(result, "obscured", obscuring)
+ items[strippable_key] = result
+ continue
+
+ var/obj/item/item = item_data.get_item(owner)
+ if (isnull(item))
+ items[strippable_key] = result
+ continue
+
+ LAZYINITLIST(result)
+
+ result["icon"] = icon2base64(icon(item.icon, item.icon_state, SOUTH, 1))
+ result["name"] = item.name
+ result["alternate"] = item_data.get_alternate_action(owner, user)
+
+ items[strippable_key] = result
+
+ data["items"] = items
+
+ // While most `\the`s are implicit, this one is not.
+ // In this case, `\The` would otherwise be used.
+ // This doesn't match with what it's used for, which is to say "Stripping the alien drone",
+ // as opposed to "Stripping The alien drone".
+ // Human names will still show without "the", as they are proper nouns.
+ data["name"] = "\the [owner]"
+
+ /// Customize the strip menu
+ data["long_strip_menu"] = user.client.prefs.long_strip_menu
+
+ return data
+
+/datum/strip_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ . = ..()
+ if (.)
+ return
+
+ . = TRUE
+
+ var/mob/user = usr
+
+ switch (action)
+ if ("use")
+ var/key = params["key"]
+ var/datum/strippable_item/strippable_item = strippable.items[key]
+
+ if (isnull(strippable_item))
+ return
+
+ if (!strippable_item.should_show(owner, user))
+ return
+
+ if (strippable_item.get_obscuring(owner) == STRIPPABLE_OBSCURING_COMPLETELY)
+ return
+
+ var/item = strippable_item.get_item(owner)
+ if (isnull(item))
+ var/obj/item/held_item = user.get_active_held_item()
+ if (isnull(held_item))
+ return
+
+ if (strippable_item.try_equip(owner, held_item, user))
+ LAZYORASSOCLIST(interactions, user, key)
+
+ // Yielding call
+ var/should_finish = strippable_item.start_equip(owner, held_item, user)
+
+ LAZYREMOVEASSOC(interactions, user, key)
+
+ if (!should_finish)
+ return
+
+ if (QDELETED(src) || QDELETED(owner))
+ return
+
+ // They equipped an item in the meantime
+ if (!isnull(strippable_item.get_item(owner)))
+ return
+
+ if (!user.Adjacent(owner))
+ return
+
+ strippable_item.finish_equip(owner, held_item, user)
+ else if (strippable_item.try_unequip(owner, user))
+ LAZYORASSOCLIST(interactions, user, key)
+
+ var/should_unequip = strippable_item.start_unequip(owner, user)
+
+ LAZYREMOVEASSOC(interactions, user, key)
+
+ // Yielding call
+ if (!should_unequip)
+ return
+
+ if (QDELETED(src) || QDELETED(owner))
+ return
+
+ // They changed the item in the meantime
+ if (strippable_item.get_item(owner) != item)
+ return
+
+ if (!user.Adjacent(owner))
+ return
+
+ strippable_item.finish_unequip(owner, user)
+ if ("alt")
+ var/key = params["key"]
+ var/datum/strippable_item/strippable_item = strippable.items[key]
+
+ if (isnull(strippable_item))
+ return
+
+ if (!strippable_item.should_show(owner, user))
+ return
+
+ if (strippable_item.get_obscuring(owner) == STRIPPABLE_OBSCURING_COMPLETELY)
+ return
+
+ var/item = strippable_item.get_item(owner)
+ if (isnull(item))
+ return
+
+ if (isnull(strippable_item.get_alternate_action(owner, user)))
+ return
+
+ LAZYORASSOCLIST(interactions, user, key)
+
+ // Potentially yielding
+ strippable_item.alternate_action(owner, user)
+
+ LAZYREMOVEASSOC(interactions, user, key)
+
+/datum/strip_menu/ui_host(mob/user)
+ return owner
+
+/datum/strip_menu/ui_state(mob/user)
+ return GLOB.always_state
+
+/datum/strip_menu/ui_status(mob/user, datum/ui_state/state)
+ . = ..()
+
+ if(isliving(user))
+ var/mob/living/living_user = user
+
+ if (
+ living_user.stat == CONSCIOUS \
+ && living_user.Adjacent(owner)
+ )
+ return UI_INTERACTIVE
+ if(IsAdminGhost(user))
+ return UI_INTERACTIVE
+ if(user.Adjacent(owner))
+ return UI_UPDATE
+ else
+ return UI_DISABLED
+
+/// Creates an assoc list of keys to /datum/strippable_item
+/proc/create_strippable_list(types)
+ var/list/strippable_items = list()
+
+ for (var/strippable_type in types)
+ var/datum/strippable_item/strippable_item = new strippable_type
+ strippable_items[strippable_item.key] = strippable_item
+
+ return strippable_items
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 916c641c95..0dbfcd257c 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -1083,6 +1083,19 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
. = ..()
if(var_name == NAMEOF(src, slowdown))
set_slowdown(var_value) //don't care if it's a duplicate edit as slowdown'll be set, do it anyways to force normal behavior.
+
+/obj/item/proc/canStrip(mob/stripper, mob/owner)
+ SHOULD_BE_PURE(TRUE)
+ return !HAS_TRAIT(src, TRAIT_NODROP) && !(item_flags & ABSTRACT)
+
+/obj/item/proc/doStrip(mob/stripper, mob/owner)
+ if(owner.dropItemToGround(src))
+ if(stripper.can_hold_items())
+ stripper.put_in_hands(src)
+ return TRUE
+ else
+ return FALSE
+
/**
* Does the current embedding var meet the criteria for being harmless? Namely, does it explicitly define the pain multiplier and jostle pain mult to be 0? If so, return true.
*
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 6de09539bf..8c6b654c38 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -397,7 +397,7 @@
data["owner_name"] = payments_acc.account_holder
if(showpiece)
data["product_name"] = capitalize(showpiece.name)
- var/base64 = icon2base64(icon(showpiece.icon, showpiece.icon_state))
+ var/base64 = icon2base64(icon(showpiece.icon, showpiece.icon_state, SOUTH, 1))
data["product_icon"] = base64
data["registered"] = register
data["product_cost"] = sale_price
diff --git a/code/game/turfs/simulated/floor/plating/dirt.dm b/code/game/turfs/simulated/floor/plating/dirt.dm
index b9bcc0937b..f7f4633254 100644
--- a/code/game/turfs/simulated/floor/plating/dirt.dm
+++ b/code/game/turfs/simulated/floor/plating/dirt.dm
@@ -19,3 +19,11 @@
/turf/open/floor/plating/dirt/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
return
+
+/turf/open/floor/plating/dirt/space
+ baseturfs = /turf/baseturf_bottom
+ planetary_atmos = FALSE
+ desc = "Upon closer examination there's plating beneath the dirt."
+
+/turf/open/floor/plating/dirt/space/airless
+ initial_gas_mix = AIRLESS_ATMOS
diff --git a/code/modules/admin/outfit_editor.dm b/code/modules/admin/outfit_editor.dm
index c4a29c6112..e3065ef359 100644
--- a/code/modules/admin/outfit_editor.dm
+++ b/code/modules/admin/outfit_editor.dm
@@ -55,7 +55,7 @@
"name" = initial(item.name),
"desc" = initial(item.desc),
// at this point initializing the item is probably faster tbh
- "sprite" = icon2base64(icon(initial(item.icon), initial(item.icon_state))),
+ "sprite" = icon2base64(icon(initial(item.icon), initial(item.icon_state), SOUTH, 1)),
)
return data
diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm
index d08caa39d7..ad507adcec 100644
--- a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm
+++ b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm
@@ -53,7 +53,7 @@
user.adjustOrganLoss(ORGAN_SLOT_BRAIN, 30)
addtimer(CALLBACK(user, /mob/living.proc/dropItemToGround, src, TRUE), 1) //equipped happens before putting stuff on(but not before picking items up), 1). thus, we need to wait for it to be on before forcing it off.
-/obj/item/clothing/head/helmet/clockwork/mob_can_equip(mob/M, mob/equipper, slot, disable_warning = 0)
+/obj/item/clothing/head/helmet/clockwork/mob_can_equip(M, equipper, slot, disable_warning, bypass_equip_delay_self)
if(equipper && !is_servant_of_ratvar(equipper))
return 0
return ..()
@@ -98,7 +98,7 @@
max_heat_protection_temperature = initial(max_heat_protection_temperature)
min_cold_protection_temperature = initial(min_cold_protection_temperature)
-/obj/item/clothing/suit/armor/clockwork/mob_can_equip(mob/M, mob/equipper, slot, disable_warning = 0)
+/obj/item/clothing/suit/armor/clockwork/mob_can_equip(M, equipper, slot, disable_warning, bypass_equip_delay_self)
if(equipper && !is_servant_of_ratvar(equipper))
return 0
return ..()
@@ -158,7 +158,7 @@
max_heat_protection_temperature = initial(max_heat_protection_temperature)
min_cold_protection_temperature = initial(min_cold_protection_temperature)
-/obj/item/clothing/gloves/clockwork/mob_can_equip(mob/M, mob/equipper, slot, disable_warning = 0)
+/obj/item/clothing/gloves/clockwork/mob_can_equip(M, equipper, slot, disable_warning, bypass_equip_delay_self)
if(equipper && !is_servant_of_ratvar(equipper))
return 0
return ..()
@@ -208,7 +208,7 @@
else
clothing_flags &= ~NOSLIP
-/obj/item/clothing/shoes/clockwork/mob_can_equip(mob/M, mob/equipper, slot, disable_warning = 0)
+/obj/item/clothing/shoes/clockwork/mob_can_equip(M, equipper, slot, disable_warning, bypass_equip_delay_self)
if(equipper && !is_servant_of_ratvar(equipper))
return 0
return ..()
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index 2d680fe212..04725695a7 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -543,6 +543,34 @@
// Insert(id, fish_icon, fish_icon_state)
// ..()
+/datum/asset/simple/inventory
+ assets = list(
+ "inventory-glasses.png" = 'icons/UI_Icons/inventory/glasses.png',
+ "inventory-head.png" = 'icons/UI_Icons/inventory/head.png',
+ "inventory-neck.png" = 'icons/UI_Icons/inventory/neck.png',
+ "inventory-mask.png" = 'icons/UI_Icons/inventory/mask.png',
+ "inventory-ears.png" = 'icons/UI_Icons/inventory/ears.png',
+ "inventory-uniform.png" = 'icons/UI_Icons/inventory/uniform.png',
+ "inventory-suit.png" = 'icons/UI_Icons/inventory/suit.png',
+ "inventory-gloves.png" = 'icons/UI_Icons/inventory/gloves.png',
+ "inventory-hand_l.png" = 'icons/UI_Icons/inventory/hand_l.png',
+ "inventory-hand_r.png" = 'icons/UI_Icons/inventory/hand_r.png',
+ "inventory-shoes.png" = 'icons/UI_Icons/inventory/shoes.png',
+ "inventory-suit_storage.png" = 'icons/UI_Icons/inventory/suit_storage.png',
+ "inventory-id.png" = 'icons/UI_Icons/inventory/id.png',
+ "inventory-belt.png" = 'icons/UI_Icons/inventory/belt.png',
+ "inventory-back.png" = 'icons/UI_Icons/inventory/back.png',
+ "inventory-pocket.png" = 'icons/UI_Icons/inventory/pocket.png',
+ "inventory-collar.png" = 'icons/UI_Icons/inventory/collar.png',
+
+ ///Sandstorm content
+ "inventory-ears_extra.png" = 'modular_sand/icons/UI_Icons/inventory/ears_extra.png',
+ "inventory-underwear.png" = 'modular_sand/icons/UI_Icons/inventory/underwear.png',
+ "inventory-socks.png" = 'modular_sand/icons/UI_Icons/inventory/socks.png',
+ "inventory-undershirt.png" = 'modular_sand/icons/UI_Icons/inventory/undershirt.png',
+ "inventory-wrists.png" = 'modular_sand/icons/UI_Icons/inventory/wrists.png',
+ )
+
/// Removes all non-alphanumerics from the text, keep in mind this can lead to id conflicts
/proc/sanitize_css_class_name(name)
var/static/regex/regex = new(@"[^a-zA-Z0-9]","g")
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index f1d7a49d03..c809156ed7 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -263,6 +263,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/auto_fit_viewport = FALSE
///Should we be in the widescreen mode set by the config?
var/widescreenpref = TRUE
+ ///Strip menu style
+ var/long_strip_menu = FALSE
///What size should pixels be displayed as? 0 is strech to fit
var/pixel_size = 0
///What scaling method should we use?
@@ -1036,6 +1038,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "Citadel Preferences
" //Because fuck me if preferences can't be fucking modularized and expected to update in a reasonable timeframe.
dat += "Widescreen: [widescreenpref ? "Enabled ([CONFIG_GET(string/default_view)])" : "Disabled (15x15)"]
"
+ dat += "Long strip menu: [long_strip_menu ? "Enabled" : "Disabled"]
"
dat += "Auto stand: [autostand ? "Enabled" : "Disabled"]
"
dat += "Auto OOC: [auto_ooc ? "Enabled" : "Disabled"]
"
dat += "Force Slot Storage HUD: [no_tetris_storage ? "Enabled" : "Disabled"]
"
@@ -2934,6 +2937,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if("widescreenpref")
widescreenpref = !widescreenpref
user.client.view_size.setDefault(getScreenSize(widescreenpref))
+ if("long_strip_menu")
+ long_strip_menu = !long_strip_menu
if("pixel_size")
switch(pixel_size)
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index ae23e6d8a6..5e5de5ff63 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -414,6 +414,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["ambientocclusion"] >> ambientocclusion
S["auto_fit_viewport"] >> auto_fit_viewport
S["widescreenpref"] >> widescreenpref
+ S["long_strip_menu"] >> long_strip_menu
S["pixel_size"] >> pixel_size
S["scaling_method"] >> scaling_method
S["hud_toggle_flash"] >> hud_toggle_flash
@@ -476,6 +477,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
ambientocclusion = sanitize_integer(ambientocclusion, 0, 1, initial(ambientocclusion))
auto_fit_viewport = sanitize_integer(auto_fit_viewport, 0, 1, initial(auto_fit_viewport))
widescreenpref = sanitize_integer(widescreenpref, 0, 1, initial(widescreenpref))
+ long_strip_menu = sanitize_integer(long_strip_menu, 0, 1, initial(long_strip_menu))
pixel_size = sanitize_integer(pixel_size, PIXEL_SCALING_AUTO, PIXEL_SCALING_3X, initial(pixel_size))
scaling_method = sanitize_text(scaling_method, initial(scaling_method))
hud_toggle_flash = sanitize_integer(hud_toggle_flash, 0, 1, initial(hud_toggle_flash))
@@ -612,6 +614,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["damagescreenshake"], damagescreenshake)
WRITE_FILE(S["arousable"], arousable)
WRITE_FILE(S["widescreenpref"], widescreenpref)
+ WRITE_FILE(S["long_strip_menu"], long_strip_menu)
WRITE_FILE(S["autostand"], autostand)
WRITE_FILE(S["cit_toggles"], cit_toggles)
WRITE_FILE(S["preferred_chaos"], preferred_chaos)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 3beeef91d3..1a7c220550 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -443,7 +443,7 @@ BLIND // can't see anything
..()
//Species-restricted clothing check. - Thanks Oraclestation, BS13, /vg/station etc.
-/obj/item/clothing/mob_can_equip(mob/M, slot, disable_warning = TRUE)
+/obj/item/clothing/mob_can_equip(M, equipper, slot, disable_warning = TRUE, bypass_equip_delay_self)
//if we can't equip the item anyway, don't bother with species_restricted (also cuts down on spam)
if(!..())
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index cd48a81350..33204f377b 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -633,7 +633,7 @@
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/clown
mutantrace_variation = STYLE_DIGITIGRADE
-/obj/item/clothing/suit/space/hardsuit/clown/mob_can_equip(mob/M, slot)
+/obj/item/clothing/suit/space/hardsuit/clown/mob_can_equip(mob/M, equipper, slot, disable_warning, bypass_equip_delay_self)
if(!..() || !ishuman(M))
return FALSE
if(M.mind && HAS_TRAIT(M.mind, TRAIT_CLOWN_MENTALITY))
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index 0d2a1c0c59..343b95f05d 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -6,8 +6,6 @@
possible_a_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM)
limb_destroyer = 1
hud_type = /datum/hud/alien
- var/obj/item/r_store = null
- var/obj/item/l_store = null
var/caste = ""
var/alt_icon = 'icons/mob/alienleap.dmi' //used to switch between the two alien icon files.
var/leap_on_click = 0
@@ -22,41 +20,26 @@
can_ventcrawl = TRUE
+GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list(
+ /datum/strippable_item/hand/left,
+ /datum/strippable_item/hand/right,
+ /datum/strippable_item/mob_item_slot/handcuffs,
+ /datum/strippable_item/mob_item_slot/legcuffs,
+)))
//This is fine right now, if we're adding organ specific damage this needs to be updated
/mob/living/carbon/alien/humanoid/Initialize()
AddAbility(new/obj/effect/proc_holder/alien/regurgitate(null))
. = ..()
+
+/mob/living/carbon/alien/humanoid/ComponentInitialize()
+ . = ..()
AddComponent(/datum/component/footstep, FOOTSTEP_MOB_CLAW, 0.5, -3)
+ AddElement(/datum/element/strippable, GLOB.strippable_alien_humanoid_items)
/mob/living/carbon/alien/humanoid/restrained(ignore_grab)
return handcuffed
-/mob/living/carbon/alien/humanoid/show_inv(mob/user)
- user.set_machine(src)
- var/list/dat = list()
- dat += {"
-
- [name]
-
"}
- for(var/i in 1 to held_items.len)
- var/obj/item/I = get_item_for_held_index(i)
- dat += "
[get_held_index_name(i)]:[(I && !(I.item_flags & ABSTRACT)) ? I : "Empty"]"
- dat += "
Empty Pouches"
-
- if(handcuffed)
- dat += "
Handcuffed"
- if(legcuffed)
- dat += "
Legcuffed"
-
- dat += {"
-
-
Close
- "}
- user << browse(dat.Join(), "window=mob[REF(src)];size=325x500")
- onclose(user, "mob[REF(src)]")
-
-
/mob/living/carbon/alien/humanoid/Topic(href, href_list)
..()
//strip panel & embeds
@@ -70,12 +53,6 @@
return
SEND_SIGNAL(src, COMSIG_CARBON_EMBED_RIP, I, L)
return
- if(href_list["pouches"])
- visible_message("[usr] tries to empty [src]'s pouches.", \
- "[usr] tries to empty [src]'s pouches.")
- if(do_mob(usr, src, POCKET_STRIP_DELAY * 0.5))
- dropItemToGround(r_store)
- dropItemToGround(l_store)
/mob/living/carbon/alien/humanoid/cuff_resist(obj/item/I)
playsound(src, 'sound/voice/hiss5.ogg', 40, 1, 1) //Alien roars when starting to break free
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index 77c9a8c579..7a610ac421 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -51,10 +51,6 @@
// new damage icon system
// now constructs damage icon for each organ from mask * damage field
-
-/mob/living/carbon/alien/larva/show_inv(mob/user)
- return
-
/mob/living/carbon/alien/larva/toggle_throw_mode()
return
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index a22fadfbaf..913bd9a926 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -230,61 +230,8 @@
/mob/living/carbon/proc/canBeHandcuffed()
return 0
-
-/mob/living/carbon/show_inv(mob/user)
- user.set_machine(src)
- var/dat = {"
-
- [name]
-
-
Head: [(head && !(head.item_flags & ABSTRACT)) ? head : "Nothing"]
-
Mask: [(wear_mask && !(wear_mask.item_flags & ABSTRACT)) ? wear_mask : "Nothing"]
-
Neck: [(wear_neck && !(wear_neck.item_flags & ABSTRACT)) ? wear_neck : "Nothing"]"}
-
- for(var/i in 1 to held_items.len)
- var/obj/item/I = get_item_for_held_index(i)
- dat += "
[get_held_index_name(i)]:[(I && !(I.item_flags & ABSTRACT)) ? I : "Nothing"]"
-
- dat += "
Back: [back ? back : "Nothing"]"
-
- if(!HAS_TRAIT(src, TRAIT_NO_INTERNALS) && istype(wear_mask, /obj/item/clothing/mask) && istype(back, /obj/item/tank))
- dat += "
[internal ? "Disable Internals" : "Set Internals"]"
-
- if(handcuffed)
- dat += "
Handcuffed"
- if(legcuffed)
- dat += "
Legcuffed"
-
- dat += {"
-
-
Close
- "}
- user << browse(dat, "window=mob[REF(src)];size=325x500")
- onclose(user, "mob[REF(src)]")
-
/mob/living/carbon/Topic(href, href_list)
..()
- //strip panel
- if(usr.canUseTopic(src, BE_CLOSE))
- if(href_list["internal"] && !HAS_TRAIT(src, TRAIT_NO_INTERNALS))
- var/slot = text2num(href_list["internal"])
- var/obj/item/ITEM = get_item_by_slot(slot)
- if(ITEM && istype(ITEM, /obj/item/tank) && wear_mask && (wear_mask.clothing_flags & ALLOWINTERNALS))
- visible_message("[usr] tries to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name].", \
- "[usr] tries to [internal ? "close" : "open"] the valve on your [ITEM.name].", \
- target = usr, target_message = "You try to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name].")
- if(do_mob(usr, src, POCKET_STRIP_DELAY))
- if(internal)
- internal = null
- update_internals_hud_icon(0)
- else if(ITEM && istype(ITEM, /obj/item/tank))
- if((wear_mask && (wear_mask.clothing_flags & ALLOWINTERNALS)) || getorganslot(ORGAN_SLOT_BREATHING_TUBE))
- internal = ITEM
- update_internals_hud_icon(1)
-
- visible_message("[usr] [internal ? "opens" : "closes"] the valve on [src]'s [ITEM.name].", \
- "[usr] [internal ? "opens" : "closes"] the valve on your [ITEM.name].", \
- target = usr, target_message = "You [internal ? "opens" : "closes"] the valve on [src]'s [ITEM.name].")
if(href_list["embedded_object"] && usr.canUseTopic(src, BE_CLOSE))
var/obj/item/bodypart/L = locate(href_list["embedded_limb"]) in bodyparts
if(!L)
diff --git a/code/modules/mob/living/carbon/carbon_stripping.dm b/code/modules/mob/living/carbon/carbon_stripping.dm
new file mode 100644
index 0000000000..9e005e2210
--- /dev/null
+++ b/code/modules/mob/living/carbon/carbon_stripping.dm
@@ -0,0 +1,135 @@
+/datum/strippable_item/mob_item_slot/head
+ key = STRIPPABLE_ITEM_HEAD
+ item_slot = SLOT_HEAD
+
+/datum/strippable_item/mob_item_slot/back
+ key = STRIPPABLE_ITEM_BACK
+ item_slot = SLOT_BACK
+
+/datum/strippable_item/mob_item_slot/mask
+ key = STRIPPABLE_ITEM_MASK
+ item_slot = SLOT_WEAR_MASK
+
+/datum/strippable_item/mob_item_slot/neck
+ key = STRIPPABLE_ITEM_NECK
+ item_slot = SLOT_NECK
+
+/datum/strippable_item/mob_item_slot/handcuffs
+ key = STRIPPABLE_ITEM_HANDCUFFS
+ item_slot = SLOT_HANDCUFFED
+
+/datum/strippable_item/mob_item_slot/handcuffs/should_show(atom/source, mob/user)
+ if (!iscarbon(source))
+ return FALSE
+
+ var/mob/living/carbon/carbon_source = source
+ return !isnull(carbon_source.handcuffed)
+
+// You shouldn't be able to equip things to handcuff slots.
+/datum/strippable_item/mob_item_slot/handcuffs/try_equip(atom/source, obj/item/equipping, mob/user)
+ return FALSE
+
+/datum/strippable_item/mob_item_slot/legcuffs
+ key = STRIPPABLE_ITEM_LEGCUFFS
+ item_slot = SLOT_LEGCUFFED
+
+/datum/strippable_item/mob_item_slot/legcuffs/should_show(atom/source, mob/user)
+ if (!iscarbon(source))
+ return FALSE
+
+ var/mob/living/carbon/carbon_source = source
+ return !isnull(carbon_source.legcuffed)
+
+// You shouldn't be able to equip things to legcuff slots.
+/datum/strippable_item/mob_item_slot/legcuffs/try_equip(atom/source, obj/item/equipping, mob/user)
+ return FALSE
+
+/// A strippable item for a hand
+/datum/strippable_item/hand
+ // Putting dangerous clothing in our hand is fine.
+ warn_dangerous_clothing = FALSE
+
+ /// Which hand?
+ var/hand_index
+
+/datum/strippable_item/hand/get_item(atom/source)
+ if (!ismob(source))
+ return null
+
+ var/mob/mob_source = source
+ return mob_source.get_item_for_held_index(hand_index)
+
+/datum/strippable_item/hand/try_equip(atom/source, obj/item/equipping, mob/user)
+ . = ..()
+ if (!.)
+ return FALSE
+
+ if (!ismob(source))
+ return FALSE
+
+ var/mob/mob_source = source
+
+ if (!mob_source.can_put_in_hand(equipping, hand_index))
+ to_chat(src, "\The [equipping] doesn't fit in that place!")
+ return FALSE
+
+ return TRUE
+
+/datum/strippable_item/hand/start_equip(atom/source, obj/item/equipping, mob/user)
+ . = ..()
+ if (!.)
+ return
+
+ if (!ismob(source))
+ return FALSE
+
+ var/mob/mob_source = source
+
+ if (!do_mob(user, source, equipping.equip_delay_other))
+ return FALSE
+
+ if(get_obscuring(source) == STRIPPABLE_OBSCURING_COMPLETELY)
+ return FALSE
+
+ if (!mob_source.can_put_in_hand(equipping, hand_index))
+ return FALSE
+
+ if (!user.temporarilyRemoveItemFromInventory(equipping))
+ return FALSE
+
+ return TRUE
+
+/datum/strippable_item/hand/finish_equip(atom/source, obj/item/equipping, mob/user)
+ if(!..())
+ return FALSE
+ if (!iscarbon(source))
+ return FALSE
+
+ var/mob/mob_source = source
+ mob_source.put_in_hand(equipping, hand_index)
+
+/datum/strippable_item/hand/start_unequip(atom/source, mob/user)
+ . = ..()
+ if (!.)
+ return
+
+ return start_unequip_mob(get_item(source), source, user)
+
+/datum/strippable_item/hand/finish_unequip(atom/source, mob/user)
+ ..()
+ var/obj/item/item = get_item(source)
+ if (isnull(item))
+ return FALSE
+
+ if (!ismob(source))
+ return FALSE
+
+ return finish_unequip_mob(item, source, user)
+
+/datum/strippable_item/hand/left
+ key = STRIPPABLE_ITEM_LHAND
+ hand_index = 1
+
+/datum/strippable_item/hand/right
+ key = STRIPPABLE_ITEM_RHAND
+ hand_index = 2
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index e27a38a682..3c4fdd68cb 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -48,6 +48,7 @@
AddElement(/datum/element/flavor_text/carbon, _name = "Flavor Text", _save_key = "flavor_text")
AddElement(/datum/element/flavor_text/carbon/temporary, "", "Set Pose (Temporary Flavor Text)", "This should be used only for things pertaining to the current round!", _save_key = null)
AddElement(/datum/element/flavor_text, _name = "OOC Notes", _addendum = "Put information on ERP/vore/lewd-related preferences here. THIS SHOULD NOT CONTAIN REGULAR FLAVORTEXT!!", _save_key = "ooc_notes", _examine_no_preview = TRUE)
+ AddElement(/datum/element/strippable, GLOB.strippable_human_items, /mob/living/carbon/human/.proc/should_strip)
/mob/living/carbon/human/Destroy()
QDEL_NULL(physiology)
@@ -112,141 +113,6 @@
var/datum/disease/D = thing
. += "* [D.name], Type: [D.spread_text], Stage: [D.stage]/[D.max_stages], Possible Cure: [D.cure_text]"
-/mob/living/carbon/human/show_inv(mob/user)
- user.set_machine(src)
- var/has_breathable_mask = istype(wear_mask, /obj/item/clothing/mask)
- var/list/obscured = check_obscured_slots()
- var/list/dat = list()
-
- dat += "
- Close
- "}
-
- var/datum/browser/popup = new(user, "mob[REF(src)]", "[src]", 440, 510)
- popup.set_content(dat.Join())
- popup.open()
-
// called when something steps onto a human
// this could be made more general, but for now just handle mulebot
/mob/living/carbon/human/Crossed(atom/movable/AM)
@@ -273,83 +139,6 @@
return
SEND_SIGNAL(src, COMSIG_CARBON_EMBED_RIP, I, L)
return
- if(href_list["toggle_helmet"])
- if(!istype(head, /obj/item/clothing/head/helmet/space/hardsuit))
- return
- var/obj/item/clothing/head/helmet/space/hardsuit/hardsuit_head = head
- visible_message("[usr] tries to [hardsuit_head ? "retract" : "extend"] [src]'s helmet.", \
- "[usr] tries to [hardsuit_head ? "retract" : "extend"] [src]'s helmet.", \
- target = usr, target_message = "You try to [hardsuit_head ? "retract" : "extend"] [src]'s helmet.")
- if(!do_mob(usr, src, hardsuit_head ? head.strip_delay : POCKET_STRIP_DELAY))
- return
- if(!istype(wear_suit, /obj/item/clothing/suit/space/hardsuit) || (hardsuit_head ? (!head || head != hardsuit_head) : head))
- return
- var/obj/item/clothing/suit/space/hardsuit/hardsuit = wear_suit //This should be an hardsuit given all our checks
- if(hardsuit.ToggleHelmet(FALSE))
- visible_message("[usr] [hardsuit_head ? "retract" : "extend"] [src]'s helmet", \
- "[usr] [hardsuit_head ? "retract" : "extend"] [src]'s helmet", \
- target = usr, target_message = "You [hardsuit_head ? "retract" : "extend"] [src]'s helmet.")
- return
- if(href_list["item"])
- var/slot = text2num(href_list["item"])
- if(slot in check_obscured_slots())
- to_chat(usr, "You can't reach that! Something is covering it.")
- return
- if(href_list["pockets"])
- var/strip_mod = 1
- var/strip_silence = FALSE
- var/obj/item/clothing/gloves/G = gloves
- if(istype(G))
- strip_mod = G.strip_mod
- strip_silence = G.strip_silence
- var/pocket_side = href_list["pockets"]
- var/pocket_id = (pocket_side == "right" ? SLOT_R_STORE : SLOT_L_STORE)
- var/obj/item/pocket_item = (pocket_id == SLOT_R_STORE ? r_store : l_store)
- var/obj/item/place_item = usr.get_active_held_item() // Item to place in the pocket, if it's empty
-
- var/delay_denominator = 1
- if(pocket_item && !(pocket_item.item_flags & ABSTRACT))
- if(HAS_TRAIT(pocket_item, TRAIT_NODROP))
- to_chat(usr, "You try to empty [src]'s [pocket_side] pocket, it seems to be stuck!")
- to_chat(usr, "You try to empty [src]'s [pocket_side] pocket.")
- else if(place_item && place_item.mob_can_equip(src, usr, pocket_id, 1) && !(place_item.item_flags & ABSTRACT))
- to_chat(usr, "You try to place [place_item] into [src]'s [pocket_side] pocket.")
- delay_denominator = 4
- else
- return
-
- if(do_mob(usr, src, max(round(POCKET_STRIP_DELAY/(delay_denominator*strip_mod)),1), ignorehelditem = TRUE)) //placing an item into the pocket is 4 times faster (and the strip_mod too)
- if(pocket_item)
- if(pocket_item == (pocket_id == SLOT_R_STORE ? r_store : l_store)) //item still in the pocket we search
- dropItemToGround(pocket_item)
- if(!usr.can_hold_items() || !usr.put_in_hands(pocket_item))
- pocket_item.forceMove(drop_location())
- log_combat(usr, src, "pickpocketed of item: [pocket_item]")
- else
- if(place_item)
- if(place_item.mob_can_equip(src, usr, pocket_id, FALSE, TRUE))
- usr.temporarilyRemoveItemFromInventory(place_item, TRUE)
- equip_to_slot(place_item, pocket_id, TRUE)
- log_combat(usr, src, "placed item [place_item] onto")
- //do nothing otherwise
-
- // Update strip window
- if(usr.machine == src && in_range(src, usr))
- show_inv(usr)
- else
- // Display a warning if the user mocks up
- if(!strip_silence)
- to_chat(src, "You feel your [pocket_side] pocket being fumbled with!")
- log_combat(usr, src, "failed to [pocket_item ? "pickpocket item [pocket_item] from" : "place item [place_item] onto "]")
-
- if(usr.canUseTopic(src, BE_CLOSE, NO_DEXTERY, null, FALSE))
- // separate from first canusetopic
- var/mob/living/user = usr
- if(istype(user) && href_list["shoes"] && (user.mobility_flags & MOBILITY_USE)) // we need to be on the ground, so we'll be a bit looser
- shoes.handle_tying(usr)
-
- ..() //CITADEL CHANGE - removes a tab from behind this ..() so that flavortext can actually be examined
-
///////HUDs///////
if(href_list["hud"])
diff --git a/code/modules/mob/living/carbon/human/human_stripping.dm b/code/modules/mob/living/carbon/human/human_stripping.dm
new file mode 100644
index 0000000000..7bb1eeb6b2
--- /dev/null
+++ b/code/modules/mob/living/carbon/human/human_stripping.dm
@@ -0,0 +1,313 @@
+#define INTERNALS_TOGGLE_DELAY (4 SECONDS)
+#define POCKET_EQUIP_DELAY (1 SECONDS)
+
+GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list(
+ /datum/strippable_item/mob_item_slot/head,
+ /datum/strippable_item/mob_item_slot/back,
+ /datum/strippable_item/mob_item_slot/mask,
+ /datum/strippable_item/mob_item_slot/neck,
+ /datum/strippable_item/mob_item_slot/eyes,
+ /datum/strippable_item/mob_item_slot/ears,
+ /datum/strippable_item/mob_item_slot/jumpsuit,
+ /datum/strippable_item/mob_item_slot/suit,
+ /datum/strippable_item/mob_item_slot/gloves,
+ /datum/strippable_item/mob_item_slot/feet,
+ /datum/strippable_item/mob_item_slot/suit_storage,
+ /datum/strippable_item/mob_item_slot/id,
+ /datum/strippable_item/mob_item_slot/belt,
+ /datum/strippable_item/mob_item_slot/pocket/left,
+ /datum/strippable_item/mob_item_slot/pocket/right,
+ /datum/strippable_item/hand/left,
+ /datum/strippable_item/hand/right,
+ /datum/strippable_item/mob_item_slot/handcuffs,
+ /datum/strippable_item/mob_item_slot/legcuffs,
+
+ // Sandstorm content
+ /datum/strippable_item/mob_item_slot/ears_extra,
+ /datum/strippable_item/mob_item_slot/wrists,
+ /datum/strippable_item/mob_item_slot/socks,
+ /datum/strippable_item/mob_item_slot/underwear,
+ /datum/strippable_item/mob_item_slot/undershirt,
+)))
+
+/mob/living/carbon/human/proc/should_strip(mob/user)
+ if (user.pulling != src || user.grab_state != GRAB_AGGRESSIVE)
+ return TRUE
+
+ if (ishuman(user))
+ var/mob/living/carbon/human/human_user = user
+ return !human_user.can_be_firemanned(src)
+
+ return TRUE
+
+/datum/strippable_item/mob_item_slot/eyes
+ key = STRIPPABLE_ITEM_EYES
+ item_slot = SLOT_GLASSES
+
+/datum/strippable_item/mob_item_slot/ears
+ key = STRIPPABLE_ITEM_EARS
+ item_slot = SLOT_EARS_RIGHT
+
+/datum/strippable_item/mob_item_slot/jumpsuit
+ key = STRIPPABLE_ITEM_JUMPSUIT
+ item_slot = SLOT_W_UNIFORM
+
+/datum/strippable_item/mob_item_slot/jumpsuit/get_alternate_action(atom/source, mob/user)
+ if(..() == FALSE)
+ return null
+ var/obj/item/clothing/under/jumpsuit = get_item(source)
+ if (!istype(jumpsuit))
+ return null
+ return jumpsuit?.can_adjust ? "adjust_jumpsuit" : null
+
+/datum/strippable_item/mob_item_slot/jumpsuit/alternate_action(atom/source, mob/user)
+ if (!..())
+ return null
+ var/obj/item/clothing/under/jumpsuit = get_item(source)
+ if (!istype(jumpsuit))
+ return null
+ to_chat(source, "[user] is trying to adjust your [jumpsuit.name].")
+ if (!do_mob(user, source, jumpsuit.strip_delay * 0.5, ignorehelditem = TRUE))
+ return
+ to_chat(source, "[user] successfully adjusted your [jumpsuit.name].")
+ jumpsuit.toggle_jumpsuit_adjust()
+
+ if (!ismob(source))
+ return null
+
+ var/mob/mob_source = source
+ mob_source.update_inv_w_uniform()
+ mob_source.update_body()
+ return TRUE
+
+/datum/strippable_item/mob_item_slot/suit
+ key = STRIPPABLE_ITEM_SUIT
+ item_slot = SLOT_WEAR_SUIT
+
+/datum/strippable_item/mob_item_slot/suit/get_alternate_action(atom/source, mob/user)
+ if(..() == FALSE)
+ return null
+ var/obj/item/clothing/suit/space/hardsuit/suit = get_item(source)
+ if(istype(suit))
+ if(!suit.helmettype)
+ return null
+ return suit?.suittoggled ? "disable_helmet" : "enable_helmet"
+ return null
+
+/datum/strippable_item/mob_item_slot/suit/alternate_action(mob/living/carbon/human/source, mob/user)
+ if(!..())
+ return null
+ if(ishuman(source))
+ var/obj/item/clothing/suit/space/hardsuit/hardsuit = get_item(source)
+ var/obj/item/clothing/head/helmet/space/hardsuit/hardsuit_head = hardsuit.helmet
+ source.visible_message("[user] tries to [hardsuit.suittoggled ? "retract" : "extend"] [source]'s helmet.", \
+ "[user] tries to [hardsuit.suittoggled ? "retract" : "extend"] [source]'s helmet.", \
+ target = user, target_message = "You try to [hardsuit.suittoggled ? "retract" : "extend"] [source]'s helmet.")
+ if(!do_mob(user, source, hardsuit_head ? hardsuit_head.strip_delay : POCKET_STRIP_DELAY, ignorehelditem = TRUE))
+ return null
+ if((source.head != hardsuit_head) && source.head)
+ return null
+ if(hardsuit.ToggleHelmet(FALSE))
+ source.visible_message("[user] [hardsuit_head ? "retract" : "extend"] [source]'s helmet", \
+ "[user] [hardsuit_head ? "retract" : "extend"] [source]'s helmet", \
+ target = user, target_message = "You [hardsuit_head ? "retract" : "extend"] [source]'s helmet.")
+ return TRUE
+
+/datum/strippable_item/mob_item_slot/gloves
+ key = STRIPPABLE_ITEM_GLOVES
+ item_slot = SLOT_GLOVES
+
+/datum/strippable_item/mob_item_slot/feet
+ key = STRIPPABLE_ITEM_FEET
+ item_slot = SLOT_SHOES
+
+/datum/strippable_item/mob_item_slot/feet/get_alternate_action(atom/source, mob/user)
+ if(..() == FALSE)
+ return null
+ var/obj/item/clothing/shoes/shoes = get_item(source)
+ if (!istype(shoes) || !shoes.can_be_tied)
+ return null
+
+ switch (shoes.tied)
+ if (SHOES_UNTIED)
+ return "knot"
+ if (SHOES_TIED)
+ return "untie"
+ if (SHOES_KNOTTED)
+ return "unknot"
+
+/datum/strippable_item/mob_item_slot/feet/alternate_action(atom/source, mob/user)
+ if(!..())
+ return null
+ var/obj/item/clothing/shoes/shoes = get_item(source)
+ if (!istype(shoes))
+ return null
+
+ shoes.handle_tying(user)
+ return TRUE
+
+/datum/strippable_item/mob_item_slot/suit_storage
+ key = STRIPPABLE_ITEM_SUIT_STORAGE
+ item_slot = SLOT_S_STORE
+
+/datum/strippable_item/mob_item_slot/suit_storage/get_alternate_action(atom/source, mob/user)
+ if(..() == FALSE)
+ return null
+ return get_strippable_alternate_action_internals(get_item(source), source)
+
+/datum/strippable_item/mob_item_slot/suit_storage/alternate_action(atom/source, mob/user)
+ if (!..())
+ return null
+ return strippable_alternate_action_internals(get_item(source), source, user)
+
+/datum/strippable_item/mob_item_slot/id
+ key = STRIPPABLE_ITEM_ID
+ item_slot = SLOT_WEAR_ID
+
+/datum/strippable_item/mob_item_slot/belt
+ key = STRIPPABLE_ITEM_BELT
+ item_slot = SLOT_BELT
+
+/datum/strippable_item/mob_item_slot/belt/get_alternate_action(atom/source, mob/user)
+ if(..() == FALSE)
+ return null
+ return get_strippable_alternate_action_internals(get_item(source), source)
+
+/datum/strippable_item/mob_item_slot/belt/alternate_action(atom/source, mob/user)
+ if (!..())
+ return null
+ return strippable_alternate_action_internals(get_item(source), source, user)
+
+/datum/strippable_item/mob_item_slot/pocket
+ /// Which pocket we're referencing. Used for visible text.
+ var/pocket_side
+
+/datum/strippable_item/mob_item_slot/pocket/get_obscuring(atom/source)
+ return isnull(get_item(source)) \
+ ? STRIPPABLE_OBSCURING_NONE \
+ : STRIPPABLE_OBSCURING_HIDDEN
+
+/datum/strippable_item/mob_item_slot/pocket/get_equip_delay(obj/item/equipping)
+ return POCKET_EQUIP_DELAY
+
+/datum/strippable_item/mob_item_slot/pocket/start_equip(atom/source, obj/item/equipping, mob/user)
+ . = ..()
+ if (!.)
+ warn_owner(source)
+
+/datum/strippable_item/mob_item_slot/pocket/start_unequip(atom/source, mob/user)
+ var/obj/item/item = get_item(source)
+ if (isnull(item))
+ return FALSE
+
+ to_chat(user, span_notice("You try to empty [source]'s [pocket_side] pocket."))
+
+ var/log_message = "[key_name(source)] is being pickpocketed of [item] by [key_name(user)] ([pocket_side])"
+ user.log_message(log_message, LOG_ATTACK, color="red")
+ source.log_message(log_message, LOG_VICTIM, color="red", log_globally=FALSE)
+ item.add_fingerprint(source)
+
+ var/result = start_unequip_mob(item, source, user, POCKET_STRIP_DELAY)
+
+ if (!result)
+ warn_owner(source)
+
+ return result
+
+/datum/strippable_item/mob_item_slot/pocket/proc/warn_owner(atom/owner)
+ to_chat(owner, span_warning("You feel your [pocket_side] pocket being fumbled with!"))
+
+/datum/strippable_item/mob_item_slot/pocket/left
+ key = STRIPPABLE_ITEM_LPOCKET
+ item_slot = SLOT_L_STORE
+ pocket_side = "left"
+
+/datum/strippable_item/mob_item_slot/pocket/right
+ key = STRIPPABLE_ITEM_RPOCKET
+ item_slot = SLOT_R_STORE
+ pocket_side = "right"
+
+/proc/get_strippable_alternate_action_internals(obj/item/item, atom/source)
+ if (!iscarbon(source))
+ return null
+
+ var/mob/living/carbon/carbon_source = source
+ var/obj/item/clothing/mask
+ var/internals = FALSE
+
+ for(mask in GET_INTERNAL_SLOTS(carbon_source))
+ if(istype(mask, /obj/item/clothing/mask))
+ var/obj/item/clothing/mask/M = mask
+ if(M.mask_adjusted)
+ if(M.adjustmask(carbon_source))
+ internals = TRUE
+ else
+ internals = TRUE
+ if((mask.clothing_flags & ALLOWINTERNALS))
+ internals = TRUE
+
+ if(carbon_source.getorganslot(ORGAN_SLOT_BREATHING_TUBE))
+ internals = TRUE
+
+ if (internals && istype(item, /obj/item/tank))
+ return isnull(carbon_source.internal) ? "enable_internals" : "disable_internals"
+
+/proc/strippable_alternate_action_internals(obj/item/item, atom/source, mob/user)
+ var/obj/item/tank/tank = item
+ if (!istype(tank))
+ return null
+
+ var/mob/living/carbon/carbon_source = source
+ if (!istype(carbon_source))
+ return null
+
+ var/obj/item/clothing/mask
+ var/internals = FALSE
+
+ for(mask in GET_INTERNAL_SLOTS(carbon_source))
+ if(istype(mask, /obj/item/clothing/mask))
+ var/obj/item/clothing/mask/M = mask
+ if(M.mask_adjusted)
+ if(M.adjustmask(carbon_source))
+ internals = TRUE
+ else
+ internals = TRUE
+ if((mask.clothing_flags & ALLOWINTERNALS))
+ internals = TRUE
+
+ if(!internals)
+ return null
+
+ carbon_source.visible_message(
+ span_danger("[user] tries to [isnull(carbon_source.internal) ? "open": "close"] the valve on [source]'s [item.name]."),
+ span_userdanger("[user] tries to [isnull(carbon_source.internal) ? "open": "close"] the valve on your [item.name]."),
+ ignored_mobs = user,
+ )
+
+ to_chat(user, span_notice("You try to [isnull(carbon_source.internal) ? "open": "close"] the valve on [source]'s [item.name]..."))
+
+ if(!do_mob(user, carbon_source, INTERNALS_TOGGLE_DELAY, ignorehelditem = TRUE))
+ return null
+
+ if(carbon_source.internal)
+ carbon_source.internal = null
+
+ // This isn't meant to be FALSE, it correlates to the icon's name.
+ carbon_source.update_internals_hud_icon(0)
+ else if (!QDELETED(item))
+ if(internals || carbon_source.getorganslot(ORGAN_SLOT_BREATHING_TUBE))
+ carbon_source.internal = item
+ carbon_source.update_internals_hud_icon(1)
+
+ carbon_source.visible_message(
+ span_danger("[user] [isnull(carbon_source.internal) ? "closes": "opens"] the valve on [source]'s [item.name]."),
+ span_userdanger("[user] [isnull(carbon_source.internal) ? "closes": "opens"] the valve on your [item.name]."),
+ ignored_mobs = user,
+ )
+
+ to_chat(user, span_notice("You [isnull(carbon_source.internal) ? "close" : "open"] the valve on [source]'s [item.name]."))
+
+ return TRUE
+
+#undef INTERNALS_TOGGLE_DELAY
+#undef POCKET_EQUIP_DELAY
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index cae2125116..32119023c2 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -16,6 +16,17 @@
/obj/item/bodypart/r_arm/monkey, /obj/item/bodypart/r_leg/monkey, /obj/item/bodypart/l_leg/monkey)
hud_type = /datum/hud/monkey
+GLOBAL_LIST_INIT(strippable_monkey_items, create_strippable_list(list(
+ /datum/strippable_item/mob_item_slot/head,
+ /datum/strippable_item/mob_item_slot/back,
+ /datum/strippable_item/mob_item_slot/mask,
+ /datum/strippable_item/mob_item_slot/neck,
+ /datum/strippable_item/hand/left,
+ /datum/strippable_item/hand/right,
+ /datum/strippable_item/mob_item_slot/handcuffs,
+ /datum/strippable_item/mob_item_slot/legcuffs,
+)))
+
/mob/living/carbon/monkey/Initialize(mapload, cubespawned=FALSE, mob/spawner)
add_verb(src, /mob/living/proc/mob_sleep)
add_verb(src, /mob/living/proc/lay_down)
@@ -48,6 +59,7 @@
. = ..()
AddElement(/datum/element/mob_holder, worn_state = "monkey", inv_slots = ITEM_SLOT_HEAD)
AddComponent(/datum/component/footstep, FOOTSTEP_MOB_BAREFOOT, 1, 2)
+ AddElement(/datum/element/strippable, GLOB.strippable_monkey_items)
/mob/living/carbon/monkey/Destroy()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index ffc7d9903f..a38965095f 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -951,13 +951,6 @@
what.forceMove(drop_location())
log_combat(src, who, "stripped [what] off")
- if(Adjacent(who)) //update inventory window
- who.show_inv(src)
- else
- src << browse(null,"window=mob[REF(who)]")
-
- who.update_equipment_speed_mods() // Updates speed in case stripped speed affecting item
-
// The src mob is trying to place an item on someone
// Override if a certain mob should be behave differently when placing items (can't, for example)
/mob/living/stripPanelEquip(obj/item/what, mob/who, where)
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index df9b931d41..526c71a26c 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -412,19 +412,6 @@
src << browse(dat, "window=airoster")
onclose(src, "airoster")
-/mob/living/silicon/update_transform()
- var/matrix/ntransform = matrix(transform) //aka transform.Copy()
- var/changed = 0
- if(resize != RESIZE_DEFAULT_SIZE)
- changed++
- ntransform.Scale(resize)
- ntransform.Translate(0, 16*(resize-1)) //Makes sure you stand on the tile no matter the size - sand
- resize = RESIZE_DEFAULT_SIZE
-
- if(changed)
- animate(src, transform = ntransform, time = 2,easing = EASE_IN|EASE_OUT)
- return ..()
-
/mob/living/silicon/is_literate()
return 1
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index fb3d009a72..e8c29e6d55 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -24,6 +24,7 @@
. = ..()
AddElement(/datum/element/wuv, "yaps happily!", EMOTE_AUDIBLE, /datum/mood_event/pet_animal, "growls!", EMOTE_AUDIBLE)
AddElement(/datum/element/mob_holder, held_icon)
+ AddElement(/datum/element/strippable, GLOB.strippable_corgi_items)
//Corgis and pugs are now under one dog subtype
@@ -104,18 +105,175 @@
..(gibbed)
regenerate_icons()
-/mob/living/simple_animal/pet/dog/corgi/show_inv(mob/user)
- if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
+ /datum/strippable_item/corgi_head,
+ /datum/strippable_item/corgi_back,
+ /datum/strippable_item/corgi_collar,
+ /datum/strippable_item/corgi_id,
+)))
+
+/datum/strippable_item/corgi_head
+ key = STRIPPABLE_ITEM_HEAD
+
+/datum/strippable_item/corgi_head/get_item(atom/source)
+ var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ if (!istype(corgi_source))
return
- user.set_machine(src)
- var/dat = "Inventory of [name] "
- dat += "
Head: [inventory_head]" : "add_inv=head'>Nothing"]"
- dat += "
Back: [inventory_back]" : "add_inv=back'>Nothing"]"
- dat += "
Collar: [pcollar]" : "add_inv=collar'>Nothing"]"
+ return corgi_source.inventory_head
- user << browse(dat, "window=mob[REF(src)];size=325x500")
- onclose(user, "mob[REF(src)]")
+/datum/strippable_item/corgi_head/finish_equip(atom/source, obj/item/equipping, mob/user)
+ if(!..())
+ return FALSE
+ var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ if (!istype(corgi_source))
+ return FALSE
+
+ corgi_source.place_on_head(equipping, user)
+
+/datum/strippable_item/corgi_head/finish_unequip(atom/source, mob/user)
+ ..()
+ var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ if (!istype(corgi_source))
+ return
+
+ finish_unequip_mob(corgi_source.inventory_head, corgi_source, user)
+ corgi_source.inventory_head = null
+ corgi_source.update_corgi_fluff()
+ corgi_source.regenerate_icons()
+
+/datum/strippable_item/corgi_back
+ key = STRIPPABLE_ITEM_BACK
+
+/datum/strippable_item/corgi_back/get_item(atom/source)
+ var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ if (!istype(corgi_source))
+ return
+
+ return corgi_source.inventory_back
+
+/datum/strippable_item/corgi_back/try_equip(atom/source, obj/item/equipping, mob/user)
+ . = ..()
+ if (!.)
+ return FALSE
+
+ if (!ispath(equipping.dog_fashion, /datum/dog_fashion/back))
+ to_chat(user, "You set [equipping] on [source]'s back, but it falls off!")
+ equipping.forceMove(source.drop_location())
+ if (prob(25))
+ step_rand(equipping)
+ dance_rotate(source, set_original_dir = TRUE)
+
+ return FALSE
+
+ return TRUE
+
+/datum/strippable_item/corgi_back/finish_equip(atom/source, obj/item/equipping, mob/user)
+ if(!..())
+ return FALSE
+ var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ if (!istype(corgi_source))
+ return FALSE
+
+ equipping.forceMove(corgi_source)
+ corgi_source.inventory_back = equipping
+ corgi_source.update_corgi_fluff()
+ corgi_source.regenerate_icons()
+
+/datum/strippable_item/corgi_back/finish_unequip(atom/source, mob/user)
+ ..()
+ var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ if (!istype(corgi_source))
+ return
+
+ finish_unequip_mob(corgi_source.inventory_back, corgi_source, user)
+ corgi_source.inventory_back = null
+ corgi_source.update_corgi_fluff()
+ corgi_source.regenerate_icons()
+
+/datum/strippable_item/corgi_collar
+ key = STRIPPABLE_ITEM_CORGI_COLLAR
+
+/datum/strippable_item/corgi_collar/get_item(atom/source)
+ var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ if (!istype(corgi_source))
+ return
+
+ return corgi_source.pcollar
+
+/datum/strippable_item/corgi_collar/try_equip(atom/source, obj/item/equipping, mob/user)
+ . = ..()
+ if (!.)
+ return FALSE
+
+ if (!istype(equipping, /obj/item/clothing/neck/petcollar))
+ to_chat(user, "That's not a collar.")
+ return FALSE
+
+ return TRUE
+
+/datum/strippable_item/corgi_collar/finish_equip(atom/source, obj/item/equipping, mob/user)
+ if(!..())
+ return FALSE
+ var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ if (!istype(corgi_source))
+ return FALSE
+
+ corgi_source.add_collar(equipping, user)
+ corgi_source.update_corgi_fluff()
+
+/datum/strippable_item/corgi_collar/finish_unequip(atom/source, mob/user)
+ ..()
+ var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ if (!istype(corgi_source))
+ return
+
+ finish_unequip_mob(corgi_source.pcollar, corgi_source, user)
+ corgi_source.pcollar = null
+ corgi_source.update_corgi_fluff()
+ corgi_source.regenerate_icons()
+
+/datum/strippable_item/corgi_id
+ key = STRIPPABLE_ITEM_ID
+
+/datum/strippable_item/corgi_id/get_item(atom/source)
+ var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ if (!istype(corgi_source))
+ return
+
+ return corgi_source.access_card
+
+/datum/strippable_item/corgi_id/try_equip(atom/source, obj/item/equipping, mob/user)
+ . = ..()
+ if (!.)
+ return FALSE
+
+ if (!istype(equipping, /obj/item/card/id))
+ to_chat(user, "You can't pin [equipping] to [source]!")
+ return FALSE
+
+ return TRUE
+
+/datum/strippable_item/corgi_id/finish_equip(atom/source, obj/item/equipping, mob/user)
+ if(!..())
+ return FALSE
+ var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ if (!istype(corgi_source))
+ return FALSE
+
+ equipping.forceMove(source)
+ corgi_source.access_card = equipping
+
+/datum/strippable_item/corgi_id/finish_unequip(atom/source, mob/user)
+ ..()
+ var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
+ if (!istype(corgi_source))
+ return
+
+ finish_unequip_mob(corgi_source.access_card, corgi_source, user)
+ corgi_source.access_card = null
+ corgi_source.update_corgi_fluff()
+ corgi_source.regenerate_icons()
/mob/living/simple_animal/pet/dog/corgi/getarmor(def_zone, type)
var/armorval = 0
@@ -158,114 +316,12 @@
..()
update_corgi_fluff()
-/mob/living/simple_animal/pet/dog/corgi/Topic(href, href_list)
- if(!(iscarbon(usr) || iscyborg(usr)) || !usr.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
- usr << browse(null, "window=mob[REF(src)]")
- usr.unset_machine()
- return
-
- //Removing from inventory
- if(href_list["remove_inv"])
- var/remove_from = href_list["remove_inv"]
- switch(remove_from)
- if(BODY_ZONE_HEAD)
- if(inventory_head)
- usr.put_in_hands(inventory_head)
- inventory_head = null
- update_corgi_fluff()
- regenerate_icons()
- else
- to_chat(usr, "There is nothing to remove from its [remove_from].")
- return
- if("back")
- if(inventory_back)
- usr.put_in_hands(inventory_back)
- inventory_back = null
- update_corgi_fluff()
- regenerate_icons()
- else
- to_chat(usr, "There is nothing to remove from its [remove_from].")
- return
- if("collar")
- if(pcollar)
- usr.put_in_hands(pcollar)
- pcollar = null
- update_corgi_fluff()
- regenerate_icons()
-
- show_inv(usr)
-
- //Adding things to inventory
- else if(href_list["add_inv"])
-
- var/add_to = href_list["add_inv"]
-
- switch(add_to)
- if("collar")
- var/obj/item/clothing/neck/petcollar/P = usr.get_active_held_item()
- if(!istype(P))
- to_chat(usr,"That's not a collar.")
- return
- add_collar(P, usr)
- update_corgi_fluff()
-
- if(BODY_ZONE_HEAD)
- place_on_head(usr.get_active_held_item(),usr)
-
- if("back")
- if(inventory_back)
- to_chat(usr, "It's already wearing something!")
- return
- else
- var/obj/item/item_to_add = usr.get_active_held_item()
-
- if(!item_to_add)
- usr.visible_message("[usr] pets [src].","You rest your hand on [src]'s back for a moment.")
- return
-
- if(!usr.temporarilyRemoveItemFromInventory(item_to_add))
- to_chat(usr, "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s back!")
- return
-
- if(istype(item_to_add, /obj/item/grenade/plastic)) // last thing he ever wears, I guess
- item_to_add.afterattack(src,usr,1)
- return
-
- //The objects that corgis can wear on their backs.
- var/allowed = FALSE
- if(ispath(item_to_add.dog_fashion, /datum/dog_fashion/back))
- allowed = TRUE
-
- if(!allowed)
- to_chat(usr, "You set [item_to_add] on [src]'s back, but it falls off!")
- item_to_add.forceMove(drop_location())
- if(prob(25))
- step_rand(item_to_add)
- for(var/i in list(1,2,4,8,4,8,4,dir))
- setDir(i)
- sleep(1)
- return
-
- item_to_add.forceMove(src)
- src.inventory_back = item_to_add
- update_corgi_fluff()
- regenerate_icons()
-
- show_inv(usr)
- else
- return ..()
-
//Corgis are supposed to be simpler, so only a select few objects can actually be put
//to be compatible with them. The objects are below.
//Many hats added, Some will probably be removed, just want to see which ones are popular.
// > some will probably be removed
/mob/living/simple_animal/pet/dog/corgi/proc/place_on_head(obj/item/item_to_add, mob/user)
-
- if(istype(item_to_add, /obj/item/grenade/plastic)) // last thing he ever wears, I guess
- INVOKE_ASYNC(item_to_add, /obj/item.proc/afterattack, src, user, 1)
- return
-
if(inventory_head)
if(user)
to_chat(user, "You can't put more than one hat on [src]!")
@@ -303,9 +359,7 @@
item_to_add.forceMove(drop_location())
if(prob(25))
step_rand(item_to_add)
- for(var/i in list(1,2,4,8,4,8,4,dir))
- setDir(i)
- sleep(1)
+ dance_rotate(src, set_original_dir = TRUE)
return valid
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index bd45c482a2..7c7a684cf3 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -124,6 +124,9 @@
/mob/living/simple_animal/parrot/proc/toggle_mode,
/mob/living/simple_animal/parrot/proc/perch_mob_player))
+/mob/living/simple_animal/parrot/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/strippable, GLOB.strippable_parrot_items)
/mob/living/simple_animal/parrot/examine(mob/user)
. = ..()
@@ -183,91 +186,101 @@
return 0
-/*
- * Inventory
- */
-/mob/living/simple_animal/parrot/show_inv(mob/user)
- user.set_machine(src)
+GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
+ /datum/strippable_item/parrot_headset,
+)))
- var/dat = " Inventory of [name] "
- dat += "
Headset: [ears]" : "add_inv=ears'>Nothing"]"
+/datum/strippable_item/parrot_headset
+ key = STRIPPABLE_ITEM_PARROT_HEADSET
- user << browse(dat, "window=mob[REF(src)];size=325x500")
- onclose(user, "window=mob[REF(src)]")
+/datum/strippable_item/parrot_headset/get_item(atom/source)
+ var/mob/living/simple_animal/parrot/parrot_source = source
+ return istype(parrot_source) ? parrot_source.ears : null
+/datum/strippable_item/parrot_headset/try_equip(atom/source, obj/item/equipping, mob/user)
+ . = ..()
+ if (!.)
+ return FALSE
-/mob/living/simple_animal/parrot/Topic(href, href_list)
- if(!(iscarbon(usr) || iscyborg(usr)) || !usr.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
- usr << browse(null, "window=mob[REF(src)]")
- usr.unset_machine()
+ if (!istype(equipping, /obj/item/radio/headset))
+ to_chat(user, "[equipping] won't fit!")
+ return FALSE
+
+ return TRUE
+
+// There is no delay for putting a headset on a parrot.
+/datum/strippable_item/parrot_headset/start_equip(atom/source, obj/item/equipping, mob/user)
+ if(get_obscuring(source) == STRIPPABLE_OBSCURING_COMPLETELY)
+ return FALSE
+ return TRUE
+
+/datum/strippable_item/parrot_headset/finish_equip(atom/source, obj/item/equipping, mob/user)
+ if(!..())
+ return FALSE
+ var/obj/item/radio/headset/radio = equipping
+ if (!istype(radio))
+ return FALSE
+
+ var/mob/living/simple_animal/parrot/parrot_source = source
+ if (!istype(parrot_source))
+ return FALSE
+
+ if (!user.transferItemToLoc(radio, source))
+ return FALSE
+
+ parrot_source.ears = radio
+
+ to_chat(user, "You fit [radio] onto [source].")
+
+ parrot_source.available_channels.Cut()
+
+ for (var/channel in radio.channels)
+ var/channel_to_add
+
+ switch (channel)
+ if (RADIO_CHANNEL_ENGINEERING)
+ channel_to_add = RADIO_TOKEN_ENGINEERING
+ if (RADIO_CHANNEL_COMMAND)
+ channel_to_add = RADIO_TOKEN_COMMAND
+ if (RADIO_CHANNEL_SECURITY)
+ channel_to_add = RADIO_TOKEN_SECURITY
+ if (RADIO_CHANNEL_SCIENCE)
+ channel_to_add = RADIO_TOKEN_SCIENCE
+ if (RADIO_CHANNEL_MEDICAL)
+ channel_to_add = RADIO_TOKEN_MEDICAL
+ if (RADIO_CHANNEL_SUPPLY)
+ channel_to_add = RADIO_TOKEN_SUPPLY
+ if (RADIO_CHANNEL_SERVICE)
+ channel_to_add = RADIO_TOKEN_SERVICE
+
+ if (channel_to_add)
+ parrot_source.available_channels += channel_to_add
+
+ if (radio.translate_binary)
+ parrot_source.available_channels.Add(MODE_TOKEN_BINARY)
+
+/datum/strippable_item/parrot_headset/start_unequip(atom/source, mob/user)
+ . = ..()
+ if (!.)
+ return FALSE
+
+ var/mob/living/simple_animal/parrot/parrot_source = source
+ if (!istype(parrot_source))
return
- //Removing from inventory
- if(href_list["remove_inv"])
- var/remove_from = href_list["remove_inv"]
- switch(remove_from)
- if("ears")
- if(!ears)
- to_chat(usr, "There is nothing to remove from its [remove_from]!")
- return
- if(!stat)
- say("[available_channels.len ? "[pick(available_channels)] " : null]BAWWWWWK LEAVE THE HEADSET BAWKKKKK!")
- ears.forceMove(drop_location())
- ears = null
- for(var/possible_phrase in speak)
- if(copytext_char(possible_phrase, 2, 3) in GLOB.department_radio_keys)
- possible_phrase = copytext_char(possible_phrase, 3)
+ if (!parrot_source.stat)
+ parrot_source.say("[parrot_source.available_channels.len ? "[pick(parrot_source.available_channels)] " : null]BAWWWWWK LEAVE THE HEADSET BAWKKKKK!")
- //Adding things to inventory
- else if(href_list["add_inv"])
- var/add_to = href_list["add_inv"]
- if(!usr.get_active_held_item())
- to_chat(usr, "You have nothing in your hand to put on its [add_to]!")
- return
- switch(add_to)
- if("ears")
- if(ears)
- to_chat(usr, "It's already wearing something!")
- return
- else
- var/obj/item/item_to_add = usr.get_active_held_item()
- if(!item_to_add)
- return
+ return TRUE
- if( !istype(item_to_add, /obj/item/radio/headset) )
- to_chat(usr, "This object won't fit!")
- return
-
- var/obj/item/radio/headset/headset_to_add = item_to_add
-
- if(!usr.transferItemToLoc(headset_to_add, src))
- return
- ears = headset_to_add
- to_chat(usr, "You fit the headset onto [src].")
-
- clearlist(available_channels)
- for(var/ch in headset_to_add.channels)
- switch(ch)
- if(RADIO_CHANNEL_ENGINEERING)
- available_channels.Add(RADIO_TOKEN_ENGINEERING)
- if(RADIO_CHANNEL_COMMAND)
- available_channels.Add(RADIO_TOKEN_COMMAND)
- if(RADIO_CHANNEL_SECURITY)
- available_channels.Add(RADIO_TOKEN_SECURITY)
- if(RADIO_CHANNEL_SCIENCE)
- available_channels.Add(RADIO_TOKEN_SCIENCE)
- if(RADIO_CHANNEL_MEDICAL)
- available_channels.Add(RADIO_TOKEN_MEDICAL)
- if(RADIO_CHANNEL_SUPPLY)
- available_channels.Add(RADIO_TOKEN_SUPPLY)
- if(RADIO_CHANNEL_SERVICE)
- available_channels.Add(RADIO_TOKEN_SERVICE)
-
- if(headset_to_add.translate_binary)
- available_channels.Add(MODE_TOKEN_BINARY)
- else
- return ..()
+/datum/strippable_item/parrot_headset/finish_unequip(atom/source, mob/user)
+ ..()
+ var/mob/living/simple_animal/parrot/parrot_source = source
+ if (!istype(parrot_source))
+ return
+ finish_unequip_mob(parrot_source.ears, parrot_source, user)
+ parrot_source.ears = null
/*
* Attack responces
diff --git a/code/modules/mob/living/update_icons.dm b/code/modules/mob/living/update_icons.dm
index d5c018e020..d3264c93a2 100644
--- a/code/modules/mob/living/update_icons.dm
+++ b/code/modules/mob/living/update_icons.dm
@@ -18,7 +18,7 @@
if(resize != RESIZE_DEFAULT_SIZE)
changed++
ntransform.Scale(resize)
- if(lying)
+ if(lying && rotate_on_lying)
ntransform.Translate(lying == 90 ? 16*(resize-1) : -(16*(resize-1)), 0) //Makes sure you stand on the tile no matter the size - sand
else
ntransform.Translate(0, 16*(resize-1)) //Makes sure you stand on the tile no matter the size - sand
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index a156dae84f..c5bf69fae6 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -304,9 +304,6 @@
SEND_SIGNAL(src, COMSIG_MOB_RESET_PERSPECTIVE, A)
return TRUE
-/mob/proc/show_inv(mob/user)
- return
-
//view() but with a signal, to allow blacklisting some of the otherwise visible atoms.
/mob/proc/fov_view(dist = world.view)
. = view(dist, src)
@@ -535,10 +532,6 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
unset_machine()
src << browse(null, t1)
- if(href_list["refresh"])
- if(machine && in_range(src, usr))
- show_inv(machine)
-
if(usr.canUseTopic(src, BE_CLOSE, NO_DEXTERY))
if(href_list["item"])
var/slot = text2num(href_list["item"])
@@ -555,12 +548,6 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
else
usr.stripPanelEquip(what,src,slot)
- if(usr.machine == src)
- if(Adjacent(usr))
- show_inv(usr)
- else
- usr << browse(null,"window=mob[REF(src)]")
-
// The src mob is trying to strip an item from someone
// Defined in living.dm
/mob/proc/stripPanelUnequip(obj/item/what, mob/who)
@@ -582,12 +569,6 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
if(isAI(M))
return
-/mob/MouseDrop_T(atom/dropping, atom/user)
- . = ..()
- if(ismob(dropping) && dropping != user)
- var/mob/M = dropping
- M.show_inv(user)
-
/mob/proc/is_muzzled()
return FALSE
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index eab1c55ca9..75cf6594e6 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -1010,7 +1010,7 @@ GLOBAL_LIST_EMPTY(vending_products)
if(base64_cache[T.type])
base64 = base64_cache[T.type]
else
- base64 = icon2base64(icon(T.icon, T.icon_state))
+ base64 = icon2base64(icon(T.icon, T.icon_state, SOUTH, 1))
base64_cache[T.type] = base64
break
var/list/data = list(
diff --git a/html/changelog.html b/html/changelog.html
index 089f63b704..6f5da1fcf0 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -65,6 +65,17 @@
Refined1 updated:
- Rule flavour texts for each command role upon joining the server.
+ SandPoot updated:
+
+ - You also no longer get every animation sprite and direction sprite of items on the menus.
+
+
+ 29 December 2021
+ TripleShades updated:
+
+ - (Festive Station) Fixes
+ - Readds the cold to Festive Station tweak: (Festive Station) Fixes
+ - (Pubby) Cautery??? I think this is leftover but nobody has touched Pubby since me so it's fine probably
28 December 2021
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 4626ba1b6d..7c9071cb70 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -31343,6 +31343,12 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
SandPoot:
- tweak: Set-Gender for borgs was moved to Robot Commands tab on the statpanel.
- tweak: Beautified some ui on the interaction menu.
+2021-12-29:
+ TripleShades:
+ - rscadd: (Festive Station) Fixes
+ - rscadd: 'Readds the cold to Festive Station tweak: (Festive Station) Fixes'
+ - rscadd: (Pubby) Cautery??? I think this is leftover but nobody has touched Pubby
+ since me so it's fine probably
2021-12-30:
Refined1:
- rscadd: Rule flavour texts for each command role upon joining the server.
@@ -31352,3 +31358,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
Crowbar764:
- rscadd: Deathclaws
- rscadd: Funclaws
+ SandPoot:
+ - bugfix: You also no longer get every animation sprite and direction sprite of
+ items on the menus.
diff --git a/icons/UI_Icons/inventory/back.png b/icons/UI_Icons/inventory/back.png
new file mode 100644
index 0000000000..736b9d64bf
Binary files /dev/null and b/icons/UI_Icons/inventory/back.png differ
diff --git a/icons/UI_Icons/inventory/belt.png b/icons/UI_Icons/inventory/belt.png
new file mode 100644
index 0000000000..1be89d450a
Binary files /dev/null and b/icons/UI_Icons/inventory/belt.png differ
diff --git a/icons/UI_Icons/inventory/collar.png b/icons/UI_Icons/inventory/collar.png
new file mode 100644
index 0000000000..71803b1b6c
Binary files /dev/null and b/icons/UI_Icons/inventory/collar.png differ
diff --git a/icons/UI_Icons/inventory/ears.png b/icons/UI_Icons/inventory/ears.png
new file mode 100644
index 0000000000..e9a8f3c23c
Binary files /dev/null and b/icons/UI_Icons/inventory/ears.png differ
diff --git a/icons/UI_Icons/inventory/glasses.png b/icons/UI_Icons/inventory/glasses.png
new file mode 100644
index 0000000000..6e6f1ad098
Binary files /dev/null and b/icons/UI_Icons/inventory/glasses.png differ
diff --git a/icons/UI_Icons/inventory/gloves.png b/icons/UI_Icons/inventory/gloves.png
new file mode 100644
index 0000000000..2c8a16cbdb
Binary files /dev/null and b/icons/UI_Icons/inventory/gloves.png differ
diff --git a/icons/UI_Icons/inventory/hand_l.png b/icons/UI_Icons/inventory/hand_l.png
new file mode 100644
index 0000000000..b09228d65f
Binary files /dev/null and b/icons/UI_Icons/inventory/hand_l.png differ
diff --git a/icons/UI_Icons/inventory/hand_r.png b/icons/UI_Icons/inventory/hand_r.png
new file mode 100644
index 0000000000..0e05a487e0
Binary files /dev/null and b/icons/UI_Icons/inventory/hand_r.png differ
diff --git a/icons/UI_Icons/inventory/head.png b/icons/UI_Icons/inventory/head.png
new file mode 100644
index 0000000000..11e2d2254c
Binary files /dev/null and b/icons/UI_Icons/inventory/head.png differ
diff --git a/icons/UI_Icons/inventory/id.png b/icons/UI_Icons/inventory/id.png
new file mode 100644
index 0000000000..4469591d36
Binary files /dev/null and b/icons/UI_Icons/inventory/id.png differ
diff --git a/icons/UI_Icons/inventory/mask.png b/icons/UI_Icons/inventory/mask.png
new file mode 100644
index 0000000000..82e5108937
Binary files /dev/null and b/icons/UI_Icons/inventory/mask.png differ
diff --git a/icons/UI_Icons/inventory/neck.png b/icons/UI_Icons/inventory/neck.png
new file mode 100644
index 0000000000..78ad3ce3b1
Binary files /dev/null and b/icons/UI_Icons/inventory/neck.png differ
diff --git a/icons/UI_Icons/inventory/pocket.png b/icons/UI_Icons/inventory/pocket.png
new file mode 100644
index 0000000000..f42399dca0
Binary files /dev/null and b/icons/UI_Icons/inventory/pocket.png differ
diff --git a/icons/UI_Icons/inventory/shoes.png b/icons/UI_Icons/inventory/shoes.png
new file mode 100644
index 0000000000..d20f7ef4d1
Binary files /dev/null and b/icons/UI_Icons/inventory/shoes.png differ
diff --git a/icons/UI_Icons/inventory/suit.png b/icons/UI_Icons/inventory/suit.png
new file mode 100644
index 0000000000..e9c48e8069
Binary files /dev/null and b/icons/UI_Icons/inventory/suit.png differ
diff --git a/icons/UI_Icons/inventory/suit_storage.png b/icons/UI_Icons/inventory/suit_storage.png
new file mode 100644
index 0000000000..9722eb1029
Binary files /dev/null and b/icons/UI_Icons/inventory/suit_storage.png differ
diff --git a/icons/UI_Icons/inventory/uniform.png b/icons/UI_Icons/inventory/uniform.png
new file mode 100644
index 0000000000..292b3324b5
Binary files /dev/null and b/icons/UI_Icons/inventory/uniform.png differ
diff --git a/modular_citadel/code/modules/festive/turfs.dm b/modular_citadel/code/modules/festive/turfs.dm
index baf33cc696..dd119a25e7 100644
--- a/modular_citadel/code/modules/festive/turfs.dm
+++ b/modular_citadel/code/modules/festive/turfs.dm
@@ -9,7 +9,9 @@
light_color = "#00111a" //The light can technically cycle on a timer worldwide, but no daynight cycle.
baseturfs = /turf/open/floor/grass/snow/edina //If we explode or die somehow, we just make more! Ahahaha!!!
tiled_dirt = 0 //NO TILESMOOTHING DIRT/DIRT SPAWNS OR SOME SHIT
- initial_gas_mix = OPENTURF_DEFAULT_ATMOS //DO NOT FREEZE EVERYONE TO DEATH ON CHRISTMAS
+ //initial_gas_mix = OPENTURF_DEFAULT_ATMOS //DO NOT FREEZE EVERYONE TO DEATH ON CHRISTMAS
+ initial_gas_mix = FESTIVE_ATMOS
+ planetary_atmos = 1 //Uses new!!! planetmos wow!!! maybe?
//lets people build
/turf/open/floor/grass/snow/edina/attackby(obj/item/C, mob/user, params)
@@ -38,6 +40,13 @@
icon_state = "unsmooth"
smooth = SMOOTH_MORE | SMOOTH_BORDER
canSmoothWith = list(/turf/open/floor/festive/cobblestone)
+ initial_gas_mix = FESTIVE_ATMOS
+ planetary_atmos = 1
+
+/turf/open/floor/festive/cobblestone/safe //this is literally cobblestone but safe for inside use because I don't want to fuck with aesthetics
+ baseturfs = /turf/open/floor/festive/cobblestone/safe
+ initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ planetary_atmos = FALSE
/turf/open/floor/festive/sidewalk
name = "sidewalk"
@@ -46,6 +55,8 @@
icon_state = "unsmooth"
smooth = SMOOTH_MORE | SMOOTH_BORDER
canSmoothWith = list(/turf/open/floor/festive/sidewalk)
+ initial_gas_mix = FESTIVE_ATMOS
+ planetary_atmos = 1
/turf/open/floor/festive/alleyway
name = "alleyway bricks"
@@ -54,6 +65,13 @@
icon_state = "unsmooth"
smooth = SMOOTH_MORE | SMOOTH_BORDER
canSmoothWith = list(/turf/open/floor/festive/alleyway, /turf/open/floor/festive/white_alleyway)
+ initial_gas_mix = FESTIVE_ATMOS
+ planetary_atmos = 1
+
+/turf/open/floor/festive/alleyway/safe //this is literally alleyway but safe for inside use because I don't want to fuck with aesthetics
+ baseturfs = /turf/open/floor/festive/alleyway/safe
+ initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ planetary_atmos = FALSE
/turf/open/floor/festive/white_alleyway
name = "alleyway bricks"
@@ -62,6 +80,8 @@
icon_state = "unsmooth"
smooth = SMOOTH_MORE | SMOOTH_BORDER
canSmoothWith = list(/turf/open/floor/festive/alleyway, /turf/open/floor/festive/white_alleyway)
+ initial_gas_mix = FESTIVE_ATMOS
+ planetary_atmos = 1
/turf/open/floor/festive/trainplatform
name = "trainplatform"
@@ -70,6 +90,13 @@
icon_state = "unsmooth"
smooth = SMOOTH_MORE | SMOOTH_BORDER
canSmoothWith = list(/turf/open/floor/festive/trainplatform)
+ initial_gas_mix = FESTIVE_ATMOS
+ planetary_atmos = 1
+
+/turf/open/floor/festive/trainplatform/safe //this is literally train platform but safe for inside use because I don't want to remap the strip club
+ baseturfs = /turf/open/floor/festive/trainplatform/safe
+ initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ planetary_atmos = FALSE
/turf/open/floor/festive/stairs/stairsnorth
name = "stairs north"
diff --git a/modular_sand/code/datums/elements/holder_micro.dm b/modular_sand/code/datums/elements/holder_micro.dm
index d2cbbd005d..cd69c61b59 100644
--- a/modular_sand/code/datums/elements/holder_micro.dm
+++ b/modular_sand/code/datums/elements/holder_micro.dm
@@ -103,7 +103,7 @@
return
var/mob/living/carbon/human/O = held_mob
if(istype(O))
- O.show_inv(usr)
+ O.MouseDrop(usr)
/obj/item/clothing/head/mob_holder/micro/attack_self(mob/living/user)
if(!user.CheckActionCooldown())
diff --git a/modular_sand/code/game/objects/items/fleshlight.dm b/modular_sand/code/game/objects/items/fleshlight.dm
index f328794dd0..968b6b91b8 100644
--- a/modular_sand/code/game/objects/items/fleshlight.dm
+++ b/modular_sand/code/game/objects/items/fleshlight.dm
@@ -277,18 +277,19 @@
else
..() //just allows people to hit it with other objects, if they so wished.
-/obj/item/clothing/underwear/briefs/panties/portalpanties/mob_can_equip(mob/living/M, slot)
+/obj/item/clothing/underwear/briefs/panties/portalpanties/mob_can_equip(M, equipper, slot, disable_warning, bypass_equip_delay_self)
if(!..())
return FALSE
if(ishuman(M))
+ var/mob/living/carbon/human/human = M
switch(targetting)
if("vagina")
- if(!M.has_vagina(REQUIRE_EXPOSED))
- to_chat(M, "The vagina is covered or there is none!")
+ if(!human.has_vagina(REQUIRE_EXPOSED))
+ to_chat(human, "The vagina is covered or there is none!")
return FALSE
if("anus")
- if(!M.has_anus(REQUIRE_EXPOSED))
- to_chat(M, "The anus is covered or there is none!")
+ if(!human.has_anus(REQUIRE_EXPOSED))
+ to_chat(human, "The anus is covered or there is none!")
return FALSE
return TRUE
diff --git a/modular_sand/code/modules/mob/living/carbon/human/human_stripping.dm b/modular_sand/code/modules/mob/living/carbon/human/human_stripping.dm
new file mode 100644
index 0000000000..9110c6a432
--- /dev/null
+++ b/modular_sand/code/modules/mob/living/carbon/human/human_stripping.dm
@@ -0,0 +1,19 @@
+/datum/strippable_item/mob_item_slot/ears_extra
+ key = STRIPPABLE_ITEM_EARS_EXTRA
+ item_slot = SLOT_EARS_RIGHT
+
+/datum/strippable_item/mob_item_slot/wrists
+ key = STRIPPABLE_ITEM_WRISTS
+ item_slot = SLOT_WRISTS
+
+/datum/strippable_item/mob_item_slot/socks
+ key = STRIPPABLE_ITEM_SOCKS
+ item_slot = SLOT_W_SOCKS
+
+/datum/strippable_item/mob_item_slot/underwear
+ key = STRIPPABLE_ITEM_UNDERWEAR
+ item_slot = SLOT_W_UNDERWEAR
+
+/datum/strippable_item/mob_item_slot/undershirt
+ key = STRIPPABLE_ITEM_UNDERSHIRT
+ item_slot = SLOT_W_SHIRT
diff --git a/modular_sand/icons/UI_Icons/inventory/ears_extra.png b/modular_sand/icons/UI_Icons/inventory/ears_extra.png
new file mode 100644
index 0000000000..fddee44cb1
Binary files /dev/null and b/modular_sand/icons/UI_Icons/inventory/ears_extra.png differ
diff --git a/modular_sand/icons/UI_Icons/inventory/socks.png b/modular_sand/icons/UI_Icons/inventory/socks.png
new file mode 100644
index 0000000000..9a5be04056
Binary files /dev/null and b/modular_sand/icons/UI_Icons/inventory/socks.png differ
diff --git a/modular_sand/icons/UI_Icons/inventory/undershirt.png b/modular_sand/icons/UI_Icons/inventory/undershirt.png
new file mode 100644
index 0000000000..3f581ec749
Binary files /dev/null and b/modular_sand/icons/UI_Icons/inventory/undershirt.png differ
diff --git a/modular_sand/icons/UI_Icons/inventory/underwear.png b/modular_sand/icons/UI_Icons/inventory/underwear.png
new file mode 100644
index 0000000000..b03245044c
Binary files /dev/null and b/modular_sand/icons/UI_Icons/inventory/underwear.png differ
diff --git a/modular_sand/icons/UI_Icons/inventory/wrists.png b/modular_sand/icons/UI_Icons/inventory/wrists.png
new file mode 100644
index 0000000000..501504ae23
Binary files /dev/null and b/modular_sand/icons/UI_Icons/inventory/wrists.png differ
diff --git a/rust-g b/rust-g
index 274fb1836d..347e772cd4 160000
--- a/rust-g
+++ b/rust-g
@@ -1 +1 @@
-Subproject commit 274fb1836d83836d8b613cf300435d75870d7a1b
+Subproject commit 347e772cd4a9620482875cf26ec0afad41c29042
diff --git a/tgstation.dme b/tgstation.dme
index 9a2d8e8362..462b0a08ba 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -117,6 +117,7 @@
#include "code\__DEFINES\stat.dm"
#include "code\__DEFINES\stat_tracking.dm"
#include "code\__DEFINES\status_effects.dm"
+#include "code\__DEFINES\strippable.dm"
#include "code\__DEFINES\subsystems.dm"
#include "code\__DEFINES\tgs.config.dm"
#include "code\__DEFINES\tgs.dm"
@@ -164,6 +165,7 @@
#include "code\__DEFINES\sandcode\signals.dm"
#include "code\__DEFINES\sandcode\sizecode.dm"
#include "code\__DEFINES\sandcode\status_effects.dm"
+#include "code\__DEFINES\sandcode\strippable.dm"
#include "code\__DEFINES\sandcode\subsystems.dm"
#include "code\__DEFINES\sandcode\traits.dm"
#include "code\__DEFINES\sandcode\wires.dm"
@@ -676,6 +678,7 @@
#include "code\datums\elements\snail_crawl.dm"
#include "code\datums\elements\spellcasting.dm"
#include "code\datums\elements\squish.dm"
+#include "code\datums\elements\strippable.dm"
#include "code\datums\elements\swimming.dm"
#include "code\datums\elements\sword_point.dm"
#include "code\datums\elements\tactical.dm"
@@ -2628,6 +2631,7 @@
#include "code\modules\mob\living\carbon\carbon_defines.dm"
#include "code\modules\mob\living\carbon\carbon_movement.dm"
#include "code\modules\mob\living\carbon\carbon_sprint.dm"
+#include "code\modules\mob\living\carbon\carbon_stripping.dm"
#include "code\modules\mob\living\carbon\damage_procs.dm"
#include "code\modules\mob\living\carbon\death.dm"
#include "code\modules\mob\living\carbon\emote.dm"
@@ -2683,6 +2687,7 @@
#include "code\modules\mob\living\carbon\human\human_helpers.dm"
#include "code\modules\mob\living\carbon\human\human_mobility.dm"
#include "code\modules\mob\living\carbon\human\human_movement.dm"
+#include "code\modules\mob\living\carbon\human\human_stripping.dm"
#include "code\modules\mob\living\carbon\human\inventory.dm"
#include "code\modules\mob\living\carbon\human\life.dm"
#include "code\modules\mob\living\carbon\human\login.dm"
@@ -4048,6 +4053,7 @@
#include "modular_sand\code\modules\mob\living\carbon\human\human.dm"
#include "modular_sand\code\modules\mob\living\carbon\human\human_defines.dm"
#include "modular_sand\code\modules\mob\living\carbon\human\life.dm"
+#include "modular_sand\code\modules\mob\living\carbon\human\human_stripping.dm"
#include "modular_sand\code\modules\mob\living\carbon\human\species.dm"
#include "modular_sand\code\modules\mob\living\silicon\silicon.dm"
#include "modular_sand\code\modules\mob\living\silicon\ai\vox_sounds.dm"
diff --git a/tgui/packages/tgfont/icons/air-tank-slash.svg b/tgui/packages/tgfont/icons/air-tank-slash.svg
index c72fca54fa..0a9c4c0df4 100644
--- a/tgui/packages/tgfont/icons/air-tank-slash.svg
+++ b/tgui/packages/tgfont/icons/air-tank-slash.svg
@@ -23,7 +23,7 @@
c-13.66-16.01-2.33-26.15,22.14-49.83C228.23,47.45,234.41,19.82,248.07,35.83z"/>
-
+
diff --git a/tgui/packages/tgui/interfaces/StripMenu.tsx b/tgui/packages/tgui/interfaces/StripMenu.tsx
index 3832ca087c..201ae03c47 100644
--- a/tgui/packages/tgui/interfaces/StripMenu.tsx
+++ b/tgui/packages/tgui/interfaces/StripMenu.tsx
@@ -8,6 +8,9 @@ import { Window } from "../layouts";
const ROWS = 5;
const COLUMNS = 6;
+const ROWS_LONG = 7;
+const COLUMNS_LONG = 11;
+
const BUTTON_DIMENSIONS = "50px";
type GridSpotKey = string;
@@ -71,6 +74,14 @@ const ALTERNATE_ACTIONS: Record = {
icon: "tshirt",
text: "Adjust jumpsuit",
},
+ enable_helmet: {
+ icon: "toggle-off",
+ text: "Extend helmet",
+ },
+ disable_helmet: {
+ icon: "toggle-on",
+ text: "Retract helmet",
+ },
};
const SLOTS: Record<
@@ -82,6 +93,13 @@ const SLOTS: Record<
additionalComponent?: JSX.Element;
}
> = {
+
+ undershirt: {
+ displayName: "shirt",
+ gridSpot: getGridSpotKey([0, 0]),
+ image: "inventory-undershirt.png",
+ },
+
eyes: {
displayName: "eyewear",
gridSpot: getGridSpotKey([0, 1]),
@@ -94,6 +112,18 @@ const SLOTS: Record<
image: "inventory-head.png",
},
+ ears_extra: {
+ displayName: "right ear",
+ gridSpot: getGridSpotKey([0, 3]),
+ image: "inventory-ears_extra.png",
+ },
+
+ socks: {
+ displayName: "socks",
+ gridSpot: getGridSpotKey([1, 0]),
+ image: "inventory-socks.png",
+ },
+
neck: {
displayName: "neckwear",
gridSpot: getGridSpotKey([1, 1]),
@@ -113,7 +143,7 @@ const SLOTS: Record<
},
ears: {
- displayName: "earwear",
+ displayName: "left ear",
gridSpot: getGridSpotKey([1, 3]),
image: "inventory-ears.png",
},
@@ -134,6 +164,12 @@ const SLOTS: Record<
gridSpot: getGridSpotKey([1, 5]),
},
+ underwear: {
+ displayName: "underwear",
+ gridSpot: getGridSpotKey([2, 0]),
+ image: "inventory-underwear.png",
+ },
+
jumpsuit: {
displayName: "uniform",
gridSpot: getGridSpotKey([2, 1]),
@@ -172,6 +208,12 @@ const SLOTS: Record<
image: "inventory-shoes.png",
},
+ wrists: {
+ displayName: "wrists",
+ gridSpot: getGridSpotKey([3, 3]),
+ image: "inventory-wrists.png",
+ },
+
suit_storage: {
displayName: "suit storage item",
gridSpot: getGridSpotKey([4, 0]),
@@ -207,6 +249,175 @@ const SLOTS: Record<
gridSpot: getGridSpotKey([4, 5]),
image: "inventory-pocket.png",
},
+
+};
+
+const SLOTS_LONG: Record<
+ string,
+ {
+ displayName: string;
+ gridSpot: GridSpotKey;
+ image?: string;
+ additionalComponent?: JSX.Element;
+ }
+> = {
+
+ undershirt: {
+ displayName: "shirt",
+ gridSpot: getGridSpotKey([0, 0]),
+ image: "inventory-undershirt.png",
+ },
+
+ socks: {
+ displayName: "socks",
+ gridSpot: getGridSpotKey([1, 0]),
+ image: "inventory-socks.png",
+ },
+
+ underwear: {
+ displayName: "underwear",
+ gridSpot: getGridSpotKey([2, 0]),
+ image: "inventory-underwear.png",
+ },
+
+ wrists: {
+ displayName: "wrists",
+ gridSpot: getGridSpotKey([2, 1]),
+ image: "inventory-wrists.png",
+ },
+
+ ears_extra: {
+ displayName: "right ear",
+ gridSpot: getGridSpotKey([2, 2]),
+ image: "inventory-ears_extra.png",
+ },
+
+ head: {
+ displayName: "headwear",
+ gridSpot: getGridSpotKey([3, 1]),
+ image: "inventory-head.png",
+ },
+
+ corgi_collar: {
+ displayName: "collar",
+ gridSpot: getGridSpotKey([3, 1]),
+ image: "inventory-collar.png",
+ },
+
+ ears: {
+ displayName: "left ear",
+ gridSpot: getGridSpotKey([3, 2]),
+ image: "inventory-ears.png",
+ },
+
+ parrot_headset: {
+ displayName: "headset",
+ gridSpot: getGridSpotKey([3, 2]),
+ image: "inventory-ears.png",
+ },
+
+ neck: {
+ displayName: "neckwear",
+ gridSpot: getGridSpotKey([4, 0]),
+ image: "inventory-neck.png",
+ },
+
+ mask: {
+ displayName: "mask",
+ gridSpot: getGridSpotKey([4, 1]),
+ image: "inventory-mask.png",
+ },
+
+ eyes: {
+ displayName: "eyewear",
+ gridSpot: getGridSpotKey([4, 2]),
+ image: "inventory-glasses.png",
+ },
+
+ jumpsuit: {
+ displayName: "uniform",
+ gridSpot: getGridSpotKey([5, 0]),
+ image: "inventory-uniform.png",
+ },
+
+ suit: {
+ displayName: "suit",
+ gridSpot: getGridSpotKey([5, 1]),
+ image: "inventory-suit.png",
+ },
+
+ gloves: {
+ displayName: "gloves",
+ gridSpot: getGridSpotKey([5, 2]),
+ image: "inventory-gloves.png",
+ },
+
+ handcuffs: {
+ displayName: "handcuffs",
+ gridSpot: getGridSpotKey([5, 8]),
+ },
+
+ shoes: {
+ displayName: "shoes",
+ gridSpot: getGridSpotKey([6, 1]),
+ image: "inventory-shoes.png",
+ },
+
+ legcuffs: {
+ displayName: "legcuffs",
+ gridSpot: getGridSpotKey([6, 2]),
+ },
+
+ suit_storage: {
+ displayName: "suit storage item",
+ gridSpot: getGridSpotKey([6, 3]),
+ image: "inventory-suit_storage.png",
+ },
+
+ id: {
+ displayName: "ID",
+ gridSpot: getGridSpotKey([6, 4]),
+ image: "inventory-id.png",
+ },
+
+ belt: {
+ displayName: "belt",
+ gridSpot: getGridSpotKey([6, 5]),
+ image: "inventory-belt.png",
+ },
+
+ back: {
+ displayName: "backpack",
+ gridSpot: getGridSpotKey([6, 6]),
+ image: "inventory-back.png",
+ },
+
+ right_hand: {
+ displayName: "right hand",
+ gridSpot: getGridSpotKey([6, 7]),
+ image: "inventory-hand_r.png",
+ additionalComponent: R,
+ },
+
+ left_hand: {
+ displayName: "left hand",
+ gridSpot: getGridSpotKey([6, 8]),
+ image: "inventory-hand_l.png",
+ additionalComponent: L,
+ },
+
+ left_pocket: {
+ displayName: "left pocket",
+ gridSpot: getGridSpotKey([6, 9]),
+ image: "inventory-pocket.png",
+ },
+
+ right_pocket: {
+ displayName: "right pocket",
+ gridSpot: getGridSpotKey([6, 10]),
+ image: "inventory-pocket.png",
+ },
+
};
enum ObscuringLevel {
@@ -246,24 +457,35 @@ type StripMenuItem =
type StripMenuData = {
items: Record;
name: string;
+ long_strip_menu: boolean;
};
export const StripMenu = (props, context) => {
const { act, data } = useBackend(context);
const gridSpots = new Map();
- for (const key of Object.keys(data.items)) {
- gridSpots.set(SLOTS[key].gridSpot, key);
+ if (data.long_strip_menu) {
+ for (const key of Object.keys(data.items)) {
+ gridSpots.set(SLOTS_LONG[key].gridSpot, key);
+ }
+ } else {
+ for (const key of Object.keys(data.items)) {
+ gridSpots.set(SLOTS[key].gridSpot, key);
+ }
}
return (
-
+
- {range(0, ROWS).map(row => (
+ {range(0, data.long_strip_menu ? ROWS_LONG : ROWS).map(row => (
- {range(0, COLUMNS).map(column => {
+ {range(0, data.long_strip_menu ? COLUMNS_LONG
+ : COLUMNS).map(column => {
const key = getGridSpotKey([row, column]);
const keyAtSpot = gridSpots.get(key);
@@ -290,7 +512,9 @@ export const StripMenu = (props, context) => {
if (item === null) {
tooltip = slot.displayName;
} else if ("name" in item) {
- alternateAction = ALTERNATE_ACTIONS[item.alternate];
+ if (item.alternate) {
+ alternateAction = ALTERNATE_ACTIONS[item.alternate];
+ }
content = (
{
{slot.image && (
)}
diff --git a/tgui/packages/tgui/styles/atomic/centered-image.scss b/tgui/packages/tgui/styles/atomic/centered-image.scss
new file mode 100644
index 0000000000..cce5bfdf2c
--- /dev/null
+++ b/tgui/packages/tgui/styles/atomic/centered-image.scss
@@ -0,0 +1,7 @@
+.centered-image {
+ position: absolute;
+ height: 100%;
+ left: 50%;
+ top: 50%;
+ transform: translateX(-50%) translateY(-50%) scale(0.8);
+}
diff --git a/tgui/packages/tgui/styles/main.scss b/tgui/packages/tgui/styles/main.scss
index f38d47ba2a..c30d87bf38 100644
--- a/tgui/packages/tgui/styles/main.scss
+++ b/tgui/packages/tgui/styles/main.scss
@@ -11,6 +11,7 @@
// Atomic classes
@include meta.load-css('./atomic/candystripe.scss');
+@include meta.load-css('./atomic/centered-image.scss');
@include meta.load-css('./atomic/color.scss');
@include meta.load-css('./atomic/debug-layout.scss');
@include meta.load-css('./atomic/outline.scss');
|