diff --git a/_maps/map_files/Blueshift/BlueShift.dmm b/_maps/map_files/Blueshift/BlueShift.dmm index 30918866475..2334888fc96 100644 --- a/_maps/map_files/Blueshift/BlueShift.dmm +++ b/_maps/map_files/Blueshift/BlueShift.dmm @@ -363,7 +363,7 @@ dir = 5 }, /turf/open/floor/iron/cafeteria, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "acX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4, @@ -1349,7 +1349,7 @@ "akm" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "akn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{ @@ -1397,7 +1397,7 @@ dir = 4 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "akC" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -1915,7 +1915,7 @@ }, /obj/structure/dresser, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "apo" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer4, @@ -2499,7 +2499,7 @@ dir = 8 }, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "aue" = ( /obj/machinery/disposal/bin, /obj/machinery/camera{ @@ -5333,7 +5333,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "aPf" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -8222,7 +8222,7 @@ dir = 5 }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "bme" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -10094,7 +10094,7 @@ pixel_y = 8 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "bzF" = ( /obj/structure/closet/radiation, /obj/effect/turf_decal/bot, @@ -10884,7 +10884,7 @@ dir = 4 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "bFC" = ( /obj/structure/chair, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -14224,7 +14224,7 @@ dir = 1 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "cfC" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/bot, @@ -14287,7 +14287,7 @@ dir = 4 }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "cgl" = ( /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{ dir = 4 @@ -15516,7 +15516,7 @@ pixel_y = 10 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "coy" = ( /obj/structure/shuttle/engine/heater{ dir = 8 @@ -16169,7 +16169,7 @@ dir = 1 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "ctD" = ( /turf/closed/wall, /area/medical/surgery) @@ -16383,7 +16383,7 @@ dir = 9 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "cuP" = ( /obj/machinery/door/airlock/external{ name = "Atmospherics Internal Airlock"; @@ -18235,7 +18235,7 @@ "cHW" = ( /obj/machinery/griddle, /turf/open/floor/iron/cafeteria, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "cHX" = ( /obj/effect/turf_decal/bot, /obj/structure/rack, @@ -27501,7 +27501,7 @@ dir = 4 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "dYb" = ( /obj/structure/chair/sofa/bench/right{ dir = 1 @@ -28056,7 +28056,7 @@ pixel_y = 5 }, /turf/open/floor/iron/cafeteria, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "ebg" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -28191,7 +28191,7 @@ /obj/machinery/photocopier, /obj/machinery/light_switch/directional/south, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "ebJ" = ( /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, @@ -29055,7 +29055,7 @@ "eiy" = ( /obj/structure/bookcase/random, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "eiC" = ( /obj/structure/railing{ dir = 4 @@ -29879,7 +29879,7 @@ dir = 1 }, /turf/open/floor/iron/cafeteria, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "epi" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/ordnance_mixing_input{ dir = 4 @@ -31805,7 +31805,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "eEH" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -36018,7 +36018,7 @@ dir = 1 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "fld" = ( /obj/item/radio/intercom/directional/south, /turf/open/floor/iron, @@ -36102,7 +36102,7 @@ /obj/effect/landmark/start/nanotrasen_representative, /obj/structure/disposalpipe/segment, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "fly" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes{ @@ -37145,7 +37145,7 @@ dir = 4 }, /turf/open/floor/iron/cafeteria, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "ftK" = ( /obj/structure/cable, /obj/effect/landmark/start/station_engineer, @@ -38974,7 +38974,7 @@ dir = 4 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "fHr" = ( /obj/effect/turf_decal/bot/left, /turf/open/floor/iron, @@ -42592,7 +42592,7 @@ name = "Restroom" }, /turf/open/floor/iron/freezer, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "gkH" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/emcloset, @@ -47276,7 +47276,7 @@ /area/service/abandoned_gambling_den) "gUj" = ( /turf/open/floor/plating, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "gUm" = ( /obj/structure/ladder, /obj/effect/turf_decal/stripes/box, @@ -51970,14 +51970,14 @@ /obj/item/food/meat/slab/chicken, /obj/item/food/meat/slab/chicken, /turf/open/floor/iron/cafeteria, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "hEG" = ( /obj/structure/closet/secure_closet/nanotrasen_representative/station, /obj/item/clothing/accessory/medal/silver/bureaucracy, /obj/item/clothing/accessory/medal/gold/nanotrasen_representative, /obj/item/clothing/accessory/medal/gold/ordom, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "hEQ" = ( /obj/structure/closet/crate, /obj/effect/turf_decal/bot, @@ -54075,7 +54075,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/structure/curtain/bounty, /turf/open/floor/plating, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "hTp" = ( /obj/structure/rack, /obj/item/storage/firstaid/regular, @@ -55629,7 +55629,7 @@ /obj/item/bedsheet/centcom/double, /obj/machinery/light_switch/directional/south, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "ifb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -59651,7 +59651,7 @@ name = "Broom Closet" }, /turf/open/floor/iron, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "iKy" = ( /obj/structure/table/wood, /obj/structure/window/reinforced, @@ -64165,7 +64165,7 @@ dir = 10 }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "jvM" = ( /obj/machinery/door/airlock/security{ name = "Security Transferring Center"; @@ -64751,7 +64751,7 @@ "jzW" = ( /obj/structure/chair/office, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "jAb" = ( /obj/structure/table/wood, /obj/item/nullrod/rosary, @@ -65611,7 +65611,7 @@ dir = 8 }, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "jGu" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/bot, @@ -67409,7 +67409,7 @@ dir = 4 }, /turf/closed/wall/r_wall, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "jST" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -67965,7 +67965,7 @@ pixel_x = -5 }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "jXk" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -68120,7 +68120,7 @@ pixel_y = 10 }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "jYy" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{ @@ -68892,7 +68892,7 @@ "keE" = ( /obj/item/storage/secure/safe/directional/east, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "keK" = ( /obj/structure/chair{ dir = 1 @@ -70890,7 +70890,7 @@ pixel_y = -6 }, /turf/open/floor/iron/freezer, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "kuk" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral{ @@ -72966,7 +72966,7 @@ pixel_y = 0 }, /turf/closed/wall/r_wall, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "kJI" = ( /obj/structure/table/reinforced, /obj/item/wrench, @@ -73690,7 +73690,7 @@ pixel_y = 6 }, /turf/open/floor/iron/dark, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "kPa" = ( /obj/structure/railing/corner{ dir = 8 @@ -73803,7 +73803,7 @@ /area/commons/fitness/recreation) "kPY" = ( /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "kPZ" = ( /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2, @@ -75443,7 +75443,7 @@ name = "curtain" }, /turf/open/floor/grass, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "lds" = ( /obj/item/clothing/under/costume/gladiator, /obj/item/clothing/head/helmet/gladiator, @@ -76316,7 +76316,7 @@ name = "curtain" }, /turf/open/floor/plating, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "ljU" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -76918,7 +76918,7 @@ dir = 4 }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "lpd" = ( /obj/machinery/disposal/bin, /obj/machinery/light/directional/west, @@ -76926,7 +76926,7 @@ dir = 4 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "lpe" = ( /obj/structure/girder, /obj/structure/grille/broken, @@ -81655,7 +81655,7 @@ pixel_y = 1 }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "lYX" = ( /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood, @@ -82582,7 +82582,7 @@ /obj/machinery/firealarm/directional/east, /obj/machinery/light/directional/east, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "mfY" = ( /obj/machinery/roulette, /obj/effect/decal/cleanable/dirt, @@ -83406,7 +83406,7 @@ /obj/item/pushbroom, /obj/item/storage/bag/trash, /turf/open/floor/iron, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "mng" = ( /obj/effect/turf_decal/stripes/corner, /obj/structure/table/reinforced, @@ -83434,7 +83434,7 @@ /area/service/abandoned_gambling_den) "mno" = ( /turf/closed/wall, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "mnp" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -84967,7 +84967,7 @@ pixel_x = -5 }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "mxa" = ( /obj/effect/turf_decal/tile/blue/half{ dir = 8 @@ -86490,7 +86490,7 @@ "mIq" = ( /obj/machinery/oven, /turf/open/floor/iron/cafeteria, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "mIv" = ( /obj/effect/turf_decal/stripes{ dir = 8 @@ -90174,7 +90174,7 @@ dir = 6 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "nlT" = ( /obj/structure/closet/crate/bin, /turf/open/floor/plating, @@ -91640,7 +91640,7 @@ /area/space/nearstation) "nxj" = ( /turf/closed/wall/r_wall, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "nxk" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -92181,7 +92181,7 @@ pixel_y = 0 }, /turf/closed/wall/r_wall, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "nBe" = ( /obj/machinery/door/airlock/highsecurity{ name = "Bunker Safehouse"; @@ -92387,7 +92387,7 @@ dir = 4 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "nCr" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ @@ -93688,7 +93688,7 @@ name = "curtain" }, /turf/open/floor/grass, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "nMZ" = ( /obj/effect/turf_decal/trimline/red/filled/line{ color = "#DE3A3A"; @@ -97110,7 +97110,7 @@ pixel_y = 5 }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "oqa" = ( /obj/structure/table/reinforced, /obj/item/electronics/apc{ @@ -101826,7 +101826,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "pbO" = ( /obj/machinery/door/airlock{ name = "Hydroponics Test Lab"; @@ -101907,7 +101907,7 @@ }, /obj/machinery/holopad/secure, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "pcp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2, @@ -103618,7 +103618,7 @@ }, /obj/effect/landmark/start/nanotrasen_representative, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "ppn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer4, @@ -104936,7 +104936,7 @@ dir = 9 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "pyD" = ( /obj/effect/spawner/random/vending/colavend, /turf/open/floor/iron, @@ -106321,7 +106321,7 @@ pixel_y = 5 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "pIY" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -107189,7 +107189,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "pPU" = ( /obj/structure/railing{ dir = 8 @@ -107562,7 +107562,7 @@ dir = 1 }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "pTr" = ( /obj/structure/frame/machine, /obj/machinery/light/small/directional/south, @@ -107768,7 +107768,7 @@ dir = 5 }, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "pVn" = ( /turf/open/floor/light, /area/commons/fitness/recreation) @@ -113463,7 +113463,7 @@ /obj/machinery/light/directional/west, /obj/machinery/bounty_board/directional/west, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "qQG" = ( /turf/open/openspace/airless/planetary, /area/space) @@ -115718,7 +115718,7 @@ specialfunctions = 4 }, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "rif" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/siding/wood, @@ -116323,7 +116323,7 @@ dir = 4 }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "rmt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -117709,7 +117709,7 @@ dir = 4 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "rxI" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/curtain/cloth/fancy/mechanical{ @@ -123184,7 +123184,7 @@ /obj/item/clothing/suit/toggle/armor/vest/centcom_formal/ntrep, /obj/item/clothing/suit/toggle/armor/vest/centcom_formal, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "sma" = ( /obj/structure/closet/secure_closet/chemical{ anchored = 1 @@ -126735,7 +126735,7 @@ dir = 4 }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "sOU" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{ dir = 4 @@ -127017,7 +127017,7 @@ }, /obj/machinery/computer/security/telescreen/entertainment/directional/north, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "sRb" = ( /obj/structure/sink{ pixel_y = 22 @@ -127032,7 +127032,7 @@ /obj/structure/drain, /obj/machinery/light/small/directional/south, /turf/open/floor/iron/freezer, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "sRe" = ( /obj/structure/railing/corner{ dir = 1 @@ -129705,7 +129705,7 @@ /obj/machinery/newscaster/directional/west, /obj/effect/landmark/start/nanotrasen_representative, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "tlz" = ( /obj/machinery/power/solar_control{ id = "foreport"; @@ -130942,7 +130942,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "tuA" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/bot, @@ -132371,7 +132371,7 @@ dir = 4 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "tDO" = ( /turf/open/floor/carpet, /area/security/detectives_office) @@ -132491,7 +132491,7 @@ }, /obj/effect/landmark/start/nanotrasen_representative, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "tET" = ( /obj/effect/turf_decal/stripes/end{ dir = 8 @@ -135806,7 +135806,7 @@ req_access_txt = "101" }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "ufI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -137606,7 +137606,7 @@ pixel_x = -3 }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "uqN" = ( /obj/structure/toilet{ dir = 8 @@ -138419,7 +138419,7 @@ dir = 4 }, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "uwE" = ( /obj/effect/turf_decal/bot, /obj/effect/spawner/random/maintenance, @@ -142218,7 +142218,7 @@ dir = 4 }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "vbl" = ( /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{ @@ -143509,7 +143509,7 @@ dir = 4 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "vkI" = ( /obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/dirt, @@ -144734,7 +144734,7 @@ "vto" = ( /obj/machinery/vending/boozeomat, /turf/closed/wall/r_wall, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "vtt" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, @@ -146371,7 +146371,7 @@ /turf/open/floor/iron/stairs/old{ dir = 8 }, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "vGq" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -146932,7 +146932,7 @@ "vKc" = ( /obj/item/kirbyplants/random, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "vKh" = ( /obj/structure/window/reinforced/tinted{ dir = 8 @@ -147280,7 +147280,7 @@ pixel_y = 8 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "vMU" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{ dir = 9 @@ -148020,7 +148020,7 @@ name = "curtain" }, /turf/open/floor/grass, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "vTC" = ( /obj/effect/turf_decal/stripes, /obj/machinery/power/shieldwallgen, @@ -149514,7 +149514,7 @@ dir = 4 }, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "wgn" = ( /obj/item/kirbyplants{ icon_state = "plant-22" @@ -149559,7 +149559,7 @@ dir = 4 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "wgI" = ( /obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 9 @@ -154031,7 +154031,7 @@ dir = 8 }, /turf/open/floor/iron/cafeteria, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "wOQ" = ( /turf/open/floor/iron, /area/science/research/abandoned) @@ -156239,7 +156239,7 @@ /obj/machinery/light/directional/east, /obj/effect/landmark/start/nanotrasen_representative, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "xgy" = ( /obj/structure/railing/corner{ dir = 8 @@ -157301,7 +157301,7 @@ /turf/open/floor/iron/stairs/old{ dir = 8 }, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "xnm" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -161655,7 +161655,7 @@ dir = 1 }, /turf/open/floor/wood/parquet, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "xVc" = ( /obj/item/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -163146,7 +163146,7 @@ }, /obj/structure/awaymissions/wildwest/masterclock, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "yhQ" = ( /turf/closed/wall, /area/service/hydroponics/garden) diff --git a/_maps/map_files/NSSJourney/NSSJourney.dmm b/_maps/map_files/NSSJourney/NSSJourney.dmm index 35a283b7ff8..9a66659b004 100644 --- a/_maps/map_files/NSSJourney/NSSJourney.dmm +++ b/_maps/map_files/NSSJourney/NSSJourney.dmm @@ -810,7 +810,7 @@ req_access_txt = "101" }, /turf/open/floor/plating, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "aem" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -1206,7 +1206,7 @@ dir = 4 }, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "ahP" = ( /turf/open/floor/iron/white, /area/security/brig) @@ -1626,7 +1626,7 @@ /obj/machinery/light/directional/north, /obj/machinery/newscaster/security_unit/directional/north, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "akr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 4 @@ -1649,7 +1649,7 @@ dir = 5 }, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "akB" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -1699,7 +1699,7 @@ pixel_y = 6 }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "akM" = ( /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{ dir = 6 @@ -1927,7 +1927,7 @@ name = "Premium Cozy Chair" }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "aml" = ( /obj/machinery/button/door{ desc = "A remote control switch for the brig exterior doors."; @@ -2740,7 +2740,7 @@ /obj/structure/filingcabinet/security, /obj/machinery/light/directional/west, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "apY" = ( /obj/structure/closet/secure_closet/personal/cabinet, /turf/open/floor/carpet, @@ -2756,7 +2756,7 @@ /obj/item/storage/secure/briefcase, /obj/item/pen/fourcolor, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "aqc" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -2994,11 +2994,11 @@ pixel_y = 9 }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "arb" = ( /obj/structure/filingcabinet/medical, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "arf" = ( /turf/closed/wall, /area/commons/dorms) @@ -3131,7 +3131,7 @@ dir = 4 }, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "arI" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 @@ -3183,7 +3183,7 @@ dir = 1 }, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "arW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 10 @@ -3204,7 +3204,7 @@ /obj/structure/filingcabinet/employment, /obj/machinery/firealarm/directional/west, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "asb" = ( /obj/structure/trash_pile, /turf/open/floor/plating, @@ -3865,7 +3865,7 @@ "aui" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "auj" = ( /obj/machinery/portable_atmospherics/canister, /turf/open/floor/engine/vacuum, @@ -6600,12 +6600,12 @@ pixel_y = 32 }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "aDF" = ( /obj/machinery/photocopier, /obj/machinery/airalarm/directional/east, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "aDG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 4 @@ -7347,7 +7347,7 @@ pixel_y = -2 }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "aGr" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/blue{ @@ -7815,7 +7815,7 @@ /obj/structure/closet/secure_closet/nanotrasen_representative/station, /obj/item/clothing/under/rank/centcom/intern, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "aHP" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -8189,7 +8189,7 @@ "aJf" = ( /obj/structure/cable, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "aJg" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 27 @@ -8237,7 +8237,7 @@ "aJl" = ( /obj/structure/awaymissions/wildwest/masterclock, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "aJm" = ( /obj/structure/sink/kitchen{ pixel_y = 28 @@ -36480,7 +36480,7 @@ /area/maintenance/port) "dfJ" = ( /turf/closed/wall/r_wall, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "dgj" = ( /obj/structure/chair/plastic{ dir = 1 @@ -39704,7 +39704,7 @@ /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "gwD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 1 @@ -52999,7 +52999,7 @@ dir = 8 }, /turf/open/floor/carpet/green, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "teG" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -55165,7 +55165,7 @@ }, /obj/structure/cable, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/NTREP) +/area/command/heads_quarters/captain/private/nt_rep) "vcc" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 5751f369226..2a4db3c8e0e 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -152,7 +152,7 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list( QDEL_LIST(toggleable_inventory) //SKYRAT EDIT ADDITION BEGIN - ERP_SLOT_SYSTEM - QDEL_LIST(ERP_toggleable_inventory) // Destroy ERP stuff + QDEL_LIST(erp_toggleable_inventory) // Destroy ERP stuff //SKYRAT EDIT ADDITION END QDEL_LIST(hotkeybuttons) throw_icon = null @@ -211,8 +211,8 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list( if(toggleable_inventory.len && screenmob.hud_used && screenmob.hud_used.inventory_shown) screenmob.client.screen += toggleable_inventory //SKYRAT EDIT ADDITION BEGIN - ERP_SLOT_SYSTEM - if(ERP_toggleable_inventory.len && screenmob.hud_used && screenmob.hud_used.ERP_inventory_shown && screenmob.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy)) - screenmob.client.screen += ERP_toggleable_inventory + if(erp_toggleable_inventory.len && screenmob.hud_used && screenmob.hud_used.ERP_inventory_shown && screenmob.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy)) + screenmob.client.screen += erp_toggleable_inventory //SKYRAT EDIT ADDITION END if(hotkeybuttons.len && !hotkey_ui_hidden) screenmob.client.screen += hotkeybuttons @@ -231,8 +231,8 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list( if(toggleable_inventory.len) screenmob.client.screen -= toggleable_inventory //SKYRAT EDIT ADDITION BEGIN - ERP_SLOT_SYSTEM - if(ERP_toggleable_inventory.len && screenmob.hud_used && screenmob.hud_used.ERP_inventory_shown && screenmob.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy)) - screenmob.client.screen -= ERP_toggleable_inventory + if(erp_toggleable_inventory.len && screenmob.hud_used && screenmob.hud_used.ERP_inventory_shown && screenmob.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy)) + screenmob.client.screen -= erp_toggleable_inventory //SKYRAT EDIT ADDITION END if(hotkeybuttons.len) screenmob.client.screen -= hotkeybuttons @@ -256,7 +256,7 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list( screenmob.client.screen -= toggleable_inventory //SKYRAT EDIT ADDITION BEGIN - ERP_SLOT_SYSTEM if(toggleable_inventory.len && screenmob.hud_used && screenmob.hud_used.ERP_inventory_shown && screenmob.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy)) - screenmob.client.screen -= ERP_toggleable_inventory + screenmob.client.screen -= erp_toggleable_inventory //SKYRAT EDIT ADDITION END if(hotkeybuttons.len) screenmob.client.screen -= hotkeybuttons @@ -327,7 +327,7 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list( if (initial(erp_ui_style) || erp_ui_style == new_erp_ui_style) return - for(var/atom/item in ERP_toggleable_inventory) + for(var/atom/item in erp_toggleable_inventory) if (item.icon == erp_ui_style) item.icon = new_erp_ui_style diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index ced4f51fe0f..df48f4c94bc 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -26,7 +26,7 @@ for (var/atom/movable/screen/human/using in targetmob.hud_used.static_inventory) if(using.screen_loc == ui_erp_inventory) using.screen_loc = ui_erp_inventory_up // Move up ERP inventory button - for (var/atom/movable/screen/inventory/inv in targetmob.hud_used.ERP_toggleable_inventory) + for (var/atom/movable/screen/inventory/inv in targetmob.hud_used.erp_toggleable_inventory) // Move up ERP hud slots if(inv.screen_loc == ui_vagina_down) inv.screen_loc = ui_vagina @@ -40,7 +40,7 @@ for (var/atom/movable/screen/human/using in targetmob.hud_used.static_inventory) if(using.screen_loc == ui_erp_inventory_up) using.screen_loc = ui_erp_inventory // Move down ERP inventory button - for (var/atom/movable/screen/inventory/inv in targetmob.hud_used.ERP_toggleable_inventory) + for (var/atom/movable/screen/inventory/inv in targetmob.hud_used.erp_toggleable_inventory) // Move up ERP hud slots if(inv.screen_loc == ui_vagina) inv.screen_loc = ui_vagina_down @@ -234,7 +234,7 @@ static_inventory += using //SKYRAT EDIT ADDITION BEGIN - ERP_SLOT_SYSTEM - using = new /atom/movable/screen/human/ERP_toggle() + using = new /atom/movable/screen/human/erp_toggle() using.icon = ui_style using.screen_loc = ui_erp_inventory using.hud = src @@ -313,7 +313,7 @@ inv_box.screen_loc = ui_vagina_down inv_box.slot_id = ITEM_SLOT_VAGINA inv_box.hud = src - ERP_toggleable_inventory += inv_box + erp_toggleable_inventory += inv_box inv_box = new /atom/movable/screen/inventory() inv_box.name = "anus" @@ -322,7 +322,7 @@ inv_box.screen_loc = ui_anus_down inv_box.slot_id = ITEM_SLOT_ANUS inv_box.hud = src - ERP_toggleable_inventory += inv_box + erp_toggleable_inventory += inv_box inv_box = new /atom/movable/screen/inventory() inv_box.name = "nipples" @@ -331,7 +331,7 @@ inv_box.screen_loc = ui_nipples_down inv_box.slot_id = ITEM_SLOT_NIPPLES inv_box.hud = src - ERP_toggleable_inventory += inv_box + erp_toggleable_inventory += inv_box inv_box = new /atom/movable/screen/inventory() inv_box.name = "penis" @@ -340,7 +340,7 @@ inv_box.screen_loc = ui_penis_down inv_box.slot_id = ITEM_SLOT_PENIS inv_box.hud = src - ERP_toggleable_inventory += inv_box + erp_toggleable_inventory += inv_box //SKYRAT EDIT ADDITION END throw_icon = new /atom/movable/screen/throw_catch() diff --git a/modular_skyrat/modules/customization/modules/client/preferences.dm b/modular_skyrat/modules/customization/modules/client/preferences.dm index 607c852dfc8..f4611de87ac 100644 --- a/modular_skyrat/modules/customization/modules/client/preferences.dm +++ b/modular_skyrat/modules/customization/modules/client/preferences.dm @@ -2229,8 +2229,8 @@ GLOBAL_LIST_INIT(food, list( sextoys_pref = "Yes" // User set ERP pref to "Yes", make the ERP button of the inventory visible and interactive again if(user.hud_used) - for(var/atom/movable/screen/human/ERP_toggle/E in user.hud_used.static_inventory) - if(istype(E, /atom/movable/screen/human/ERP_toggle)) + for(var/atom/movable/screen/human/erp_toggle/E in user.hud_used.static_inventory) + if(istype(E, /atom/movable/screen/human/erp_toggle)) E.invisibility = 0 // Perform standard inventory updates if("Yes") @@ -2249,10 +2249,10 @@ GLOBAL_LIST_INIT(food, list( if(user.hud_used) if(user.hud_used.ERP_inventory_shown) user.hud_used.ERP_inventory_shown = FALSE - user.client.screen -= user.hud_used.ERP_toggleable_inventory + user.client.screen -= user.hud_used.erp_toggleable_inventory // Find the ERP button of the inventory and make it invisible so that the user cannot interact with it - for(var/atom/movable/screen/human/ERP_toggle/E in user.hud_used.static_inventory) - if(istype(E, /atom/movable/screen/human/ERP_toggle)) + for(var/atom/movable/screen/human/erp_toggle/E in user.hud_used.static_inventory) + if(istype(E, /atom/movable/screen/human/erp_toggle)) E.invisibility = 100 user.hud_used.hidden_inventory_update(user) user.hud_used.persistent_inventory_update(user) diff --git a/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm b/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm index 3490b11b112..1838cbb6c60 100644 --- a/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm +++ b/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm @@ -95,7 +95,7 @@ /obj/item/storage/hypospraykit/cmo/PopulateContents() if(empty) return - new /obj/item/hypospray/mkii/CMO(src) + new /obj/item/hypospray/mkii/cmo(src) new /obj/item/reagent_containers/glass/vial/large/multiver(src) new /obj/item/reagent_containers/glass/vial/large/salglu(src) new /obj/item/reagent_containers/glass/vial/large/synthflesh(src) diff --git a/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm b/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm index 4ce49f6d3f5..94aafc6415a 100644 --- a/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm +++ b/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm @@ -45,7 +45,7 @@ //Does it go through hardsuits? var/penetrates = null -/obj/item/hypospray/mkii/CMO +/obj/item/hypospray/mkii/cmo name = "hypospray mk.II deluxe" allowed_containers = list(/obj/item/reagent_containers/glass/vial/small, /obj/item/reagent_containers/glass/vial/large) icon_state = "cmo2" diff --git a/modular_skyrat/modules/implants/code/medical_designs.dm b/modular_skyrat/modules/implants/code/medical_designs.dm index 2fef70aa0b5..79c23cb873d 100644 --- a/modular_skyrat/modules/implants/code/medical_designs.dm +++ b/modular_skyrat/modules/implants/code/medical_designs.dm @@ -42,7 +42,7 @@ category = list("Misc", "Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL -/datum/design/cyberimp_NV +/datum/design/cyberimp_nv name = "Night Vision Eyes" desc = "These cybernetic eyes will give you Night Vision. Big, mean, and green." id = "ci-nv" diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm index 77c40e20810..ff8e2d3bb0c 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm @@ -54,7 +54,7 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su name = "Purple Apron" item_path = /obj/item/clothing/suit/apron/purple_bartender -/datum/loadout_item/suit/Suspenders_blue +/datum/loadout_item/suit/suspenders_blue name = "Blue Suspenders" item_path = /obj/item/clothing/suit/toggle/suspenders/blue diff --git a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm index f7f390fe452..94daf9a79eb 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm @@ -551,7 +551,7 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Black Tango Dress" item_path = /obj/item/clothing/under/dress/blacktango -/datum/loadout_item/under/formal/Black_twopiece +/datum/loadout_item/under/formal/black_twopiece name = "Black Two-Piece Suit" item_path = /obj/item/clothing/under/suit/blacktwopiece @@ -796,7 +796,7 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Trekkie ENT Medsci Uniform" item_path = /obj/item/clothing/under/trek/medsci/ent -/datum/loadout_item/under/formal/the_Q +/datum/loadout_item/under/formal/the_q name = "French Marshall's Uniform" item_path = /obj/item/clothing/under/trek/q diff --git a/modular_skyrat/modules/mapping/code/rockplanet_mobs.dm b/modular_skyrat/modules/mapping/code/rockplanet_mobs.dm index 5176ad96324..99f804000b6 100644 --- a/modular_skyrat/modules/mapping/code/rockplanet_mobs.dm +++ b/modular_skyrat/modules/mapping/code/rockplanet_mobs.dm @@ -45,7 +45,7 @@ . = ..() if(pick(1-10) == 1) corpse = new(src) - corpse.outfit = pick(/datum/outfit/Lost_Husk_A, /datum/outfit/Lost_Husk_B, /datum/outfit/Lost_Husk_C) //I wish I could randomly select from uniform options but I guess this works + corpse.outfit = pick(/datum/outfit/lost_husk_a, /datum/outfit/lost_husk_b, /datum/outfit/lost_husk_c) //I wish I could randomly select from uniform options but I guess this works corpse.forceMove(drop_location()) corpse.create() else @@ -54,18 +54,18 @@ //Also the Lost Husk's outfit is raggy clothes :) -/datum/outfit/Lost_Husk_A +/datum/outfit/lost_husk_a name = "Lost Husk A" uniform = /obj/item/clothing/under/pants/jeanripped r_pocket = /obj/item/storage/wallet/random -/datum/outfit/Lost_Husk_B +/datum/outfit/lost_husk_b name = "Lost Husk B" uniform = /obj/item/clothing/under/rank/civilian/linen l_pocket = /obj/item/storage/wallet/random r_pocket = /obj/item/flashlight/glowstick -/datum/outfit/Lost_Husk_C +/datum/outfit/lost_husk_c name = "Lost Husk C" uniform = /obj/item/clothing/under/pants/khaki suit = /obj/item/clothing/suit/hawaiian_green diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm b/modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm index 1eb700e6674..24a898b2ad4 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm @@ -605,7 +605,7 @@ //screen alert -/atom/movable/screen/alert/aroused_X +/atom/movable/screen/alert/aroused_x name = "Aroused" desc = "It's a little hot in here" icon = 'modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_items/lewd_icons.dmi' @@ -615,44 +615,44 @@ var/pain_level = "small" var/pleasure_level = "small" -/atom/movable/screen/alert/aroused_X/Initialize() +/atom/movable/screen/alert/aroused_x/Initialize() .=..() pain_overlay = update_pain() pleasure_overlay = update_pleasure() -/atom/movable/screen/alert/aroused_X/proc/update_pain() +/atom/movable/screen/alert/aroused_x/proc/update_pain() if(pain_level) return mutable_appearance('modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_items/lewd_icons.dmi', "pain_[pain_level]") -/atom/movable/screen/alert/aroused_X/proc/update_pleasure() +/atom/movable/screen/alert/aroused_x/proc/update_pleasure() if(pleasure_level) return mutable_appearance('modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_items/lewd_icons.dmi', "pleasure_[pleasure_level]") -/datum/species/proc/throw_arousalalert(level, atom/movable/screen/alert/aroused_X/arousal_alert, mob/living/carbon/human/targeted_human) - targeted_human.throw_alert("aroused", /atom/movable/screen/alert/aroused_X) +/datum/species/proc/throw_arousalalert(level, atom/movable/screen/alert/aroused_x/arousal_alert, mob/living/carbon/human/targeted_human) + targeted_human.throw_alert("aroused", /atom/movable/screen/alert/aroused_x) arousal_alert?.icon_state = level arousal_alert?.update_icon() -/datum/species/proc/overlay_pain(level, atom/movable/screen/alert/aroused_X/arousal_alert) +/datum/species/proc/overlay_pain(level, atom/movable/screen/alert/aroused_x/arousal_alert) arousal_alert?.cut_overlay(arousal_alert.pain_overlay) arousal_alert?.pain_level = level arousal_alert?.pain_overlay = arousal_alert.update_pain() arousal_alert?.add_overlay(arousal_alert.pain_overlay) arousal_alert?.update_overlays() -/datum/species/proc/overlay_pleasure(level, atom/movable/screen/alert/aroused_X/arousal_alert) +/datum/species/proc/overlay_pleasure(level, atom/movable/screen/alert/aroused_x/arousal_alert) arousal_alert?.cut_overlay(arousal_alert.pleasure_overlay) arousal_alert?.pleasure_level = level arousal_alert?.pleasure_overlay = arousal_alert.update_pleasure() arousal_alert?.add_overlay(arousal_alert.pleasure_overlay) arousal_alert?.update_overlays() -/datum/species/proc/handle_arousal(mob/living/carbon/human/target_human, atom/movable/screen/alert/aroused_X) - var/atom/movable/screen/alert/aroused_X/arousal_alert = target_human.alerts["aroused"] +/datum/species/proc/handle_arousal(mob/living/carbon/human/target_human, atom/movable/screen/alert/aroused_x) + var/atom/movable/screen/alert/aroused_x/arousal_alert = target_human.alerts["aroused"] if(target_human.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy)) switch(target_human.arousal) if(-100 to 1) - target_human.clear_alert("aroused", /atom/movable/screen/alert/aroused_X) + target_human.clear_alert("aroused", /atom/movable/screen/alert/aroused_x) if(1 to 25) throw_arousalalert("arousal_small", arousal_alert, target_human) if(25 to 50) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/technical_stuff_for_lewd.dm b/modular_skyrat/modules/modular_items/lewd_items/code/technical_stuff_for_lewd.dm index 5cf7c4e4304..91f80eafb65 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/technical_stuff_for_lewd.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/technical_stuff_for_lewd.dm @@ -903,16 +903,16 @@ // Add to hud class additional ERP variable boolean for check inventiry status (equipped or not) /datum/hud - var/list/ERP_toggleable_inventory = list() //the screen ERP objects which can be hidden + var/list/erp_toggleable_inventory = list() //the screen ERP objects which can be hidden var/ERP_inventory_shown = FALSE //Equipped item ERP inventory // Define additional button for ERP hud slots for expand/collapse like default inventory -/atom/movable/screen/human/ERP_toggle - name = "ERP_toggle" +/atom/movable/screen/human/erp_toggle + name = "erp_toggle" icon_state = "toggle" // ERP inventory button logic. Just expand/collapse -/atom/movable/screen/human/ERP_toggle/Click() +/atom/movable/screen/human/erp_toggle/Click() var/mob/targetmob = usr @@ -923,10 +923,10 @@ if(usr.hud_used.ERP_inventory_shown && targetmob.hud_used) usr.hud_used.ERP_inventory_shown = FALSE - usr.client.screen -= targetmob.hud_used.ERP_toggleable_inventory + usr.client.screen -= targetmob.hud_used.erp_toggleable_inventory else usr.hud_used.ERP_inventory_shown = TRUE - usr.client.screen += targetmob.hud_used.ERP_toggleable_inventory + usr.client.screen += targetmob.hud_used.erp_toggleable_inventory targetmob.hud_used.hidden_inventory_update(usr) @@ -1207,8 +1207,8 @@ GLOBAL_LIST_INIT(strippable_human_erp_items, create_erp_strippable_list(list( . = ..() if(client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy)) if(client.mob.hud_used) - for(var/atom/movable/screen/human/ERP_toggle/E in client.mob.hud_used.static_inventory) - if(istype(E, /atom/movable/screen/human/ERP_toggle)) + for(var/atom/movable/screen/human/erp_toggle/E in client.mob.hud_used.static_inventory) + if(istype(E, /atom/movable/screen/human/erp_toggle)) E.invisibility = 0 else if(ishuman(client.mob)) @@ -1224,10 +1224,10 @@ GLOBAL_LIST_INIT(strippable_human_erp_items, create_erp_strippable_list(list( if(client.mob.hud_used) if(client.mob.hud_used.ERP_inventory_shown) client.mob.hud_used.ERP_inventory_shown = FALSE - client.screen -= client.mob.hud_used.ERP_toggleable_inventory + client.screen -= client.mob.hud_used.erp_toggleable_inventory - for(var/atom/movable/screen/human/ERP_toggle/E in client.mob.hud_used.static_inventory) - if(istype(E, /atom/movable/screen/human/ERP_toggle)) + for(var/atom/movable/screen/human/erp_toggle/E in client.mob.hud_used.static_inventory) + if(istype(E, /atom/movable/screen/human/erp_toggle)) E.invisibility = 100 diff --git a/modular_skyrat/modules/nanotrasen_rep/code/Space_Station_13_areas.dm b/modular_skyrat/modules/nanotrasen_rep/code/Space_Station_13_areas.dm index 4903e3fce1d..2fa74352cea 100644 --- a/modular_skyrat/modules/nanotrasen_rep/code/Space_Station_13_areas.dm +++ b/modular_skyrat/modules/nanotrasen_rep/code/Space_Station_13_areas.dm @@ -1,4 +1,4 @@ -/area/command/heads_quarters/captain/private/NTREP +/area/command/heads_quarters/captain/private/nt_rep name = "Nanotrasen Representative's Office" icon_state = "centcom"