diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_alien_nest.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_alien_nest.dmm
index 1ea3f19c62..862c745f81 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_alien_nest.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_alien_nest.dmm
@@ -70,7 +70,7 @@
/obj/structure/alien/weeds,
/obj/item/clothing/mask/facehugger/impregnated,
/obj/item/clothing/glasses/night,
-/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/effect/decal/cleanable/blood/old,
/obj/item/clothing/under/syndicate/tacticool,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
index 2ec5b88792..b22c9787ba 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -526,8 +526,8 @@
/obj/structure/closet/crate/secure/gear{
req_access_txt = "150"
},
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/tackler/combat/insulated,
+/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/under/syndicate/combat,
/obj/item/clothing/under/syndicate/combat,
/obj/item/storage/belt/military,
@@ -4197,7 +4197,7 @@
"kw" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/gloves/combat{
+/obj/item/clothing/gloves/tackler/combat/insulated{
pixel_y = -6
},
/obj/item/tank/internals/emergency_oxygen{
diff --git a/_maps/RandomRuins/SpaceRuins/advancedlab.dmm b/_maps/RandomRuins/SpaceRuins/advancedlab.dmm
index 66a3d4e55d..b553bb5c97 100644
--- a/_maps/RandomRuins/SpaceRuins/advancedlab.dmm
+++ b/_maps/RandomRuins/SpaceRuins/advancedlab.dmm
@@ -185,7 +185,7 @@
name = "Clothes"
},
/obj/item/clothing/head/chameleon,
-/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/suit/chameleon,
/obj/item/clothing/under/chameleon,
/obj/item/clothing/shoes/chameleon,
@@ -221,7 +221,7 @@
},
/obj/item/clothing/under/rank/centcom/commander,
/obj/item/clothing/head/centhat,
-/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/suit/armor/vest,
/obj/item/clothing/shoes/sneakers/brown,
/turf/open/floor/wood,
diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
index bf4f0dbfa6..a4c60023e8 100644
--- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -2202,11 +2202,11 @@
/area/ruin/space/has_grav/deepstorage/armory)
"eO" = (
/obj/structure/table,
-/obj/item/clothing/gloves/combat{
+/obj/item/clothing/gloves/tackler/combat/insulated{
pixel_x = -3;
pixel_y = 4
},
-/obj/item/clothing/gloves/combat{
+/obj/item/clothing/gloves/tackler/combat/insulated{
pixel_x = 3;
pixel_y = -2
},
diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm
index 97ebb80101..de0b7cc430 100644
--- a/_maps/RandomZLevels/Academy.dmm
+++ b/_maps/RandomZLevels/Academy.dmm
@@ -4322,7 +4322,7 @@
/turf/open/floor/plating/asteroid/snow,
/area/awaymission/academy/academycellar)
"mV" = (
-/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/tackler/combat/insulated,
/turf/open/floor/plating/asteroid/snow,
/area/awaymission/academy/academycellar)
"mW" = (
diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm
index 66d7f556b4..ca44e7d7b7 100644
--- a/_maps/RandomZLevels/spacebattle.dmm
+++ b/_maps/RandomZLevels/spacebattle.dmm
@@ -243,7 +243,7 @@
/area/awaymission/spacebattle/syndicate1)
"bg" = (
/obj/structure/table/reinforced,
-/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/tackler/combat/insulated,
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate1)
"bh" = (
diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm
index 28eded5c85..dbc857dfd7 100644
--- a/_maps/map_files/CogStation/CogStation.dmm
+++ b/_maps/map_files/CogStation/CogStation.dmm
@@ -705,6 +705,7 @@
/obj/item/circuitboard/machine/vending/donksofttoyvendor,
/obj/item/storage/pill_bottle/happy,
/obj/effect/decal/cleanable/dirt,
+/obj/item/paper/fluff/cogstation/cluwne,
/turf/open/floor/plating,
/area/crew_quarters/theatre/clown)
"abJ" = (
@@ -800,24 +801,11 @@
/turf/closed/wall/r_wall,
/area/router/aux)
"abX" = (
-/obj/machinery/computer/secure_data,
-/obj/effect/turf_decal/tile/red{
- dir = 4
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-2"
},
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/machinery/camera{
- c_tag = "Security Checkpoint";
- pixel_x = 22
- },
-/obj/machinery/newscaster/security_unit{
- pixel_y = 32
- },
-/turf/open/floor/plasteel,
+/turf/open/floor/plating,
/area/security/checkpoint)
"abY" = (
/obj/structure/grille,
@@ -1523,9 +1511,9 @@
dir = 1
},
/obj/structure/closet,
-/obj/item/clothing/under/staffassistant,
-/obj/item/clothing/under/staffassistant,
-/obj/item/clothing/under/staffassistant,
+/obj/item/clothing/under/misc/staffassistant,
+/obj/item/clothing/under/misc/staffassistant,
+/obj/item/clothing/under/misc/staffassistant,
/turf/open/floor/plasteel,
/area/crew_quarters/lounge)
"adK" = (
@@ -3511,9 +3499,9 @@
c_tag = "Clown's Office";
pixel_x = 22
},
-/obj/item/clothing/under/rank/yellowclown,
-/obj/item/clothing/under/rank/blueclown,
-/obj/item/clothing/under/rank/greenclown,
+/obj/item/clothing/under/rank/civilian/clown/yellow,
+/obj/item/clothing/under/rank/civilian/clown/blue,
+/obj/item/clothing/under/rank/civilian/clown/green,
/obj/item/toy/crayon/spraycan/lubecan,
/obj/item/megaphone/clown,
/turf/open/floor/plating,
@@ -4141,20 +4129,12 @@
/turf/open/floor/plasteel,
/area/construction/secondary)
"akd" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
+/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "0-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel,
+/obj/structure/cable,
+/turf/open/floor/plating,
/area/security/checkpoint)
"ake" = (
/obj/machinery/firealarm{
@@ -4809,6 +4789,7 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
+/obj/item/paper/guides/cogstation/letter_sec,
/turf/open/floor/plasteel,
/area/security/warden)
"alG" = (
@@ -6070,8 +6051,27 @@
/turf/open/floor/plasteel/dark/corner,
/area/hallway/secondary/entry)
"aoy" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
+/obj/machinery/computer/secure_data,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/camera{
+ c_tag = "Security Checkpoint";
+ pixel_x = 22
+ },
+/obj/machinery/newscaster/security_unit{
+ pixel_y = 32
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
/area/security/checkpoint)
"aoz" = (
/obj/structure/closet,
@@ -7342,7 +7342,7 @@
pixel_y = 26
},
/obj/effect/landmark/start/bartender,
-/obj/item/clothing/under/janimaid,
+/obj/item/clothing/under/costume/maid,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/bar)
@@ -8418,6 +8418,7 @@
/obj/item/storage/bag/tray,
/obj/item/clothing/gloves/color/white,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/item/paper/guides/cogstation/cooks,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"atP" = (
@@ -9400,12 +9401,19 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/barbershop)
"avY" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "AIShutter";
- name = "AI Core Shutters"
+/obj/machinery/newscaster/security_unit{
+ pixel_y = 32
},
-/turf/open/floor/plating,
+/obj/machinery/turretid{
+ name = "AI Chamber turret control";
+ pixel_x = 5;
+ pixel_y = -24
+ },
+/obj/machinery/door/window/westleft{
+ name = "AI Core Access";
+ req_access_txt = "65"
+ },
+/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
"avZ" = (
/obj/effect/landmark/start/cook,
@@ -9528,13 +9536,15 @@
/turf/closed/wall/r_wall,
/area/maintenance/solars/port)
"awn" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "AIShutter";
- name = "AI Core Shutters"
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#e8eaff"
},
/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
+/obj/machinery/ai_slipper{
+ uses = 10
+ },
+/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
"awo" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -10387,11 +10397,16 @@
/turf/open/floor/plasteel,
/area/hydroponics/lobby)
"axZ" = (
-/obj/machinery/light{
- dir = 1;
- light_color = "#e8eaff"
+/obj/machinery/requests_console{
+ department = "AI";
+ departmentType = 5;
+ pixel_x = 0;
+ pixel_y = 28
+ },
+/obj/machinery/door/window/eastright{
+ name = "AI Core Access";
+ req_access_txt = "65"
},
-/obj/structure/disposalpipe/segment,
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
"aya" = (
@@ -11286,9 +11301,9 @@
"azR" = (
/obj/structure/closet/secure_closet/bar,
/obj/structure/disposalpipe/segment,
-/obj/item/clothing/under/janimaid,
+/obj/item/clothing/under/costume/maid,
/obj/item/stack/spacecash/c10,
-/obj/item/clothing/under/waiter,
+/obj/item/clothing/under/suit/waiter,
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/bar)
"azS" = (
@@ -11768,27 +11783,31 @@
/turf/closed/wall,
/area/crew_quarters/toilet)
"aAP" = (
-/obj/effect/turf_decal/tile/red,
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/security/brig)
+"aAQ" = (
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/obj/structure/disposalpipe/segment{
- dir = 4
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/structure/cable{
+ icon_state = "2-8"
},
/turf/open/floor/plasteel,
-/area/security/brig)
-"aAQ" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
- name = "Security Office";
- req_access_txt = "63"
- },
-/obj/effect/turf_decal/delivery,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/security/main)
+/area/security/checkpoint)
"aAR" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
@@ -12361,11 +12380,20 @@
/turf/open/floor/plating,
/area/security/main)
"aCb" = (
-/obj/effect/spawner/structure/window/reinforced,
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel,
/area/security/brig)
"aCc" = (
/obj/structure/closet/secure_closet/security/sec,
@@ -12680,6 +12708,7 @@
/obj/item/stack/packageWrap,
/obj/item/hand_labeler,
/obj/item/book/manual/wiki/security_space_law,
+/obj/item/paper/guides/cogstation/letter_sec,
/turf/open/floor/carpet/red,
/area/security/brig)
"aCM" = (
@@ -12867,9 +12896,11 @@
/area/crew_quarters/barbershop)
"aDb" = (
/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
/turf/open/floor/plating,
-/area/security/main)
+/area/security/checkpoint)
"aDc" = (
/obj/machinery/firealarm{
dir = 4;
@@ -12972,16 +13003,19 @@
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
"aDm" = (
-/obj/structure/table,
-/obj/machinery/recharger,
+/obj/machinery/computer/security{
+ dir = 1
+ },
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 8
},
-/obj/structure/cable{
- icon_state = "1-4"
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/plasteel,
/area/security/checkpoint)
"aDn" = (
@@ -13176,19 +13210,23 @@
/area/maintenance/port/fore)
"aDF" = (
/obj/structure/table,
-/obj/machinery/firealarm{
- pixel_y = 26
- },
+/obj/machinery/recharger,
+/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
- dir = 4
+ dir = 8
},
-/obj/effect/turf_decal/tile/red{
- dir = 1
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/item/paper_bin,
-/obj/item/pen,
/turf/open/floor/plasteel,
-/area/security/main)
+/area/security/checkpoint)
"aDG" = (
/obj/machinery/holopad,
/turf/open/floor/plasteel,
@@ -13340,18 +13378,26 @@
/turf/open/floor/plating/airless,
/area/space/nearstation)
"aEc" = (
-/obj/structure/closet{
- name = "Evidence Closet 5"
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security/glass{
+ name = "Security Office";
+ req_access_txt = "63"
},
-/obj/machinery/light_switch{
- pixel_y = -24
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- dir = 8
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
},
/turf/open/floor/plasteel,
/area/security/brig)
@@ -13839,7 +13885,7 @@
"aFc" = (
/obj/structure/table,
/obj/item/clothing/suit/toggle/owlwings,
-/obj/item/clothing/under/owl,
+/obj/item/clothing/under/costume/owl,
/obj/item/clothing/mask/gas/owl_mask,
/turf/open/floor/plating/asteroid,
/area/hydroponics/garden{
@@ -13904,12 +13950,11 @@
/turf/closed/wall/r_wall,
/area/crew_quarters/heads/hos)
"aFk" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/plasteel,
-/area/security/main)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/security/checkpoint)
"aFl" = (
/obj/structure/chair/sofa/right,
/obj/effect/turf_decal/tile/green{
@@ -14215,10 +14260,18 @@
/turf/open/floor/plasteel,
/area/storage/emergency/generic)
"aFP" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plating,
-/area/security/checkpoint)
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security/glass{
+ name = "Security Office";
+ req_access_txt = "63"
+ },
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel,
+/area/security/main)
"aFQ" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
@@ -14241,11 +14294,17 @@
/turf/open/floor/plasteel,
/area/storage/emergency/generic)
"aFT" = (
-/obj/structure/cable{
- icon_state = "0-2";
- pixel_y = 1
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
},
-/turf/closed/wall,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
/area/security/brig)
"aFU" = (
/obj/machinery/atmospherics/components/binary/circulator/cold{
@@ -15134,17 +15193,14 @@
/turf/open/floor/plasteel/dark,
/area/bridge)
"aHE" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
- pixel_x = -6;
- pixel_y = 2
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/obj/item/reagent_containers/food/drinks/drinkingglass{
- pixel_x = 6;
- pixel_y = 3
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
},
-/turf/open/floor/plasteel/dark,
-/area/bridge)
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"aHF" = (
/turf/open/floor/plasteel/dark,
/area/bridge)
@@ -15191,7 +15247,7 @@
},
/area/chapel/main)
"aHK" = (
-/obj/structure/piano,
+/obj/structure/musician/piano,
/turf/open/floor/carpet{
icon_state = "carpetsymbol"
},
@@ -15630,34 +15686,71 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/civilian)
"aIC" = (
-/obj/structure/disposalpipe/segment{
- dir = 5
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "0-8"
},
-/turf/open/floor/plasteel/grimy,
-/area/security/detectives_office)
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/security/main)
"aID" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-8"
},
-/turf/open/floor/plasteel/grimy,
-/area/security/detectives_office)
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/security/main)
"aIE" = (
/turf/open/floor/carpet/royalblue,
/area/bridge)
"aIF" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/disposalpipe/segment{
+/obj/structure/table,
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/structure/noticeboard{
+ pixel_y = 28
+ },
+/obj/effect/turf_decal/tile/red{
dir = 4
},
-/turf/open/floor/plasteel/grimy,
-/area/security/detectives_office)
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/recharger,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/main)
"aIG" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/disposalpipe/segment{
+/obj/structure/table,
+/obj/machinery/firealarm{
+ pixel_y = 26
+ },
+/obj/effect/turf_decal/tile/red{
dir = 4
},
-/turf/open/floor/plating,
-/area/security/detectives_office)
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/main)
"aIH" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 6
@@ -15752,14 +15845,42 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"aIS" = (
+/obj/structure/disposalpipe/segment,
/obj/effect/landmark/start/ai,
+/obj/item/radio/intercom{
+ freerange = 1;
+ frequency = 1447;
+ name = "Private Channel";
+ pixel_x = 27;
+ pixel_y = -7
+ },
+/obj/item/radio/intercom{
+ freerange = 1;
+ name = "Common Channel";
+ pixel_x = 27;
+ pixel_y = 5
+ },
/obj/machinery/button/door{
id = "AIShutter";
layer = 3.6;
name = "AI Core Shutter Control";
- pixel_x = 24
+ pixel_x = 24;
+ pixel_y = -24
+ },
+/obj/item/radio/intercom{
+ freerange = 1;
+ listening = 0;
+ name = "Custom Channel";
+ pixel_x = -24;
+ pixel_y = -8
+ },
+/obj/machinery/button/door{
+ id = "AIChamberShutter";
+ layer = 3.6;
+ name = "AI Chamber Shutter Control";
+ pixel_x = -24;
+ pixel_y = -24
},
-/obj/structure/disposalpipe/segment,
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
"aIT" = (
@@ -15918,14 +16039,23 @@
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"aJj" = (
-/obj/machinery/light{
- dir = 1
+/obj/structure/chair{
+ dir = 4
},
-/obj/machinery/light_switch{
- pixel_y = 24
+/obj/structure/cable,
+/obj/structure/cable{
+ icon_state = "1-4"
},
-/turf/open/floor/plasteel/dark,
-/area/chapel/office)
+/obj/machinery/power/apc{
+ areastring = "/area/maintenance/aft";
+ dir = 8;
+ name = "Chapel APC";
+ pixel_x = -26
+ },
+/turf/open/floor/plasteel{
+ icon_state = "chapel"
+ },
+/area/chapel/main)
"aJk" = (
/obj/structure/table/wood,
/obj/item/candle,
@@ -16429,11 +16559,21 @@
/turf/open/floor/carpet/red,
/area/security/brig)
"aKi" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/grimy,
-/area/security/detectives_office)
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/main)
"aKj" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 6
@@ -17300,25 +17440,12 @@
/turf/open/floor/plasteel,
/area/security/brig)
"aLX" = (
-/obj/structure/table,
-/obj/machinery/light{
- dir = 1
- },
-/obj/structure/noticeboard{
- pixel_y = 28
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/machinery/recharger,
+/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
- icon_state = "2-8"
+ icon_state = "0-2"
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plasteel,
+/obj/structure/cable,
+/turf/open/floor/plating,
/area/security/main)
"aLY" = (
/obj/effect/turf_decal/tile/red,
@@ -17718,13 +17845,12 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/civilian)
"aMN" = (
-/obj/effect/turf_decal/tile/red{
+/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- dir = 1
+/obj/structure/cable{
+ icon_state = "1-4"
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel,
/area/security/main)
"aMO" = (
@@ -17909,9 +18035,7 @@
/turf/open/floor/plasteel,
/area/bridge)
"aNh" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
"aNi" = (
@@ -17990,37 +18114,13 @@
/turf/open/floor/plasteel,
/area/crew_quarters/bar)
"aNo" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/structure/disposalpipe/segment,
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "AIShutter";
+ name = "AI Core Shutters"
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/item/aiModule/supplied/oxygen{
- pixel_x = 2;
- pixel_y = 10
- },
-/obj/item/aiModule/supplied/quarantine{
- pixel_x = 1;
- pixel_y = 8
- },
-/obj/item/aiModule/zeroth/oneHuman{
- pixel_y = 4
- },
-/obj/effect/spawner/lootdrop/aimodule_harmful{
- pixel_x = -1;
- pixel_y = 2
- },
-/obj/item/aiModule/supplied/protectStation{
- pixel_x = -2
- },
-/obj/structure/window/reinforced/spawner/north,
-/turf/open/floor/plasteel,
+/turf/open/floor/plating,
/area/ai_monitored/turret_protected/ai)
"aNp" = (
/obj/effect/turf_decal/delivery,
@@ -18038,17 +18138,11 @@
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"aNr" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/structure/window/reinforced/spawner/north,
-/turf/open/floor/plasteel,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
"aNs" = (
/obj/effect/turf_decal/tile/yellow{
@@ -18119,21 +18213,10 @@
},
/area/chapel/main)
"aNz" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
+ dir = 5
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/machinery/door/window/northleft{
- name = "AI Chamber";
- req_one_access_txt = "65"
- },
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/turf/open/floor/plasteel,
+/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
"aNA" = (
/obj/machinery/door/firedoor,
@@ -18407,6 +18490,9 @@
"aOe" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/ai)
"aOf" = (
@@ -18682,16 +18768,15 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"aOI" = (
-/obj/structure/chair/stool,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
+ dir = 10
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+/obj/machinery/flasher{
+ id = "ID";
+ pixel_x = 8;
+ pixel_y = 24
},
-/obj/structure/window/reinforced/spawner/north,
-/turf/open/floor/plasteel,
+/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
"aOJ" = (
/turf/closed/wall/r_wall,
@@ -18784,7 +18869,7 @@
/obj/effect/turf_decal/bot,
/obj/item/clothing/accessory/armband/hydro,
/obj/item/encryptionkey/headset_service,
-/obj/item/clothing/under/rank/vice,
+/obj/item/clothing/under/misc/vice_officer,
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
},
@@ -18859,21 +18944,13 @@
name = "Engine Room"
})
"aPf" = (
-/obj/machinery/computer/upload/ai{
- dir = 8
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 6
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/structure/window/reinforced/spawner/north,
-/turf/open/floor/plasteel,
+/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
"aPg" = (
/obj/structure/grille,
@@ -18976,15 +19053,15 @@
},
/area/hallway/primary/central)
"aPs" = (
-/obj/structure/closet/secure_closet/hop,
-/obj/machinery/light{
- dir = 1;
- light_color = "#e8eaff"
+/obj/effect/turf_decal/tile/red{
+ dir = 4
},
-/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit,
-/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt,
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/heads/hop)
+/obj/effect/turf_decal/tile/red,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/main)
"aPt" = (
/obj/structure/table/wood,
/obj/machinery/recharger,
@@ -19101,6 +19178,9 @@
pixel_y = 6
},
/obj/item/clothing/glasses/meson,
+/obj/machinery/status_display{
+ pixel_x = -32
+ },
/turf/open/floor/plasteel,
/area/ai_monitored/turret_protected/ai)
"aPF" = (
@@ -19245,30 +19325,40 @@
/turf/open/floor/plasteel/white,
/area/crew_quarters/fitness/cogpool)
"aPT" = (
-/obj/item/twohanded/required/kirbyplants{
- icon_state = "plant-02"
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
},
-/turf/open/floor/plasteel/dark,
-/area/bridge)
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"aPU" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin,
-/obj/machinery/camera{
- c_tag = "Bridge - Port Quarter";
- dir = 1
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-2"
},
-/obj/machinery/keycard_auth{
- pixel_y = -24
- },
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plating,
/area/bridge)
"aPV" = (
-/obj/machinery/photocopier,
-/turf/open/floor/plasteel/dark,
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
/area/bridge)
"aPW" = (
-/obj/structure/reagent_dispensers/water_cooler,
-/turf/open/floor/plasteel/dark,
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
/area/bridge)
"aPX" = (
/obj/structure/table,
@@ -20551,9 +20641,20 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/civilian)
"aSJ" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/crew_quarters/heads/captain)
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security/glass{
+ name = "Security Office";
+ req_access_txt = "63"
+ },
+/obj/effect/turf_decal/delivery,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/main)
"aSK" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -20819,11 +20920,16 @@
/turf/open/floor/plating,
/area/maintenance/department/eva)
"aTo" = (
-/obj/effect/landmark/start/captain,
-/turf/open/floor/carpet{
- icon_state = "carpetsymbol"
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/area/crew_quarters/heads/captain)
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/security/detectives_office)
"aTp" = (
/obj/structure/chair{
dir = 4
@@ -20856,17 +20962,24 @@
},
/area/chapel/main)
"aTr" = (
-/obj/structure/table/wood,
-/obj/machinery/recharger,
-/turf/open/floor/carpet/blue,
-/area/crew_quarters/heads/captain)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/security/detectives_office)
"aTs" = (
/turf/closed/wall,
/area/maintenance/department/eva)
"aTt" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/crew_quarters/heads/hop)
+/obj/structure/closet/secure_closet/detective,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
"aTu" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass{
@@ -20962,14 +21075,16 @@
/turf/closed/wall,
/area/router/public)
"aTH" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "0-8"
},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
- dir = 4
+/obj/structure/cable{
+ icon_state = "0-2"
},
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
+/turf/open/floor/plating,
+/area/bridge)
"aTI" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/line,
@@ -20985,16 +21100,12 @@
/turf/open/floor/plasteel,
/area/router/public)
"aTJ" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin,
-/obj/item/pen/fourcolor,
-/obj/item/pen/fountain{
- pixel_x = 2;
- pixel_y = 6
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/structure/cable{
+ icon_state = "1-4"
},
-/obj/item/stamp/hop,
-/turf/open/floor/carpet/green,
-/area/crew_quarters/heads/hop)
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
"aTK" = (
/obj/machinery/door/firedoor,
/obj/structure/cable{
@@ -21551,9 +21662,13 @@
/turf/open/floor/plasteel,
/area/science/mixing)
"aVa" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plating,
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"aVb" = (
/obj/structure/pool/Rboard,
@@ -22108,9 +22223,12 @@
/turf/open/floor/plasteel,
/area/gateway)
"aWn" = (
-/obj/structure/closet/secure_closet/detective,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"aWo" = (
@@ -22197,27 +22315,40 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aWw" = (
-/obj/structure/table/wood,
-/obj/item/pinpointer/nuke,
-/obj/item/card/id/captains_spare,
-/obj/item/hand_tele,
-/obj/item/disk/nuclear,
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/heads/captain)
-"aWx" = (
-/obj/structure/table/wood,
-/obj/machinery/light,
-/obj/item/storage/photo_album/Captain,
-/obj/item/camera{
- pixel_y = -6
+/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/item/stamp/captain,
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/heads/captain)
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
+"aWx" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/security/detectives_office)
"aWy" = (
-/obj/machinery/suit_storage_unit/captain,
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/heads/captain)
+/obj/structure/disposalpipe/segment,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
"aWz" = (
/obj/machinery/door/firedoor,
/obj/structure/cable{
@@ -23026,9 +23157,12 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/nuke_storage)
"aYm" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/ai_monitored/storage/eva)
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
"aYn" = (
/obj/structure/table,
/obj/effect/turf_decal/stripes/line{
@@ -23188,30 +23322,40 @@
/turf/open/floor/plating,
/area/maintenance/starboard/central)
"aYD" = (
-/obj/structure/table,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high/plus,
-/turf/open/floor/plasteel,
-/area/ai_monitored/storage/eva)
-"aYE" = (
-/obj/item/beacon,
-/turf/open/floor/plasteel,
-/area/ai_monitored/storage/eva)
-"aYF" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
},
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "1-2"
},
-/turf/open/floor/plasteel/checker,
-/area/ai_monitored/storage/eva)
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
+"aYE" = (
+/obj/structure/closet/crate/trashcart,
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/structure/disposalpipe/junction,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 10
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
+"aYF" = (
+/obj/structure/table/wood,
+/obj/item/storage/box/evidence,
+/obj/item/hand_labeler,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
"aYG" = (
/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
@@ -23229,14 +23373,17 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aYI" = (
-/obj/machinery/light{
- dir = 4;
- light_color = "#e8eaff"
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
-/turf/open/floor/plasteel/dark/side{
- dir = 4
+/obj/machinery/photocopier,
+/obj/structure/extinguisher_cabinet{
+ pixel_y = -32
},
-/area/hallway/primary/central)
+/obj/item/paper/guides/cogstation/letter_sec,
+/turf/open/floor/plasteel,
+/area/security/main)
"aYJ" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/bot,
@@ -23584,7 +23731,7 @@
/obj/effect/turf_decal/bot_white/left,
/obj/item/stack/sheet/mineral/diamond,
/obj/item/gun/ballistic/revolver/mateba,
-/obj/item/clothing/under/soviet,
+/obj/item/clothing/under/costume/soviet,
/obj/item/clothing/suit/armor/vest/russian_coat,
/obj/item/clothing/head/helmet/rus_helmet,
/obj/machinery/light,
@@ -23857,6 +24004,9 @@
/obj/item/aiModule/core/full/custom{
pixel_x = -4
},
+/obj/machinery/status_display{
+ pixel_x = 32
+ },
/turf/open/floor/plasteel,
/area/ai_monitored/turret_protected/ai)
"aZQ" = (
@@ -23884,10 +24034,18 @@
/turf/open/floor/plasteel/dark/corner,
/area/ai_monitored/storage/eva)
"aZT" = (
-/obj/structure/table/wood,
-/obj/item/stack/packageWrap,
-/turf/open/floor/carpet/royalblue,
-/area/bridge)
+/obj/structure/closet/secure_closet/hos,
+/obj/machinery/light_switch{
+ pixel_y = 24
+ },
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#e8eaff"
+ },
+/obj/item/storage/box/deputy,
+/obj/item/paper/guides/cogstation/letter_hos,
+/turf/open/floor/plasteel/grimy,
+/area/crew_quarters/heads/hos)
"aZU" = (
/obj/structure/chair,
/obj/machinery/light{
@@ -24280,8 +24438,8 @@
"baP" = (
/obj/structure/closet/secure_closet/captains,
/obj/item/reagent_containers/food/drinks/flask/gold,
-/obj/item/clothing/under/gimmick/rank/captain/suit,
-/obj/item/clothing/under/gimmick/rank/captain/suit/skirt,
+/obj/item/clothing/under/rank/captain/suit,
+/obj/item/clothing/under/rank/captain/suit/skirt,
/obj/machinery/airalarm{
pixel_y = 24
},
@@ -24349,11 +24507,39 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"baW" = (
-/obj/structure/grille,
-/obj/structure/cable{
- icon_state = "0-2"
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/item/aiModule/core/full/asimov{
+ pixel_x = 2;
+ pixel_y = 10
+ },
+/obj/effect/spawner/lootdrop/aimodule_neutral{
+ pixel_x = 1;
+ pixel_y = 8
+ },
+/obj/effect/spawner/lootdrop/aimodule_harmless{
+ pixel_y = 6
+ },
+/obj/item/aiModule/core/freeformcore{
+ pixel_x = -1;
+ pixel_y = 2
+ },
+/obj/item/aiModule/supplied/freeform{
+ pixel_x = -2
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel,
/area/ai_monitored/turret_protected/ai)
"baX" = (
/obj/effect/turf_decal/tile/yellow,
@@ -25772,36 +25958,12 @@
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"beu" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/structure/grille,
+/obj/structure/cable{
+ icon_state = "0-2"
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/item/aiModule/core/full/asimov{
- pixel_x = 2;
- pixel_y = 10
- },
-/obj/effect/spawner/lootdrop/aimodule_neutral{
- pixel_x = 1;
- pixel_y = 8
- },
-/obj/effect/spawner/lootdrop/aimodule_harmless{
- pixel_y = 6
- },
-/obj/item/aiModule/core/freeformcore{
- pixel_x = -1;
- pixel_y = 2
- },
-/obj/item/aiModule/supplied/freeform{
- pixel_x = -2
- },
-/turf/open/floor/plasteel,
+/obj/structure/cable,
+/turf/open/floor/plating,
/area/ai_monitored/turret_protected/ai)
"bev" = (
/obj/structure/cable{
@@ -25943,7 +26105,11 @@
/area/security/courtroom/jury)
"beQ" = (
/obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel/grimy,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/closed/wall,
/area/security/detectives_office)
"beR" = (
/obj/structure/chair{
@@ -26304,23 +26470,19 @@
/turf/open/floor/plating,
/area/quartermaster/warehouse)
"bfH" = (
-/obj/structure/chair{
- dir = 4
+/obj/machinery/light{
+ dir = 1
},
-/obj/structure/cable,
-/obj/structure/cable{
- icon_state = "1-4"
+/obj/machinery/light_switch{
+ pixel_y = 24
},
-/obj/machinery/power/apc{
- areastring = "/area/maintenance/aft";
- dir = 8;
- name = "Chapel APC";
- pixel_x = -24
+/obj/machinery/button/crematorium{
+ id = "foo";
+ pixel_x = 8;
+ pixel_y = 24
},
-/turf/open/floor/plasteel{
- icon_state = "chapel"
- },
-/area/chapel/main)
+/turf/open/floor/plasteel/dark,
+/area/chapel/office)
"bfI" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -26349,6 +26511,10 @@
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
},
+/obj/item/paper/fluff/cogstation/letter_chap{
+ pixel_x = 10;
+ pixel_y = 2
+ },
/turf/open/floor/carpet{
icon_state = "carpetsymbol"
},
@@ -26549,18 +26715,13 @@
/turf/open/floor/plating,
/area/quartermaster/warehouse)
"bgh" = (
-/obj/machinery/conveyor_switch{
- id = "EngiCargoConveyer"
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/violet/hidden{
+ icon_state = "pipe11-2";
+ dir = 6
},
-/obj/structure/cable,
-/obj/machinery/power/apc{
- areastring = "/area/quartermaster/sorting";
- dir = 8;
- name = "Delivery Office APC";
- pixel_x = -24
- },
-/turf/open/floor/plasteel,
-/area/quartermaster/sorting)
+/turf/open/space/basic,
+/area/space/nearstation)
"bgi" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
@@ -27190,18 +27351,15 @@
/turf/open/floor/plasteel,
/area/quartermaster/sorting)
"bhB" = (
-/obj/structure/closet/secure_closet/quartermaster,
-/obj/effect/turf_decal/tile/brown{
- dir = 1
+/obj/structure/table/wood,
+/obj/item/stack/packageWrap,
+/obj/item/paper/fluff/cogstation/bsrb,
+/obj/item/paper/fluff/cogstation/survey{
+ pixel_x = -4;
+ pixel_y = 2
},
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/obj/effect/turf_decal/tile/brown,
-/obj/item/clothing/suit/space/eva,
-/obj/item/clothing/head/helmet/space/eva,
-/turf/open/floor/plasteel,
-/area/quartermaster/qm)
+/turf/open/floor/carpet/royalblue,
+/area/bridge)
"bhC" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
@@ -27517,16 +27675,12 @@
/turf/open/floor/plating,
/area/quartermaster/storage)
"bik" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "0-2"
},
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plating,
/area/bridge)
"bil" = (
/obj/effect/turf_decal/stripes/line{
@@ -27573,14 +27727,16 @@
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"biq" = (
-/obj/machinery/computer/cargo/request{
- dir = 1
+/obj/structure/closet/secure_closet/hop,
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#e8eaff"
},
-/obj/machinery/keycard_auth{
- pixel_x = 24;
- pixel_y = -8
+/obj/item/clothing/under/rank/civilian/head_of_personnel/suit,
+/obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt{
+ name = "head of personnel's suitskirt"
},
-/turf/open/floor/carpet/green,
+/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hop)
"bir" = (
/obj/effect/turf_decal/tile/brown{
@@ -28094,17 +28250,25 @@
/turf/open/floor/plating,
/area/security/courtroom/jury)
"bjw" = (
-/obj/machinery/computer/card{
- dir = 8
+/obj/item/storage/secure/safe{
+ pixel_x = 4;
+ pixel_y = 32
},
-/obj/machinery/keycard_auth{
- pixel_x = 8;
- pixel_y = -24
+/obj/structure/disposalpipe/segment{
+ dir = 5
},
-/turf/open/floor/carpet{
- icon_state = "carpetsymbol"
+/obj/effect/decal/cleanable/cobweb{
+ icon_state = "cobweb2"
},
-/area/crew_quarters/heads/captain)
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/central)
"bjx" = (
/obj/structure/table/optable,
/obj/effect/turf_decal/bot,
@@ -28136,21 +28300,13 @@
/turf/open/floor/plating,
/area/maintenance/department/eva)
"bjB" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/item/folder/red,
-/turf/open/floor/plasteel,
-/area/security/checkpoint/supply)
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/security/brig)
"bjC" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -28193,9 +28349,18 @@
},
/area/engine/atmos)
"bjF" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/security/checkpoint/supply)
+/obj/machinery/power/apc{
+ areastring = "/area/maintenance/aft";
+ dir = 8;
+ name = "Head of Personnel APC";
+ pixel_x = -24
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable,
+/turf/open/floor/carpet/green,
+/area/crew_quarters/heads/hop)
"bjG" = (
/obj/structure/rack,
/turf/open/floor/plasteel,
@@ -28350,21 +28515,24 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bjV" = (
+/obj/structure/closet{
+ name = "Evidence Closet 5"
+ },
+/obj/machinery/light_switch{
+ pixel_y = -24
+ },
/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
/obj/effect/turf_decal/tile/red{
dir = 8
},
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/structure/chair{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-2"
},
/turf/open/floor/plasteel,
-/area/security/checkpoint/supply)
+/area/security/brig)
"bjW" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -28642,12 +28810,12 @@
/turf/open/floor/plasteel,
/area/quartermaster/warehouse)
"bkC" = (
-/obj/machinery/modular_computer/console/preset/research{
- dir = 8
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/obj/item/reagent_containers/food/drinks/coffee,
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/heads/hor)
+/turf/open/floor/plating,
+/area/crew_quarters/heads/captain)
"bkD" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -29496,13 +29664,12 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bmj" = (
-/obj/structure/closet/secure_closet/RD,
-/obj/machinery/light{
- dir = 4;
- light_color = "#c1caff"
+/obj/machinery/vending/wardrobe/cap_wardrobe,
+/obj/structure/cable{
+ icon_state = "2-8"
},
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/heads/hor)
+/turf/open/floor/carpet/blue,
+/area/crew_quarters/heads/captain)
"bmk" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
@@ -29914,6 +30081,7 @@
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
},
+/obj/item/paper/guides/cogstation/cdn_chap,
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"bmY" = (
@@ -30540,9 +30708,17 @@
/turf/closed/wall/r_wall,
/area/crew_quarters/fitness/cogpool)
"boj" = (
-/obj/structure/rack,
-/obj/item/caution,
-/obj/item/caution,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/quartermaster/warehouse)
"bok" = (
@@ -31307,17 +31483,10 @@
name = "Aft Air Hookup"
})
"bpW" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
+/turf/closed/wall,
/area/security/brig)
"bpX" = (
/obj/machinery/disposal/bin,
@@ -32621,12 +32790,9 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"bsz" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supplymain/visible,
-/obj/machinery/atmospherics/pipe/simple/violet/visible{
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/violet/hidden{
+ icon_state = "pipe11-2";
dir = 4
},
/turf/open/space/basic,
@@ -32770,15 +32936,11 @@
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"bsT" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/violet/hidden{
+ icon_state = "pipe11-2";
+ dir = 10
},
-/obj/structure/transit_tube/crossing/horizontal,
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supplymain/visible,
/turf/open/space/basic,
/area/space/nearstation)
"bsU" = (
@@ -33505,19 +33667,25 @@
/turf/open/floor/plating,
/area/maintenance/department/chapel)
"buM" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/crew_quarters/heads/cmo)
+/obj/structure/table/wood,
+/obj/machinery/recharger,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/carpet/blue,
+/area/crew_quarters/heads/captain)
"buN" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/closed/wall/rust,
/area/chapel/main)
"buO" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/closed/wall,
-/area/security/detectives_office)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/heads/captain)
"buP" = (
/obj/item/trash/plate,
/obj/item/lighter/greyscale,
@@ -33535,22 +33703,15 @@
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"buR" = (
-/obj/item/storage/secure/safe{
- pixel_x = 4;
- pixel_y = 32
- },
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/obj/effect/decal/cleanable/cobweb{
- icon_state = "cobweb2"
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-4"
},
/obj/structure/cable{
- icon_state = "2-8"
+ icon_state = "0-2"
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plating,
-/area/maintenance/starboard/central)
+/area/crew_quarters/heads/hop)
"buS" = (
/turf/closed/wall/r_wall,
/area/crew_quarters/heads/cmo)
@@ -34517,7 +34678,7 @@
dir = 8
},
/obj/structure/table,
-/obj/item/clothing/under/rank/mailman,
+/obj/item/clothing/under/misc/mailman,
/obj/item/clothing/head/mailman,
/obj/item/wirecutters,
/obj/item/stack/packageWrap,
@@ -34620,8 +34781,8 @@
/obj/structure/disposalpipe/segment,
/obj/item/clothing/gloves/color/purple,
/obj/item/clothing/gloves/color/purple,
-/obj/item/clothing/under/janimaid,
-/obj/item/clothing/under/janimaid,
+/obj/item/clothing/under/costume/maid,
+/obj/item/clothing/under/costume/maid,
/obj/structure/sign/poster/official/bless_this_spess{
pixel_x = -32
},
@@ -35067,13 +35228,19 @@
/turf/open/floor/engine/vacuum,
/area/science/mixing)
"byd" = (
-/obj/machinery/computer/crew,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+/obj/structure/table/wood,
+/obj/item/paper_bin,
+/obj/item/pen/fourcolor,
+/obj/item/pen/fountain{
+ pixel_x = 2;
+ pixel_y = 6
},
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/heads/cmo)
+/obj/item/stamp/hop,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/carpet/green,
+/area/crew_quarters/heads/hop)
"bye" = (
/obj/structure/safe/floor,
/obj/effect/turf_decal/tile/green,
@@ -35615,19 +35782,16 @@
/turf/open/floor/plating/airless,
/area/quartermaster/miningoffice)
"bzw" = (
-/obj/effect/turf_decal/stripes/end{
- dir = 4
+/obj/structure/disposalpipe/segment{
+ dir = 9
},
-/obj/machinery/conveyor{
- dir = 4;
- id = "MiningConveyer"
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
+ dir = 9
},
-/obj/machinery/door/poddoor{
- id = "MiningConveyerBlastDoor";
- name = "Asteroid Mining Load Door"
- },
-/turf/open/floor/plating/airless,
-/area/quartermaster/miningoffice)
+/obj/effect/landmark/start/cargo_technician,
+/turf/open/floor/plasteel,
+/area/quartermaster/warehouse)
"bzx" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security{
@@ -35701,45 +35865,10 @@
/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
"bzH" = (
-/obj/structure/table,
-/obj/machinery/light{
- dir = 4;
- light_color = "#c1caff"
- },
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high/plus,
-/obj/item/stock_parts/cell/high/plus{
- pixel_y = 8
- },
-/obj/item/stock_parts/cell/high/plus{
- pixel_y = 8
- },
-/obj/item/assembly/flash{
- pixel_x = -8;
- pixel_y = 4
- },
-/obj/item/assembly/flash{
- pixel_x = -8;
- pixel_y = 4
- },
-/obj/item/assembly/flash{
- pixel_x = -8;
- pixel_y = 4
- },
-/obj/item/assembly/flash{
- pixel_x = -8;
- pixel_y = 4
- },
-/obj/item/assembly/flash{
- pixel_x = -8;
- pixel_y = 4
- },
-/obj/item/assembly/flash{
- pixel_x = -8;
- pixel_y = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/science/robotics/lab)
+/obj/structure/disposalpipe/segment,
+/obj/structure/grille/broken,
+/turf/open/floor/plating,
+/area/maintenance/disposal)
"bzI" = (
/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
@@ -35995,17 +36124,20 @@
/turf/open/floor/plasteel,
/area/router)
"bAn" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/dark/side{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
},
-/area/gateway)
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/carpet/green,
+/area/crew_quarters/heads/hop)
"bAo" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -36131,12 +36263,13 @@
/area/science/mixing)
"bAA" = (
/obj/structure/lattice,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/camera{
- c_tag = "Supply - Warehouse Exterior";
- dir = 1
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/violet/hidden{
+ icon_state = "pipe11-2";
+ dir = 10
},
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
/turf/open/space/basic,
/area/space/nearstation)
"bAB" = (
@@ -36327,16 +36460,22 @@
/turf/closed/wall,
/area/hallway/secondary/exit)
"bAX" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
+/obj/structure/table/wood,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
-/obj/machinery/photocopier,
-/obj/structure/extinguisher_cabinet{
- pixel_y = -32
+/obj/structure/cable{
+ icon_state = "1-8"
},
-/turf/open/floor/plasteel,
-/area/security/main)
+/obj/item/paper/fluff/cogstation/letter_cap{
+ pixel_x = -2;
+ pixel_y = 4
+ },
+/obj/item/flashlight/lamp,
+/turf/open/floor/carpet{
+ icon_state = "carpetsymbol"
+ },
+/area/crew_quarters/heads/captain)
"bAY" = (
/obj/machinery/status_display,
/turf/closed/wall,
@@ -36520,17 +36659,16 @@
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"bBt" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-4"
},
-/turf/open/floor/carpet/green,
-/area/crew_quarters/heads/hop)
+/turf/open/floor/carpet{
+ icon_state = "carpetsymbol"
+ },
+/area/crew_quarters/heads/captain)
"bBu" = (
/turf/open/floor/plasteel/showroomfloor,
/area/medical/morgue)
@@ -36827,11 +36965,14 @@
/turf/open/floor/plasteel,
/area/router/eva)
"bCd" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
+/obj/effect/landmark/start/captain,
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/open/floor/plasteel/white,
-/area/gateway)
+/turf/open/floor/carpet{
+ icon_state = "carpetsymbol"
+ },
+/area/crew_quarters/heads/captain)
"bCe" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -36996,7 +37137,7 @@
},
/obj/effect/turf_decal/tile/yellow,
/obj/structure/closet/secure_closet/engineering_personal,
-/obj/item/clothing/under/overalls,
+/obj/item/clothing/under/misc/overalls,
/obj/structure/window/reinforced/spawner/east,
/turf/open/floor/plasteel,
/area/storage/primary)
@@ -37007,9 +37148,11 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"bCB" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/grille/broken,
/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposaloutlet,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
/turf/open/floor/plating,
/area/maintenance/disposal)
"bCC" = (
@@ -37038,8 +37181,11 @@
/turf/open/floor/plating,
/area/router/eva)
"bCF" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 9
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
@@ -37376,11 +37522,8 @@
"bDw" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
- id = "AIShutter";
- name = "AI Core Shutters"
- },
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
- dir = 10
+ id = "AIChamberShutter";
+ name = "AI Chamber Shutters"
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/ai)
@@ -37580,13 +37723,11 @@
/turf/open/floor/plasteel,
/area/medical/chemistry)
"bDU" = (
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
- id = "AIShutter";
- name = "AI Core Shutters"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 6
+ id = "AIChamberShutter";
+ name = "AI Chamber Shutters"
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/ai)
@@ -37594,13 +37735,16 @@
/turf/open/floor/plasteel/stairs/left,
/area/crew_quarters/bar)
"bDW" = (
+/obj/structure/disposalpipe/segment,
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 8
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/command/glass{
+ name = "AI Chamber";
+ req_access_txt = "65"
},
-/turf/open/floor/circuit,
+/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai)
"bDX" = (
/turf/open/floor/plasteel/stairs/right,
@@ -37797,18 +37941,22 @@
/turf/closed/wall/r_wall,
/area/maintenance/solars/starboard/fore)
"bEq" = (
-/obj/machinery/computer/security{
- dir = 1
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
+/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
dir = 8
},
-/obj/effect/turf_decal/tile/red{
- dir = 1
+/obj/structure/cable{
+ icon_state = "1-8"
},
-/turf/open/floor/plasteel,
-/area/security/checkpoint)
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/carpet{
+ icon_state = "carpetsymbol"
+ },
+/area/crew_quarters/heads/captain)
"bEr" = (
/obj/structure/cable,
/obj/machinery/power/apc{
@@ -38011,23 +38159,13 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"bEL" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
- name = "Security Office";
- req_access_txt = "63"
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/effect/turf_decal/delivery,
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/security/brig)
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/grille/broken,
+/turf/open/floor/plating,
+/area/maintenance/disposal)
"bEM" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -38178,12 +38316,12 @@
/turf/open/floor/plating,
/area/router)
"bEZ" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
- id = "AIShutter";
- name = "AI Core Shutters"
+ id = "AIChamberShutter";
+ name = "AI Chamber Shutters"
},
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/ai)
"bFa" = (
@@ -38221,13 +38359,36 @@
/turf/open/floor/plating,
/area/maintenance/starboard/central)
"bFf" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "AIShutter";
- name = "AI Core Shutters"
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/item/aiModule/supplied/oxygen{
+ pixel_x = 2;
+ pixel_y = 10
+ },
+/obj/item/aiModule/supplied/quarantine{
+ pixel_x = 1;
+ pixel_y = 8
+ },
+/obj/item/aiModule/zeroth/oneHuman{
+ pixel_y = 4
+ },
+/obj/effect/spawner/lootdrop/aimodule_harmful{
+ pixel_x = -1;
+ pixel_y = 2
+ },
+/obj/item/aiModule/supplied/protectStation{
+ pixel_x = -2
+ },
+/turf/open/floor/plasteel,
/area/ai_monitored/turret_protected/ai)
"bFg" = (
/obj/effect/turf_decal/tile/brown,
@@ -38329,8 +38490,16 @@
/turf/open/floor/plating,
/area/medical/chemistry)
"bFv" = (
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
-/turf/open/floor/circuit,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
/area/ai_monitored/turret_protected/ai)
"bFw" = (
/obj/machinery/monkey_recycler,
@@ -38352,27 +38521,22 @@
/turf/open/floor/plasteel,
/area/medical/chemistry)
"bFy" = (
-/obj/structure/cable,
-/obj/machinery/power/apc{
- areastring = "/area/maintenance/aft";
- dir = 8;
- name = "Head of Personnel APC";
- pixel_x = -24
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
},
-/turf/open/floor/carpet/green,
-/area/crew_quarters/heads/hop)
-"bFz" = (
/obj/structure/cable{
- icon_state = "2-8"
+ icon_state = "4-8"
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/turf/open/floor/carpet{
+ icon_state = "carpetsymbol"
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/dark/side{
- dir = 8
- },
-/area/gateway)
+/area/crew_quarters/heads/captain)
+"bFz" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/item/paper/guides/cogstation/janitor,
+/turf/open/floor/plasteel,
+/area/janitor)
"bFA" = (
/obj/structure/chair/stool,
/obj/effect/turf_decal/tile/neutral,
@@ -38760,11 +38924,17 @@
/turf/open/floor/plasteel,
/area/security/main)
"bGg" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/circuit,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
+/turf/open/floor/plasteel,
/area/ai_monitored/turret_protected/ai)
"bGh" = (
/obj/structure/lattice,
@@ -38967,11 +39137,10 @@
/obj/effect/turf_decal/tile/blue{
dir = 1
},
+/obj/structure/disposalpipe/segment,
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "1-8"
},
-/obj/structure/window/reinforced/spawner/north,
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/turf/open/floor/plasteel,
/area/ai_monitored/turret_protected/ai)
"bGC" = (
@@ -38991,7 +39160,6 @@
/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/obj/structure/window/reinforced/spawner/north,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
/area/ai_monitored/turret_protected/ai)
@@ -39103,9 +39271,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
-/obj/item/clothing/under/staffassistant,
-/obj/item/clothing/under/staffassistant,
-/obj/item/clothing/under/staffassistant,
+/obj/item/clothing/under/misc/staffassistant,
+/obj/item/clothing/under/misc/staffassistant,
+/obj/item/clothing/under/misc/staffassistant,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"bGS" = (
@@ -39372,7 +39540,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/obj/item/clothing/under/staffassistant,
+/obj/item/clothing/under/misc/staffassistant,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"bHw" = (
@@ -39384,7 +39552,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/obj/item/clothing/under/staffassistant,
+/obj/item/clothing/under/misc/staffassistant,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"bHx" = (
@@ -39901,17 +40069,15 @@
/turf/open/floor/plating,
/area/maintenance/solars/starboard/aft)
"bIC" = (
-/obj/structure/cable{
- icon_state = "0-4"
+/obj/machinery/conveyor/auto{
+ id = "disposal"
},
-/obj/machinery/power/apc{
- areastring = "/area/maintenance/aft";
- dir = 8;
- name = "Aft Maintenance APC";
- pixel_x = -24
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
-/area/maintenance/aft)
+/area/maintenance/disposal)
"bID" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/tile/neutral{
@@ -40061,16 +40227,11 @@
name = "Research Sector"
})
"bIT" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/violet/visible{
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/supplymain/visible,
-/obj/machinery/atmospherics/pipe/simple/violet/hidden{
- icon_state = "pipe11-2";
- dir = 8
- },
+/obj/machinery/atmospherics/pipe/simple/violet/hidden,
/turf/open/space/basic,
/area/space/nearstation)
"bIU" = (
@@ -40121,12 +40282,9 @@
/turf/open/floor/plasteel,
/area/maintenance/department/chapel)
"bIY" = (
-/obj/machinery/atmospherics/pipe/simple/violet/visible{
- dir = 10
- },
-/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/violet/hidden,
/turf/open/space/basic,
-/area/space/nearstation)
+/area/space)
"bIZ" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -40749,16 +40907,13 @@
/turf/open/floor/plating,
/area/quartermaster/miningoffice)
"bKp" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/obj/structure/cable{
+ icon_state = "0-2"
},
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/caution/stand_clear{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/science/xenobiology)
+/turf/open/floor/plating,
+/area/crew_quarters/heads/hop)
"bKq" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -40932,12 +41087,18 @@
/turf/open/floor/engine,
/area/science/xenobiology)
"bKG" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/computer/cargo/request{
+ dir = 1
},
-/turf/open/floor/plating,
-/area/science/xenobiology)
+/obj/machinery/keycard_auth{
+ pixel_x = 24;
+ pixel_y = -8
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/carpet/green,
+/area/crew_quarters/heads/hop)
"bKH" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 4
@@ -40952,25 +41113,23 @@
/turf/open/floor/engine,
/area/science/mixing)
"bKJ" = (
-/obj/effect/turf_decal/tile/purple{
- dir = 4
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/science/xenobiology)
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/crew_quarters/heads/hop)
"bKK" = (
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
- dir = 4
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/obj/effect/turf_decal/tile/purple{
- dir = 1
+/obj/structure/cable{
+ icon_state = "0-8"
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/dark,
-/area/science/xenobiology)
+/turf/open/floor/plating,
+/area/crew_quarters/heads/hop)
"bKL" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -41191,12 +41350,13 @@
/turf/open/floor/engine,
/area/science/xenobiology)
"bLe" = (
-/obj/machinery/door/window/westright{
- name = "Containment Pen";
- req_one_access_txt = "55"
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/obj/structure/cable{
+ icon_state = "0-8"
},
-/turf/open/floor/engine,
-/area/science/xenobiology)
+/turf/open/floor/plating,
+/area/crew_quarters/heads/hop)
"bLf" = (
/obj/machinery/door/window/eastleft{
name = "Containment Pen";
@@ -41218,8 +41378,23 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bLh" = (
-/turf/open/floor/plasteel/dark,
-/area/science/xenobiology)
+/obj/structure/bed,
+/obj/item/radio/intercom{
+ name = "Station Intercom (Common)";
+ pixel_y = -28
+ },
+/obj/item/bedsheet/captain,
+/obj/effect/landmark/start/captain,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/carpet{
+ icon_state = "carpetsymbol"
+ },
+/area/crew_quarters/heads/captain)
"bLi" = (
/obj/effect/turf_decal/tile/purple,
/obj/effect/turf_decal/tile/purple{
@@ -41237,12 +41412,16 @@
/turf/open/floor/plasteel,
/area/science/xenobiology)
"bLk" = (
-/obj/machinery/door/window/eastleft{
- name = "Containment Pen";
- req_one_access_txt = "55"
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 1
},
-/turf/open/floor/engine,
-/area/science/xenobiology)
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/carpet{
+ icon_state = "carpetsymbol"
+ },
+/area/crew_quarters/heads/captain)
"bLl" = (
/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
dir = 4
@@ -41703,11 +41882,23 @@
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"bMh" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/turf/open/floor/plasteel/dark,
-/area/science/xenobiology)
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/carpet{
+ icon_state = "carpetsymbol"
+ },
+/area/crew_quarters/heads/captain)
"bMi" = (
/obj/effect/turf_decal/tile/purple,
/obj/effect/turf_decal/tile/purple{
@@ -41731,7 +41922,7 @@
"bMm" = (
/obj/structure/table/wood,
/obj/machinery/light,
-/obj/item/clothing/under/assistantformal{
+/obj/item/clothing/under/misc/assistantformal{
pixel_y = 4
},
/turf/open/floor/carpet{
@@ -41979,10 +42170,14 @@
/turf/open/floor/plasteel/white,
/area/medical/virology)
"bMK" = (
-/obj/machinery/atmospherics/pipe/simple/violet/visible{
+/obj/structure/lattice,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/violet/hidden{
+ icon_state = "pipe11-2";
dir = 5
},
-/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
"bML" = (
@@ -42100,9 +42295,13 @@
/turf/open/floor/plating,
/area/router)
"bMX" = (
-/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/simple/violet/visible,
-/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
+/obj/structure/lattice,
+/obj/structure/sign/warning{
+ name = "\improper KEEP CLEAR: HIGH SPEED DELIVERIES";
+ pixel_y = -32
+ },
+/obj/machinery/atmospherics/pipe/simple/violet/hidden{
+ icon_state = "pipe11-2";
dir = 4
},
/turf/open/space/basic,
@@ -42879,15 +43078,17 @@
/turf/open/floor/plasteel,
/area/science/xenobiology)
"bOJ" = (
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 9
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/open/floor/plasteel,
-/area/science/xenobiology)
+/mob/living/simple_animal/pet/cat/space,
+/turf/open/floor/carpet{
+ icon_state = "carpetsymbol"
+ },
+/area/crew_quarters/heads/captain)
"bOK" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/door/window/northright{
@@ -42897,18 +43098,20 @@
/turf/open/floor/plasteel,
/area/science/xenobiology)
"bOL" = (
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced{
- dir = 8;
- layer = 2.9
+/obj/machinery/computer/card{
+ dir = 8
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/machinery/keycard_auth{
+ pixel_x = 8;
+ pixel_y = -24
},
-/obj/item/clothing/mask/gas,
-/obj/item/clothing/glasses/science,
-/turf/open/floor/plasteel,
-/area/science/xenobiology)
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/carpet{
+ icon_state = "carpetsymbol"
+ },
+/area/crew_quarters/heads/captain)
"bOM" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/stripes/line{
@@ -42938,22 +43141,47 @@
/turf/open/floor/plating,
/area/science/xenobiology)
"bOQ" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/general/visible,
-/turf/open/floor/plating,
-/area/science/xenobiology)
-"bOR" = (
-/obj/machinery/door/window/southright{
- name = "Secure Xenobiological Containment";
- req_one_access_txt = "55"
+/obj/structure/cable{
+ icon_state = "1-4"
},
-/turf/open/floor/engine,
-/area/science/xenobiology)
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 5
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/captain)
+"bOR" = (
+/obj/structure/table/wood,
+/obj/item/pinpointer/nuke,
+/obj/item/card/id/captains_spare,
+/obj/item/hand_tele,
+/obj/item/disk/nuclear,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/captain)
"bOS" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
-/area/science/xenobiology)
+/obj/structure/table/wood,
+/obj/machinery/light,
+/obj/item/storage/photo_album/Captain,
+/obj/item/camera{
+ pixel_y = -6
+ },
+/obj/item/stamp/captain,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/captain)
"bOT" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
dir = 1
@@ -43048,15 +43276,14 @@
/turf/open/floor/engine,
/area/science/xenobiology)
"bPh" = (
-/obj/machinery/light{
- dir = 1
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/violet/hidden{
+ icon_state = "pipe11-2";
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
-/obj/machinery/portable_atmospherics/scrubber,
-/turf/open/floor/engine,
-/area/engine/secure_construction{
- name = "Engineering Construction Area"
- })
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/space/basic,
+/area/space/nearstation)
"bPi" = (
/obj/structure/chair{
dir = 8
@@ -43070,8 +43297,8 @@
/area/science/xenobiology)
"bPk" = (
/obj/structure/table/reinforced,
-/obj/item/clothing/under/staffassistant,
-/obj/item/clothing/under/staffassistant,
+/obj/item/clothing/under/misc/staffassistant,
+/obj/item/clothing/under/misc/staffassistant,
/obj/item/clothing/suit/apron/surgical,
/obj/item/clothing/suit/apron/surgical,
/turf/open/floor/engine,
@@ -43141,10 +43368,14 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"bPr" = (
-/obj/structure/lattice,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/violet/visible{
- dir = 10
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supplymain/visible,
+/obj/machinery/atmospherics/pipe/simple/violet/hidden{
+ icon_state = "pipe11-2";
+ dir = 4
},
/turf/open/space/basic,
/area/space/nearstation)
@@ -43329,9 +43560,15 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bPK" = (
-/obj/structure/window/reinforced/spawner/north,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel/dark,
+/obj/structure/chair/stool,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
/area/ai_monitored/turret_protected/ai)
"bPL" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -43445,18 +43682,13 @@
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"bPX" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering{
- name = "Engineering Foyer";
- req_one_access_txt = "10;24"
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/violet/hidden{
+ icon_state = "pipe11-2";
+ dir = 9
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/engine/break_room)
+/turf/open/space/basic,
+/area/space/nearstation)
"bPY" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
@@ -43502,7 +43734,8 @@
dir = 1;
name = "AI Chamber turret control";
pixel_x = 5;
- pixel_y = 24
+ pixel_y = 24;
+ req_access_txt = "65"
},
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 6
@@ -44084,11 +44317,9 @@
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/captain)
"bRc" = (
+/obj/machinery/suit_storage_unit/captain,
/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 5
+ icon_state = "4-8"
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/captain)
@@ -44187,36 +44418,26 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bRn" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering{
- name = "Engineering Foyer";
- req_one_access_txt = "10;24"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/structure/lattice/catwalk,
/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/engine/break_room)
-"bRo" = (
-/obj/structure/lattice,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/violet/visible{
- dir = 5
+/obj/machinery/atmospherics/pipe/simple/supplymain/visible,
+/obj/machinery/atmospherics/pipe/simple/violet/hidden{
+ icon_state = "pipe11-2";
+ dir = 8
},
/turf/open/space/basic,
/area/space/nearstation)
+"bRo" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/violet/hidden,
+/turf/open/space/basic,
+/area/space/nearstation)
"bRp" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/violet/hidden{
+ icon_state = "pipe11-2";
+ dir = 5
},
-/obj/machinery/atmospherics/pipe/simple/violet/visible{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supplymain/visible,
/turf/open/space/basic,
/area/space/nearstation)
"bRq" = (
@@ -44325,20 +44546,14 @@
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"bRA" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering/glass{
- name = "Engineering Access";
- req_one_access_txt = "10;24"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+/obj/machinery/light{
dir = 1
},
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/engine/break_room)
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
+/turf/open/floor/engine,
+/area/engine/secure_construction{
+ name = "Engineering Construction Area"
+ })
"bRB" = (
/obj/item/radio/intercom{
name = "Station Intercom (Common)";
@@ -44356,14 +44571,20 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bRD" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/drinks/drinkingglass{
+ pixel_x = -6;
+ pixel_y = 2
+ },
+/obj/item/reagent_containers/food/drinks/drinkingglass{
+ pixel_x = 6;
+ pixel_y = 3
+ },
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-4"
},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
- dir = 4
- },
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
+/turf/open/floor/plasteel/dark,
+/area/bridge)
"bRE" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -45375,17 +45596,13 @@
/turf/open/floor/engine/plasma,
/area/engine/atmos)
"bTJ" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/violet/hidden{
+ icon_state = "pipe11-2";
dir = 8
},
-/obj/machinery/airalarm{
- dir = 8;
- pixel_x = 23
- },
-/turf/open/floor/plasteel,
-/area/engine/secure_construction{
- name = "Engineering Construction Area"
- })
+/turf/open/space/basic,
+/area/space/nearstation)
"bTK" = (
/turf/open/floor/engine/co2,
/area/engine/atmos)
@@ -45704,15 +45921,15 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bUt" = (
-/obj/structure/grille,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#e8eaff"
},
-/turf/open/floor/plating,
-/area/science/server{
- name = "Computer Core"
- })
+/obj/structure/reagent_dispensers/watertank,
+/turf/open/floor/plasteel/dark/side{
+ dir = 4
+ },
+/area/hallway/primary/central)
"bUu" = (
/obj/structure/grille,
/obj/structure/disposalpipe/segment{
@@ -45972,23 +46189,19 @@
/turf/open/floor/plasteel,
/area/quartermaster/warehouse)
"bUS" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/photocopier,
-/obj/structure/disposalpipe/segment{
+/obj/structure/closet/secure_closet/quartermaster,
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
dir = 4
},
-/obj/machinery/requests_console{
- department = "Cargo Bay";
- departmentType = 2;
- name = "Cargo RC";
- pixel_y = 30
- },
-/obj/machinery/camera{
- c_tag = "Supply - Delivery Office Aft";
- network = list("ss13","rd")
- },
+/obj/effect/turf_decal/tile/brown,
+/obj/item/clothing/suit/space/eva,
+/obj/item/clothing/head/helmet/space/eva,
+/obj/item/paper/fluff/cogstation/letter_qm,
/turf/open/floor/plasteel,
-/area/quartermaster/sorting)
+/area/quartermaster/qm)
"bUT" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/light{
@@ -46009,13 +46222,14 @@
/turf/open/floor/plasteel,
/area/ai_monitored/turret_protected/ai_upload_foyer)
"bUV" = (
-/obj/effect/turf_decal/stripes/white/full,
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 4
+/obj/structure/lattice,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/violet/hidden{
+ icon_state = "pipe11-2";
+ dir = 10
},
-/turf/open/floor/plasteel,
-/area/engine/atmos)
+/turf/open/space/basic,
+/area/space/nearstation)
"bUW" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
@@ -46032,12 +46246,13 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"bUX" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/obj/structure/disposalpipe/segment{
- dir = 10
+/obj/structure/transit_tube/station/reverse/flipped{
+ dir = 1
},
-/turf/open/floor/plasteel,
-/area/engine/atmos)
+/turf/open/floor/engine,
+/area/engine/secure_construction{
+ name = "Engineering Construction Area"
+ })
"bUY" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -46068,21 +46283,15 @@
/turf/open/floor/plasteel,
/area/router)
"bVb" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering/glass{
- name = "Engineering Access";
- req_one_access_txt = "10;24"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/transit_tube/horizontal,
/turf/open/floor/plasteel,
-/area/engine/break_room)
+/area/engine/secure_construction{
+ name = "Engineering Construction Area"
+ })
"bVc" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -46157,17 +46366,12 @@
/turf/open/floor/plasteel,
/area/maintenance/department/chapel)
"bVj" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 4
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/conveyor/auto{
+ id = "disposal"
},
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/quartermaster/office)
+/turf/open/floor/plating,
+/area/maintenance/disposal)
"bVk" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
@@ -46477,9 +46681,13 @@
name = "Research Sector"
})
"bVN" = (
-/obj/structure/closet/l3closet/scientist,
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/heads/hor)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/crew_quarters/heads/captain)
"bVO" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -47522,30 +47730,15 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"bXI" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/machinery/computer/security{
- dir = 8
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-4"
},
/obj/structure/cable{
icon_state = "0-8"
},
-/obj/machinery/power/apc{
- areastring = "/area/security/checkpoint/supply";
- dir = 4;
- name = "Cargo Security Checkpoint APC";
- pixel_x = 24
- },
-/turf/open/floor/plasteel,
-/area/security/checkpoint/supply)
+/turf/open/floor/plating,
+/area/crew_quarters/heads/captain)
"bXJ" = (
/obj/structure/chair{
dir = 8
@@ -47769,15 +47962,13 @@
/turf/open/floor/plating,
/area/router)
"bYg" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "2-8"
+/obj/machinery/door/poddoor{
+ id = "toxinsdriver";
+ name = "toxins launcher bay door"
},
+/obj/structure/fans/tiny,
/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
+/area/science/mixing)
"bYh" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -48328,10 +48519,11 @@
/turf/open/floor/plating,
/area/quartermaster/warehouse)
"bZe" = (
-/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/grille,
/obj/structure/disposalpipe/segment,
+/obj/structure/cable,
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "0-2"
},
/turf/open/floor/plating,
/area/science/server{
@@ -48748,17 +48940,11 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"caf" = (
+/obj/structure/lattice,
/obj/structure/disposalpipe/segment,
-/obj/structure/lattice/catwalk,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/violet/hidden{
+ icon_state = "pipe11-2";
+ dir = 5
},
/turf/open/space/basic,
/area/space/nearstation)
@@ -49168,15 +49354,16 @@
/turf/open/floor/plating,
/area/science/storage)
"cbi" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-4"
},
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "0-8"
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel/white,
-/area/science/xenobiology)
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/crew_quarters/heads/captain)
"cbj" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -49237,12 +49424,13 @@
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cbp" = (
+/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "0-8"
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel/white,
-/area/science/xenobiology)
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/crew_quarters/heads/captain)
"cbq" = (
/obj/structure/table/reinforced,
/obj/item/clipboard,
@@ -49304,20 +49492,12 @@
/turf/open/floor/engine,
/area/science/explab)
"cbA" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/caution/stand_clear{
- dir = 1
- },
+/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "0-2"
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel,
-/area/science/xenobiology)
+/turf/open/floor/plating,
+/area/ai_monitored/storage/eva)
"cbB" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -49361,21 +49541,16 @@
/turf/open/space/basic,
/area/space/nearstation)
"cbH" = (
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 8
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 4
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/obj/structure/cable{
+ icon_state = "0-4"
},
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "0-2"
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel/dark,
-/area/science/xenobiology)
+/turf/open/floor/plating,
+/area/ai_monitored/storage/eva)
"cbI" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -50097,11 +50272,16 @@
/turf/open/floor/plasteel,
/area/quartermaster/warehouse)
"cda" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
+/obj/structure/table,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
},
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plasteel/dark/corner,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/cell/high/plus,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"cdb" = (
/obj/structure/disposalpipe/trunk{
@@ -50202,13 +50382,20 @@
/turf/open/floor/plasteel,
/area/engine/break_room)
"cdm" = (
-/obj/structure/closet/secure_closet/CMO,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/machinery/photocopier,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 5
+ },
+/obj/effect/turf_decal/tile/red{
dir = 1
},
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/heads/cmo)
+/obj/item/paper/guides/cogstation/disposals,
+/turf/open/floor/plasteel,
+/area/engine/break_room)
"cdn" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -50233,10 +50420,14 @@
/turf/open/floor/plating/airless,
/area/space/nearstation)
"cdp" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/simple/violet/visible,
-/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
- dir = 4
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supplymain/visible,
+/obj/machinery/atmospherics/pipe/simple/violet/hidden{
+ icon_state = "pipe11-2";
+ dir = 8
},
/turf/open/space/basic,
/area/space/nearstation)
@@ -50572,14 +50763,24 @@
/turf/closed/wall/r_wall,
/area/medical/medbay/lobby)
"cea" = (
-/obj/machinery/computer/cloning,
-/obj/effect/turf_decal/bot,
-/obj/structure/disposalpipe/segment,
-/obj/item/paper/guides/jobs/medical/cloning{
- pixel_x = -4
+/obj/effect/turf_decal/delivery,
+/obj/machinery/photocopier,
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
+/obj/machinery/requests_console{
+ department = "Cargo Bay";
+ departmentType = 2;
+ name = "Cargo RC";
+ pixel_y = 30
+ },
+/obj/machinery/camera{
+ c_tag = "Supply - Delivery Office Aft";
+ network = list("ss13","rd")
+ },
+/obj/item/paper/guides/cogstation/disposals,
/turf/open/floor/plasteel,
-/area/medical/medbay/central)
+/area/quartermaster/sorting)
"ceb" = (
/obj/structure/table,
/obj/effect/turf_decal/stripes/line,
@@ -51327,10 +51528,18 @@
name = "Engineering Construction Area"
})
"cfx" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/obj/effect/landmark/event_spawn,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 23
+ },
+/obj/machinery/portable_atmospherics/scrubber,
/turf/open/floor/plasteel,
-/area/engine/atmos)
+/area/engine/secure_construction{
+ name = "Engineering Construction Area"
+ })
"cfy" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -51815,18 +52024,10 @@
/turf/open/floor/plasteel,
/area/quartermaster/warehouse)
"cgt" = (
-/obj/effect/landmark/start/cargo_technician,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
+/obj/structure/rack,
+/obj/item/caution,
+/obj/item/caution,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
- dir = 4
- },
/turf/open/floor/plasteel,
/area/quartermaster/warehouse)
"cgu" = (
@@ -52674,13 +52875,23 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"cij" = (
-/obj/structure/disposalpipe/trunk{
- dir = 1
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/structure/disposaloutlet,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/maintenance/disposal)
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/window/westleft{
+ name = "Science Desk";
+ req_access_txt = "0";
+ req_one_access_txt = "29;47"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/science/lab)
"cik" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -52827,17 +53038,10 @@
/turf/open/floor/plating/airless,
/area/maintenance/port/fore)
"ciC" = (
-/obj/structure/closet/secure_closet/hos,
-/obj/machinery/light_switch{
- pixel_y = 24
- },
-/obj/machinery/light{
- dir = 4;
- light_color = "#e8eaff"
- },
-/obj/item/storage/box/deputy,
-/turf/open/floor/plasteel/grimy,
-/area/crew_quarters/heads/hos)
+/obj/structure/table,
+/obj/item/paper/pamphlet/gateway,
+/turf/open/floor/plasteel/white,
+/area/gateway)
"ciD" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -52848,26 +53052,13 @@
/turf/open/floor/plasteel/dark,
/area/engine/teg_cold)
"ciE" = (
-/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 8
},
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/structure/table,
-/obj/machinery/recharger,
-/obj/machinery/requests_console{
- department = "Security";
- departmentType = 5;
- name = "Security RC";
- pixel_x = 32
- },
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel,
-/area/security/checkpoint/supply)
+/area/quartermaster/office)
"ciF" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -53087,15 +53278,13 @@
/turf/open/floor/plasteel,
/area/quartermaster/warehouse)
"cjb" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
- dir = 9
+/obj/structure/cable{
+ icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/effect/landmark/start/shaft_miner,
/turf/open/floor/plasteel,
-/area/quartermaster/warehouse)
+/area/quartermaster/miningoffice)
"cjc" = (
/obj/structure/fans/tiny,
/obj/structure/plasticflaps,
@@ -53196,15 +53385,16 @@
/turf/closed/wall/rust,
/area/maintenance/port/central)
"cjr" = (
-/obj/structure/table,
-/obj/machinery/airalarm{
- pixel_y = 24
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "0-2"
},
-/obj/item/hand_labeler,
-/obj/item/reagent_containers/glass/bottle/formaldehyde,
-/obj/item/paper/guides/jobs/medical/morgue,
-/turf/open/floor/plasteel/showroomfloor,
-/area/medical/morgue)
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/science/server{
+ name = "Computer Core"
+ })
"cjs" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
@@ -53344,13 +53534,11 @@
/turf/open/space/basic,
/area/space/nearstation)
"cjG" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/structure/window/reinforced/spawner,
/turf/open/floor/plasteel,
-/area/science/xenobiology)
+/area/ai_monitored/storage/eva)
"cjH" = (
/obj/structure/lattice,
/obj/structure/sign/warning/electricshock{
@@ -53581,13 +53769,12 @@
/turf/open/floor/plasteel,
/area/crew_quarters/heads/chief)
"cjZ" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
+/obj/item/beacon,
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/structure/window/reinforced/spawner/north,
/turf/open/floor/plasteel,
-/area/science/xenobiology)
+/area/ai_monitored/storage/eva)
"cka" = (
/obj/item/beacon,
/obj/structure/cable{
@@ -53651,22 +53838,15 @@
name = "Research Sector"
})
"ckg" = (
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 8
- },
-/obj/machinery/light{
- dir = 8;
- light_color = "#e8eaff"
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
},
+/obj/effect/landmark/event_spawn,
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel/dark,
-/area/science/xenobiology)
+/turf/open/floor/plasteel/dark/corner,
+/area/ai_monitored/storage/eva)
"ckh" = (
/obj/machinery/light_switch{
pixel_x = -24
@@ -53971,7 +54151,7 @@
dir = 1
},
/obj/effect/turf_decal/tile/purple,
-/obj/item/clothing/under/rank/miner,
+/obj/item/clothing/under/rank/cargo/miner,
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"ckL" = (
@@ -53983,7 +54163,7 @@
dir = 4
},
/obj/effect/turf_decal/tile/purple,
-/obj/item/clothing/under/rank/miner,
+/obj/item/clothing/under/rank/cargo/miner,
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"ckM" = (
@@ -53995,7 +54175,7 @@
dir = 8
},
/obj/effect/turf_decal/tile/purple,
-/obj/item/clothing/under/rank/miner,
+/obj/item/clothing/under/rank/cargo/miner,
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"ckN" = (
@@ -54116,26 +54296,25 @@
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
"ckY" = (
-/obj/effect/turf_decal/tile/purple{
- dir = 1
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
},
-/obj/effect/turf_decal/tile/purple{
+/obj/effect/turf_decal/tile/yellow{
dir = 8
},
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "2-4"
},
-/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
- dir = 8
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/open/floor/plasteel/dark,
-/area/science/xenobiology)
+/turf/open/floor/plasteel/checker,
+/area/ai_monitored/storage/eva)
"ckZ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/science/xenobiology)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/ai_monitored/storage/eva)
"cla" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -54975,12 +55154,26 @@
/turf/open/floor/plasteel,
/area/medical/chemistry)
"cmT" = (
-/obj/machinery/door/poddoor{
- id = "toxinsdriver";
- name = "toxins launcher bay door"
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
-/turf/open/floor/plating,
-/area/science/mixing)
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/item/folder/red,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/machinery/door/window/northright{
+ name = "Security Checkpoint";
+ req_access_txt = "1"
+ },
+/turf/open/floor/plasteel,
+/area/security/checkpoint/supply)
"cmU" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -55181,12 +55374,12 @@
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
"cnm" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-2"
},
-/turf/open/floor/plasteel/grimy,
-/area/security/detectives_office)
+/turf/open/floor/plating,
+/area/gateway)
"cnn" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -55331,10 +55524,10 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/structure/chair{
+ dir = 4
},
-/obj/effect/landmark/event_spawn,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel,
/area/security/checkpoint/supply)
"cnC" = (
@@ -56486,19 +56679,14 @@
/turf/open/floor/plasteel,
/area/engine/teg_hot)
"cpM" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/machinery/turretid{
- control_area = "area/science/server";
- icon_state = "control_stun";
- name = "Computer Core turret control";
- pixel_x = -3;
- pixel_y = -23
+/obj/machinery/portable_atmospherics/canister/nitrogen,
+/obj/effect/turf_decal/bot,
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#e8eaff"
},
/turf/open/floor/plasteel,
-/area/ai_monitored/turret_protected/ai_upload_foyer)
+/area/engine/atmos)
"cpN" = (
/obj/structure/closet/secure_closet/atmospherics,
/obj/item/cartridge/atmos,
@@ -56947,24 +57135,16 @@
/turf/open/floor/plasteel,
/area/engine/teg_cold)
"cqB" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/drinks/bottle/absinthe,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
},
-/obj/effect/turf_decal/tile/red{
- dir = 4
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/machinery/computer/secure_data{
- dir = 8
- },
-/obj/machinery/newscaster/security_unit{
- pixel_x = 30
- },
-/turf/open/floor/plasteel,
-/area/security/checkpoint/supply)
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/hor)
"cqC" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel,
@@ -57777,7 +57957,11 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
-/obj/machinery/holopad,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/landmark/event_spawn,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel,
/area/security/checkpoint/supply)
"csi" = (
@@ -57804,15 +57988,15 @@
/turf/open/floor/plasteel,
/area/science/explab)
"csl" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
},
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "0-8"
},
-/obj/machinery/holopad,
-/turf/open/floor/plasteel/white,
-/area/science/xenobiology)
+/turf/open/floor/plating,
+/area/crew_quarters/heads/hor)
"csm" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -57918,37 +58102,33 @@
/turf/open/floor/plasteel,
/area/engine/teg_cold)
"csu" = (
-/obj/structure/table,
-/obj/machinery/computer/med_data/laptop,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/obj/structure/cable{
icon_state = "2-4"
},
-/obj/machinery/requests_console{
- announcementConsole = 1;
- department = "Chief Medical Officer's Desk";
- departmentType = 5;
- name = "Chief Medical Officer RC";
- pixel_y = 32
+/turf/open/floor/plasteel/dark/side{
+ dir = 8
},
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/heads/cmo)
+/area/gateway)
"csv" = (
-/obj/machinery/computer/card/minor/cmo{
- dir = 1
+/obj/structure/table,
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+/obj/effect/turf_decal/tile/brown,
+/obj/item/storage/toolbox/mechanical,
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/machinery/keycard_auth{
- pixel_x = -24
- },
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/heads/cmo)
+/obj/item/paper/guides/cogstation/letter_supp,
+/turf/open/floor/plasteel,
+/area/quartermaster/sorting)
"csw" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -57960,19 +58140,17 @@
/turf/open/floor/plasteel,
/area/security/main)
"csx" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/structure/closet/secure_closet/RD,
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
},
-/obj/machinery/photocopier,
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 5
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/engine/break_room)
+/obj/item/paper/fluff/cogstation/letter_rd,
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/hor)
"csy" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
@@ -58325,17 +58503,22 @@
/turf/open/floor/plasteel,
/area/quartermaster/sorting)
"ctn" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
-/obj/effect/turf_decal/tile/brown,
-/obj/item/storage/toolbox/mechanical,
-/obj/structure/disposalpipe/segment{
+/obj/structure/closet/secure_closet/engineering_chief,
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/yellow{
dir = 4
},
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/machinery/airalarm{
+ dir = 1;
+ locked = 0;
+ pixel_y = -22
+ },
+/obj/item/paper/guides/cogstation/letter_chief,
/turf/open/floor/plasteel,
-/area/quartermaster/sorting)
+/area/crew_quarters/heads/chief)
"cto" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/tile/brown,
@@ -58388,14 +58571,20 @@
/area/quartermaster/sorting)
"ctu" = (
/obj/structure/table,
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
-/obj/effect/turf_decal/tile/purple{
+/obj/effect/turf_decal/bot,
+/obj/machinery/camera{
+ c_tag = "Supply - Cargo Office";
dir = 1
},
+/obj/machinery/newscaster{
+ pixel_y = -28
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 4
+ },
+/obj/item/storage/box/disks,
/turf/open/floor/plasteel,
-/area/quartermaster/miningoffice)
+/area/quartermaster/office)
"ctv" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/tile/brown,
@@ -59209,7 +59398,9 @@
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
},
-/obj/effect/landmark/event_spawn,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/white,
/area/gateway)
"cuR" = (
@@ -59732,13 +59923,15 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"cvM" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/bottle/absinthe,
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
},
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/heads/hor)
+/obj/effect/landmark/event_spawn,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/white,
+/area/gateway)
"cvN" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -60186,20 +60379,13 @@
/turf/closed/wall/r_wall,
/area/engine/atmos)
"cwx" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/transit_tube/station/reverse/flipped{
- dir = 1
- },
-/obj/structure/transit_tube_pod{
- dir = 8
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
},
+/obj/effect/turf_decal/stripes/white/full,
/turf/open/floor/plasteel,
-/area/engine/secure_construction{
- name = "Engineering Construction Area"
- })
+/area/engine/atmos)
"cwy" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/transit_tube/horizontal,
@@ -60238,24 +60424,19 @@
/turf/open/floor/plasteel,
/area/engine/workshop)
"cwF" = (
-/obj/structure/lattice,
-/obj/structure/transit_tube/curved{
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
- },
-/turf/open/space/basic,
-/area/space/nearstation)
+/turf/open/floor/plasteel,
+/area/engine/atmos)
"cwG" = (
-/obj/structure/lattice,
-/obj/structure/disposalpipe/segment,
-/obj/structure/transit_tube/horizontal,
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/effect/landmark/event_spawn,
+/obj/structure/disposalpipe/segment{
+ dir = 10
},
-/turf/open/space/basic,
-/area/space/nearstation)
+/turf/open/floor/plasteel,
+/area/engine/atmos)
"cwH" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/closed/wall,
@@ -60283,6 +60464,9 @@
dir = 4
},
/obj/structure/transit_tube/station/reverse/flipped,
+/obj/structure/transit_tube_pod{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/engine/atmos)
"cwN" = (
@@ -60828,19 +61012,15 @@
/area/quartermaster/miningoffice)
"cxT" = (
/obj/structure/table,
-/obj/effect/turf_decal/bot,
-/obj/machinery/camera{
- c_tag = "Supply - Cargo Office";
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/purple{
dir = 1
},
-/obj/machinery/newscaster{
- pixel_y = -28
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
- },
+/obj/item/paper/guides/cogstation/letter_supp,
/turf/open/floor/plasteel,
-/area/quartermaster/office)
+/area/quartermaster/miningoffice)
"cxU" = (
/obj/effect/turf_decal/tile/brown{
dir = 4
@@ -60881,10 +61061,15 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cxZ" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/effect/turf_decal/delivery,
+/obj/machinery/button/door{
+ id = "MiningConveyorBlastDoor";
+ name = "Mining Conveyor Access";
+ pixel_x = 8;
+ pixel_y = -24;
+ req_access_txt = "0";
+ req_one_access_txt = "10;24;48"
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"cya" = (
@@ -61497,19 +61682,19 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"czf" = (
-/obj/structure/chair/office/light{
+/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
},
-/obj/effect/landmark/start/chief_medical_officer,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark/side{
dir = 4
},
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/heads/cmo)
+/area/gateway)
"czg" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -61708,26 +61893,32 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"czz" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass{
- name = "CMO's Office";
- req_access_txt = "40"
+ name = "Gateway Chamber";
+ req_access_txt = "62"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/engine,
+/area/gateway)
+"czA" = (
+/obj/machinery/modular_computer/console/preset/research{
+ dir = 8
+ },
+/obj/item/reagent_containers/food/drinks/coffee,
+/obj/structure/cable{
+ icon_state = "2-4"
},
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/heads/cmo)
-"czA" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plating,
-/area/crew_quarters/heads/cmo)
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/hor)
"czB" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance{
@@ -62159,9 +62350,23 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"cAo" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/machinery/door/window/northright{
+ name = "Medbay Desk";
+ req_access_txt = "5"
+ },
+/obj/item/clipboard,
+/obj/item/clothing/glasses/hud/health,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel,
-/area/janitor)
+/obj/item/paper/fluff/cogstation/sleepers,
+/obj/item/pen,
+/obj/item/clothing/glasses/hud/health,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/lobby)
"cAp" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
@@ -62480,16 +62685,12 @@
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"cAQ" = (
-/obj/structure/closet/crate/trashcart,
-/obj/machinery/light/small{
- dir = 4
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-8"
},
-/obj/structure/disposalpipe/junction,
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 10
- },
-/turf/open/floor/plasteel/grimy,
-/area/security/detectives_office)
+/turf/open/floor/plating,
+/area/crew_quarters/heads/hor)
"cAR" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
@@ -62499,13 +62700,20 @@
},
/area/chapel/office)
"cAS" = (
-/obj/structure/table/wood,
-/obj/item/storage/box/evidence,
-/obj/item/hand_labeler,
-/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/grimy,
-/area/security/detectives_office)
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark/side{
+ dir = 8
+ },
+/area/gateway)
"cAT" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
@@ -62778,15 +62986,12 @@
name = "Aft Air Hookup"
})
"cBt" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
- name = "Security Office";
- req_access_txt = "63"
+/obj/structure/closet/l3closet/scientist,
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/effect/turf_decal/delivery,
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel,
-/area/security/main)
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/hor)
"cBu" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -63668,11 +63873,19 @@
/turf/open/floor/plasteel/stairs/left,
/area/hallway/primary/central)
"cCO" = (
-/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
- dir = 4
+/obj/structure/table,
+/obj/machinery/airalarm{
+ pixel_y = 24
},
-/turf/open/floor/plasteel,
-/area/security/main)
+/obj/item/hand_labeler,
+/obj/item/reagent_containers/glass/bottle/formaldehyde,
+/obj/item/paper/guides/jobs/medical/morgue,
+/obj/item/paper/guides/cogstation/cdn_med{
+ pixel_x = -6;
+ pixel_y = 1
+ },
+/turf/open/floor/plasteel/showroomfloor,
+/area/medical/morgue)
"cCP" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -63832,21 +64045,19 @@
/turf/open/floor/plating,
/area/quartermaster/sorting)
"cDh" = (
-/obj/structure/closet/secure_closet/engineering_chief,
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
+/obj/machinery/computer/card/minor/cmo{
+ dir = 1
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
},
-/obj/machinery/airalarm{
- dir = 1;
- locked = 0;
- pixel_y = -22
+/obj/machinery/keycard_auth{
+ pixel_x = -24
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/heads/chief)
+/obj/item/paper/guides/cogstation/letter_cmo,
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/heads/cmo)
"cDi" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -63861,11 +64072,18 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"cDj" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/carpet{
+ icon_state = "carpetsymbol"
},
-/turf/open/floor/plating,
/area/crew_quarters/heads/hor)
"cDk" = (
/obj/machinery/door/firedoor,
@@ -63996,9 +64214,21 @@
/turf/closed/wall/r_wall,
/area/crew_quarters/heads/captain)
"cDv" = (
-/obj/machinery/vending/wardrobe/cap_wardrobe,
-/turf/open/floor/carpet/blue,
-/area/crew_quarters/heads/captain)
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -26
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/hor)
"cDw" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -64019,35 +64249,39 @@
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/captain)
"cDy" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/crew_quarters/heads/hor)
+"cDz" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/security/checkpoint/supply)
+"cDA" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/computer/secure_data{
+ dir = 8
+ },
+/obj/machinery/newscaster/security_unit{
+ pixel_x = 30
+ },
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
- dir = 8
- },
-/turf/open/floor/carpet{
- icon_state = "carpetsymbol"
- },
-/area/crew_quarters/heads/captain)
-"cDz" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/turf/open/floor/carpet{
- icon_state = "carpetsymbol"
- },
-/area/crew_quarters/heads/captain)
-"cDA" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
- },
-/turf/open/floor/carpet{
- icon_state = "carpetsymbol"
- },
-/area/crew_quarters/heads/captain)
+/turf/open/floor/plasteel,
+/area/security/checkpoint/supply)
"cDB" = (
/obj/item/storage/secure/safe{
pixel_x = -24
@@ -64072,49 +64306,64 @@
},
/area/crew_quarters/heads/captain)
"cDD" = (
-/obj/structure/bed,
-/obj/item/radio/intercom{
- name = "Station Intercom (Common)";
- pixel_y = -28
- },
-/obj/item/bedsheet/captain,
-/obj/effect/landmark/start/captain,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
- },
-/turf/open/floor/carpet{
- icon_state = "carpetsymbol"
- },
-/area/crew_quarters/heads/captain)
-"cDE" = (
-/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
- dir = 1
- },
-/turf/open/floor/carpet{
- icon_state = "carpetsymbol"
- },
-/area/crew_quarters/heads/captain)
-"cDF" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/carpet{
- icon_state = "carpetsymbol"
+/obj/effect/turf_decal/tile/red{
+ dir = 4
},
-/area/crew_quarters/heads/captain)
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/computer/security{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/security/checkpoint/supply";
+ dir = 4;
+ name = "Cargo Security Checkpoint APC";
+ pixel_x = 24
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/checkpoint/supply)
+"cDE" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/heads/cmo)
+"cDF" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/heads/cmo)
"cDG" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 9
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/mob/living/simple_animal/pet/cat/space,
-/turf/open/floor/carpet{
- icon_state = "carpetsymbol"
+/obj/structure/cable,
+/obj/structure/cable{
+ icon_state = "0-2"
},
-/area/crew_quarters/heads/captain)
+/turf/open/floor/plating,
+/area/crew_quarters/heads/cmo)
"cDH" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
@@ -64128,16 +64377,19 @@
/turf/open/floor/plasteel,
/area/gateway)
"cDJ" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
+/obj/machinery/computer/crew,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
+/obj/structure/cable{
+ icon_state = "1-4"
},
-/turf/open/floor/plasteel/dark/side{
- dir = 4
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/area/gateway)
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/heads/cmo)
"cDK" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass{
@@ -64286,29 +64538,35 @@
},
/area/crew_quarters/heads/hor)
"cDZ" = (
+/obj/structure/table,
+/obj/machinery/computer/med_data/laptop,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/requests_console{
+ announcementConsole = 1;
+ department = "Chief Medical Officer's Desk";
+ departmentType = 5;
+ name = "Chief Medical Officer RC";
+ pixel_y = 32
+ },
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/turf/open/floor/carpet{
- icon_state = "carpetsymbol"
- },
-/area/crew_quarters/heads/hor)
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/heads/cmo)
"cEa" = (
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -26
- },
+/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "0-4"
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/heads/hor)
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/crew_quarters/heads/cmo)
"cEb" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
@@ -64726,22 +64984,17 @@
/turf/open/floor/plasteel,
/area/science/lab)
"cEE" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/window/westleft{
- name = "Science Desk";
- req_access_txt = "29;47"
+/obj/machinery/power/apc{
+ areastring = "/area/maintenance/aft";
+ dir = 8;
+ name = "Aft Maintenance APC";
+ pixel_x = -26
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/science/lab)
+/turf/open/floor/plating,
+/area/maintenance/aft)
"cEF" = (
/obj/effect/turf_decal/tile/purple{
dir = 8
@@ -66706,23 +66959,20 @@
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"cHV" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
-/obj/structure/cable{
- icon_state = "0-4"
+/obj/effect/turf_decal/tile/red{
+ dir = 4
},
-/obj/machinery/power/apc{
- areastring = "/area/medical/genetics";
- dir = 8;
- name = "Genetics Lab APC";
- pixel_x = -24
+/obj/effect/turf_decal/tile/red{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 6
- },
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/turf/open/floor/plasteel,
+/area/security/checkpoint/supply)
"cHW" = (
/obj/machinery/rnd/production/circuit_imprinter,
/obj/item/reagent_containers/glass/beaker,
@@ -68061,21 +68311,14 @@
/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
"cKj" = (
-/obj/structure/table/reinforced,
+/obj/structure/closet/secure_closet/CMO,
+/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/obj/effect/turf_decal/tile/blue,
-/obj/machinery/door/window/northright{
- name = "Medbay Desk";
- req_access_txt = "5"
- },
-/obj/item/clipboard,
-/obj/item/pen,
-/obj/item/clothing/glasses/hud/health,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/item/paper/guides/cogstation/letter_cmo,
/turf/open/floor/plasteel/white,
-/area/medical/medbay/lobby)
+/area/crew_quarters/heads/cmo)
"cKk" = (
/obj/structure/chair/office/light{
dir = 1;
@@ -68258,20 +68501,22 @@
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
"cKC" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/structure/chair/office/light{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/landmark/start/chief_medical_officer,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
},
/obj/structure/cable{
icon_state = "1-8"
},
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 9
- },
-/turf/open/floor/plasteel/dark,
-/area/science/xenobiology)
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/heads/cmo)
"cKD" = (
/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
dir = 8
@@ -68550,7 +68795,7 @@
dir = 8
},
/obj/structure/closet/secure_closet/engineering_personal,
-/obj/item/clothing/under/overalls,
+/obj/item/clothing/under/misc/overalls,
/turf/open/floor/plasteel,
/area/storage/primary)
"cLo" = (
@@ -68633,7 +68878,7 @@
"cLz" = (
/obj/effect/turf_decal/bot,
/obj/structure/closet/secure_closet/engineering_personal,
-/obj/item/clothing/under/overalls,
+/obj/item/clothing/under/misc/overalls,
/turf/open/floor/plasteel,
/area/storage/primary)
"cLA" = (
@@ -70405,6 +70650,1037 @@
},
/turf/open/floor/plating,
/area/maintenance/aft)
+"cPz" = (
+/obj/structure/lattice,
+/obj/structure/transit_tube/curved{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
+"cPA" = (
+/obj/structure/lattice,
+/obj/structure/disposalpipe/segment,
+/obj/structure/transit_tube/horizontal,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
+"cPB" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/transit_tube/crossing/horizontal,
+/obj/machinery/atmospherics/pipe/simple/supplymain/visible,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/space/basic,
+/area/space/nearstation)
+"cPC" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/transit_tube/horizontal,
+/turf/open/floor/plasteel,
+/area/engine/atmos)
+"cPD" = (
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plasteel,
+/area/engine/atmos)
+"cPE" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/space/basic,
+/area/space/nearstation)
+"cPF" = (
+/obj/structure/lattice,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/space/basic,
+/area/space/nearstation)
+"cPG" = (
+/obj/structure/lattice,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/camera{
+ c_tag = "Supply - Warehouse Exterior";
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/space/basic,
+/area/space/nearstation)
+"cPH" = (
+/obj/machinery/conveyor_switch{
+ id = "EngiCargoConveyer"
+ },
+/obj/structure/cable,
+/obj/machinery/power/apc{
+ areastring = "/area/quartermaster/sorting";
+ dir = 8;
+ name = "Delivery Office APC";
+ pixel_x = -26
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/sorting)
+"cPI" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering{
+ name = "Engineering Foyer";
+ req_one_access_txt = "10;24"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/engine/break_room)
+"cPJ" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering{
+ name = "Engineering Foyer";
+ req_one_access_txt = "10;24"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/engine/break_room)
+"cPK" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Engineering Access";
+ req_one_access_txt = "10;24"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/engine/break_room)
+"cPL" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Engineering Access";
+ req_one_access_txt = "10;24"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/engine/break_room)
+"cPM" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/machinery/recharger,
+/obj/machinery/requests_console{
+ department = "Security";
+ departmentType = 5;
+ name = "Security RC";
+ pixel_x = 32
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/security/checkpoint/supply)
+"cPN" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"cPO" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 10
+ },
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"cPP" = (
+/obj/structure/table,
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
+ },
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/cell/high/plus,
+/obj/item/stock_parts/cell/high/plus{
+ pixel_y = 8
+ },
+/obj/item/stock_parts/cell/high/plus{
+ pixel_y = 8
+ },
+/obj/item/assembly/flash/handheld{
+ pixel_x = -8;
+ pixel_y = 4
+ },
+/obj/item/assembly/flash/handheld{
+ pixel_x = -8;
+ pixel_y = 4
+ },
+/obj/item/assembly/flash/handheld{
+ pixel_x = -8;
+ pixel_y = 4
+ },
+/obj/item/assembly/flash/handheld{
+ pixel_x = -8;
+ pixel_y = 4
+ },
+/obj/item/assembly/flash/handheld{
+ pixel_x = -8;
+ pixel_y = 4
+ },
+/obj/item/assembly/flash/handheld{
+ pixel_x = -8;
+ pixel_y = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/robotics/lab)
+"cPQ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/medical/genetics";
+ dir = 8;
+ name = "Genetics Lab APC";
+ pixel_x = -26
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 6
+ },
+/turf/open/floor/plating,
+/area/maintenance/aft)
+"cPR" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/heads/cmo)
+"cPS" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/command/glass{
+ name = "CMO's Office";
+ req_access_txt = "40"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/heads/cmo)
+"cPT" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/heads/cmo)
+"cPU" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
+"cPV" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/holopad,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
+"cPW" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
+"cPX" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/white,
+/area/science/xenobiology)
+"cPY" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/caution/stand_clear{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
+"cPZ" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/caution/stand_clear{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
+"cQa" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/science/xenobiology)
+"cQb" = (
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
+"cQc" = (
+/obj/effect/turf_decal/tile/purple{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
+"cQd" = (
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
+"cQe" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/window/reinforced/spawner,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/button/door{
+ id = "xenobio2";
+ name = "Containment Blast Doors";
+ pixel_y = 4;
+ req_access_txt = "55"
+ },
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
+"cQf" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/science/xenobiology)
+"cQg" = (
+/obj/machinery/door/window/westright{
+ name = "Containment Pen";
+ req_one_access_txt = "55"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/poddoor/preopen{
+ id = "xenobio1";
+ name = "containment blast door"
+ },
+/turf/open/floor/engine,
+/area/science/xenobiology)
+"cQh" = (
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
+"cQi" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
+"cQj" = (
+/obj/machinery/door/window/eastleft{
+ name = "Containment Pen";
+ req_one_access_txt = "55"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/poddoor/preopen{
+ id = "xenobio2";
+ name = "containment blast door"
+ },
+/turf/open/floor/engine,
+/area/science/xenobiology)
+"cQk" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/science/xenobiology)
+"cQl" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/window/reinforced/spawner/north,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/button/door{
+ id = "xenobio1";
+ name = "Containment Blast Doors";
+ pixel_y = 4;
+ req_access_txt = "55"
+ },
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
+"cQm" = (
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
+"cQn" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
+"cQo" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/science/xenobiology)
+"cQp" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
+"cQq" = (
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
+"cQr" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/window/reinforced/spawner,
+/obj/machinery/button/door{
+ id = "xenobio4";
+ name = "Containment Blast Doors";
+ pixel_y = 4;
+ req_access_txt = "55"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
+"cQs" = (
+/obj/machinery/door/window/westright{
+ name = "Containment Pen";
+ req_one_access_txt = "55"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/poddoor/preopen{
+ id = "xenobio3";
+ name = "containment blast door"
+ },
+/turf/open/floor/engine,
+/area/science/xenobiology)
+"cQt" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
+"cQu" = (
+/obj/machinery/door/window/eastleft{
+ name = "Containment Pen";
+ req_one_access_txt = "55"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/poddoor/preopen{
+ id = "xenobio4";
+ name = "containment blast door"
+ },
+/turf/open/floor/engine,
+/area/science/xenobiology)
+"cQv" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/window/reinforced/spawner/north,
+/obj/machinery/button/door{
+ id = "xenobio3";
+ name = "Containment Blast Doors";
+ pixel_y = 4;
+ req_access_txt = "55"
+ },
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
+"cQw" = (
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 8
+ },
+/obj/machinery/light{
+ dir = 8;
+ light_color = "#e8eaff"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
+"cQx" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/window/reinforced/spawner,
+/obj/machinery/button/door{
+ id = "xenobio6";
+ name = "Containment Blast Doors";
+ pixel_y = 4;
+ req_access_txt = "55"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
+"cQy" = (
+/obj/machinery/door/window/westright{
+ name = "Containment Pen";
+ req_one_access_txt = "55"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/poddoor/preopen{
+ id = "xenobio5";
+ name = "containment blast door"
+ },
+/turf/open/floor/engine,
+/area/science/xenobiology)
+"cQz" = (
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
+"cQA" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
+"cQB" = (
+/obj/machinery/door/window/eastleft{
+ name = "Containment Pen";
+ req_one_access_txt = "55"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/poddoor/preopen{
+ id = "xenobio6";
+ name = "containment blast door"
+ },
+/turf/open/floor/engine,
+/area/science/xenobiology)
+"cQC" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/structure/window/reinforced/spawner/north,
+/obj/machinery/button/door{
+ id = "xenobio5";
+ name = "Containment Blast Doors";
+ pixel_y = 4;
+ req_access_txt = "55"
+ },
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
+"cQD" = (
+/obj/effect/turf_decal/tile/purple{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
+"cQE" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
+"cQF" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 9
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
+"cQG" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/xenobiology)
+"cQH" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/button/door{
+ id = "xenobio7";
+ name = "Containment Blast Doors";
+ pixel_y = 4;
+ req_access_txt = "55"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
+"cQI" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced{
+ dir = 8;
+ layer = 2.9
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/glasses/science,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/science/xenobiology)
+"cQJ" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/science/xenobiology)
+"cQK" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/general/visible,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/science/xenobiology)
+"cQL" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/science/xenobiology)
+"cQM" = (
+/obj/machinery/door/window/southright{
+ name = "Secure Xenobiological Containment";
+ req_one_access_txt = "55"
+ },
+/obj/machinery/door/poddoor/preopen{
+ id = "xenobio7";
+ name = "containment blast door"
+ },
+/turf/open/floor/engine,
+/area/science/xenobiology)
+"cQN" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/science/xenobiology)
+"cQO" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/science/xenobiology)
+"cQP" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/science/xenobiology)
+"cQQ" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/bridge)
+"cQR" = (
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/bridge)
+"cQS" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/bridge)
+"cQT" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating,
+/area/bridge)
+"cQU" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/bridge)
+"cQV" = (
+/obj/item/twohanded/required/kirbyplants{
+ icon_state = "plant-02"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel/dark,
+/area/bridge)
+"cQW" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin,
+/obj/machinery/camera{
+ c_tag = "Bridge - Port Quarter";
+ dir = 1
+ },
+/obj/machinery/keycard_auth{
+ pixel_y = -24
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/bridge)
+"cQX" = (
+/obj/machinery/photocopier,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/bridge)
+"cQY" = (
+/obj/structure/reagent_dispensers/water_cooler,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/bridge)
+"cQZ" = (
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/bridge)
+"cRa" = (
+/obj/effect/turf_decal/stripes/end{
+ dir = 4
+ },
+/obj/machinery/conveyor{
+ dir = 4;
+ id = "MiningConveyer"
+ },
+/obj/machinery/door/poddoor{
+ id = "MiningConveyorBlastDoor";
+ name = "Asteroid Mining Load Door"
+ },
+/turf/open/floor/plating/airless,
+/area/quartermaster/miningoffice)
+"cRb" = (
+/obj/machinery/computer/cloning,
+/obj/effect/turf_decal/bot,
+/obj/structure/disposalpipe/segment,
+/obj/item/paper/guides/jobs/medical/cloning{
+ pixel_x = -4
+ },
+/obj/item/paper/fluff/cogstation/cloner{
+ pixel_x = 6
+ },
+/turf/open/floor/plasteel,
+/area/medical/medbay/central)
+"cRc" = (
+/obj/machinery/door/firedoor,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/machinery/door/airlock/research{
+ name = "Aft Observatory";
+ req_access_txt = "47"
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/misc_lab{
+ name = "Research Observatory"
+ })
+"cRd" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/machinery/door/airlock/research{
+ name = "Aft Observatory";
+ req_access_txt = "47"
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/misc_lab{
+ name = "Research Observatory"
+ })
+"cRe" = (
+/obj/machinery/computer/upload/ai{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/ai_monitored/turret_protected/ai)
+"cRf" = (
+/obj/structure/window/reinforced/spawner/north,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/machinery/flasher{
+ id = "ID";
+ pixel_x = 24;
+ pixel_y = 0
+ },
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/turret_protected/ai)
+"cRg" = (
+/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/machinery/portable_atmospherics/pump,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/machinery/light,
+/turf/open/floor/plasteel/white/corner,
+/area/engine/atmos)
+"cRh" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/turretid{
+ control_area = "area/science/server";
+ icon_state = "control_stun";
+ name = "Computer Core turret control";
+ pixel_x = -3;
+ pixel_y = -23;
+ req_access_txt = "65"
+ },
+/turf/open/floor/plasteel,
+/area/ai_monitored/turret_protected/ai_upload_foyer)
"cVq" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
@@ -70697,16 +71973,6 @@
/obj/machinery/atmospherics/pipe/simple/violet/visible,
/turf/open/space/basic,
/area/space)
-"kxL" = (
-/obj/structure/lattice,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/violet/visible{
- dir = 4
- },
-/turf/open/space/basic,
-/area/space/nearstation)
"kzb" = (
/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
dir = 4
@@ -70881,17 +72147,6 @@
/obj/machinery/atmospherics/pipe/simple/supplymain/visible,
/turf/open/space/basic,
/area/space/nearstation)
-"qnM" = (
-/obj/structure/lattice,
-/obj/structure/sign/warning{
- name = "\improper KEEP CLEAR: HIGH SPEED DELIVERIES";
- pixel_y = -32
- },
-/obj/machinery/atmospherics/pipe/simple/violet/visible{
- dir = 4
- },
-/turf/open/space/basic,
-/area/space/nearstation)
"qvB" = (
/obj/machinery/atmospherics/components/unary/thermomachine/heater{
dir = 8
@@ -70911,14 +72166,6 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
-"rbJ" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/simple/violet/visible{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/space/basic,
-/area/space/nearstation)
"rdF" = (
/obj/machinery/atmospherics/pipe/simple/dark/visible{
dir = 6
@@ -71123,13 +72370,6 @@
/obj/item/pen,
/turf/open/floor/plasteel,
/area/engine/atmos)
-"xqa" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/simple/violet/visible{
- dir = 5
- },
-/turf/open/space/basic,
-/area/space/nearstation)
"xCy" = (
/obj/machinery/atmospherics/components/binary/pump,
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -84607,7 +85847,7 @@ aaU
aaa
aaU
aEa
-aTH
+aHE
bab
aaa
aaa
@@ -84864,7 +86104,7 @@ aaU
aaU
aaU
aEb
-bRD
+aPT
aaU
aaU
aye
@@ -85121,7 +86361,7 @@ aaU
aaa
aaU
aEa
-bRD
+aPT
aaU
aaa
aaa
@@ -85378,7 +86618,7 @@ aaa
aaa
aaU
aEa
-bRD
+aPT
aaU
aaa
aaa
@@ -85635,7 +86875,7 @@ aaa
aaa
aaU
aEa
-bRD
+aPT
aaU
aaa
aaa
@@ -85892,7 +87132,7 @@ aaa
aaa
aaU
aEa
-bRD
+aPT
aaU
aaa
aaa
@@ -86149,7 +87389,7 @@ aaa
aaa
aaU
aEa
-bRD
+aPT
aaU
aaa
aaa
@@ -86406,7 +87646,7 @@ aaa
aaa
aaU
aEa
-bRD
+aPT
aaU
aaa
aaa
@@ -86663,7 +87903,7 @@ aaa
aaa
aaU
aEa
-bRD
+aPT
aaU
aaa
aaa
@@ -86920,7 +88160,7 @@ aaa
aaa
aaU
aEb
-bRD
+aPT
aaU
aaa
aaa
@@ -87177,7 +88417,7 @@ aaa
aaa
aaU
aEa
-bRD
+aPT
aaU
aaa
aaa
@@ -87434,7 +88674,7 @@ aaa
aaa
aaU
aEa
-bRD
+aPT
aaU
aaa
aaa
@@ -87691,7 +88931,7 @@ aaa
aaa
aaU
aEa
-bRD
+aPT
aaU
aaa
aaa
@@ -87948,7 +89188,7 @@ aaa
aaa
aaU
aEa
-bRD
+aPT
aaU
aaa
aaa
@@ -88205,7 +89445,7 @@ aaa
aaa
aaU
aEa
-bRD
+aPT
aaU
aaa
aaa
@@ -88462,19 +89702,19 @@ aaa
aaa
aaU
aEa
-bRD
+aPT
aaU
aaU
aaa
aaU
-aGn
-aGn
-aGn
-aGn
-aGn
-aGn
-aGn
-aGn
+aPV
+bik
+bik
+bik
+bik
+bik
+bik
+cQT
aaU
aaa
aaU
@@ -88547,22 +89787,22 @@ bFt
bJs
bJV
bxT
-bKG
-bLe
-bFl
+cQa
+cQg
+cQk
bxT
-bKG
-bLe
-bFl
+cQa
+cQs
+cQk
bxT
-bKG
-bLe
-bFl
+cQa
+cQy
+cQk
bxT
cvz
cKA
bOH
-bFl
+cQJ
bxT
bKM
bKM
@@ -88719,21 +89959,21 @@ aaU
aaU
aaU
aEa
-bRD
+aPT
aaU
aaU
-aGn
-aGn
-aGn
+aPV
+bik
+cQS
aIA
aJe
aLE
aLy
aMQ
aNF
-aGn
-aGn
-aGn
+cQU
+bik
+cQT
aaU
aaa
aaa
@@ -88806,20 +90046,20 @@ bJW
bxT
cbo
bLf
-cjZ
+cQl
bxT
cbo
bLf
-cjZ
+cQv
bxT
cbo
bLf
-cjZ
+cQC
bxT
ctT
cKB
bOI
-bOQ
+cQK
bOT
bKM
bKM
@@ -88976,10 +90216,10 @@ abh
abh
abh
aEb
-bRD
+aPT
aaU
aaU
-aGn
+aPW
aHD
aIg
aHF
@@ -88989,8 +90229,8 @@ aHF
aJn
aHF
aPp
-aPT
-aGn
+cQV
+cQS
aaU
aaa
aaa
@@ -89058,25 +90298,25 @@ bxT
bFo
bHV
bYz
-cbi
-cbp
-cbA
-cbH
-cjP
-cjP
-ckg
-cjP
-cjP
-cjP
-ckg
-cjP
-ckY
-cjP
+cPU
+cPW
+cPY
+cQb
+cQh
+cQm
+cQh
+cQh
+cQh
+cQh
+cQw
+cQh
+cQz
+cQD
cjP
ctR
-cKC
-bOJ
-bFl
+cQF
+cQH
+cQL
bKM
bKM
bKM
@@ -89233,11 +90473,11 @@ aaU
aaU
aaU
aEa
-bRD
+aPT
aaU
-aGn
-aGn
-aHE
+aPU
+aTH
+bRD
aHF
aHF
aIE
@@ -89246,7 +90486,7 @@ aIE
aIE
csD
aHF
-aPU
+cQW
aGq
aaU
aaa
@@ -89315,25 +90555,25 @@ bxT
cdD
bHW
bIG
-csl
-bzy
-bKp
-bKJ
-bLh
-bLh
-bLh
-bLh
-bMh
-bLh
-bLh
-bLh
-ckZ
-bLh
+cPV
+cPX
+cPZ
+cQc
+cQi
+cQn
+cQi
+cQp
+cQt
+cQi
+cQi
+cQp
+cQA
+cQE
cbF
cnl
cla
bOK
-bOR
+cQM
bKM
bKM
bPa
@@ -89494,21 +90734,21 @@ aLK
aGq
aGq
aKH
-aHF
+cQQ
aHF
aIE
aJu
aKA
-aZT
+bhB
aMX
aIE
aHF
-aPV
+cQX
aQW
-aSJ
-aSJ
+bkC
+bkC
aQW
-aSJ
+bkC
aQW
aaU
aaa
@@ -89575,22 +90815,22 @@ bIH
cGA
bJX
bKq
-bKK
+cQd
bLi
bLi
bLF
-bLi
+cQq
bMi
bLi
-bLF
bLi
+cQq
bLi
bLi
cvV
ckS
-cla
-bOL
-bFl
+cQG
+cQI
+cQN
bKM
bKM
bKM
@@ -89751,7 +90991,7 @@ aUz
bDP
aGq
aGL
-aHF
+cQQ
aHF
aIH
aJz
@@ -89760,16 +91000,16 @@ aLI
aMX
aIE
aHF
-aPW
+cQY
aQW
-cDv
-cjQ
+bmj
+bBt
cDB
-cDD
+bLh
aQW
aQW
-aSJ
-aSJ
+bkC
+bVN
aaa
aaa
aaa
@@ -89804,7 +91044,7 @@ aaa
bcw
bde
bcw
-cmT
+bYg
bcy
bfp
cwY
@@ -89832,22 +91072,22 @@ bII
cGB
bFw
bxT
-cjG
+cQe
bLj
ckN
bxT
-cjG
+cQr
bLj
ckN
bxT
-cjG
+cQx
bLj
ckN
bxT
bOy
cla
bOM
-bOS
+cQO
bOU
bKM
bKM
@@ -90008,7 +91248,7 @@ aZq
bDQ
hcR
aGM
-aHF
+cQQ
aHF
aII
aJu
@@ -90017,16 +91257,16 @@ aRe
aXS
bbb
aHF
-aHF
+cQQ
aQW
baP
-aTo
+bCd
cjQ
-cDE
+bLk
aVP
cpt
-aWw
-aSJ
+bOR
+bXI
aaa
aaa
aaa
@@ -90073,7 +91313,7 @@ bAN
bKH
cbh
clc
-csR
+cGJ
cGJ
cGO
cGU
@@ -90089,22 +91329,22 @@ bIJ
cGC
bXO
bxT
-bFl
-bLk
-bKG
+cQf
+cQj
+cQo
bxT
-bFl
-bLk
-bKG
+cQf
+cQu
+cQo
bxT
-bFl
-bLk
-bKG
+cQf
+cQB
+cQo
bxT
ctU
ckX
bON
-bFl
+cQP
bxT
bKM
bKM
@@ -90265,7 +91505,7 @@ bdz
bDR
aKF
aLm
-aMi
+cQR
aMi
aQh
aQN
@@ -90274,16 +91514,16 @@ aRl
aXT
bbc
bbD
-bik
+cQZ
cDt
cDw
-cDy
+bEq
cps
-cDF
+bMh
bRb
-bRc
-aWx
-aSJ
+bOQ
+bOS
+cbi
aaa
aaa
aaa
@@ -90534,13 +91774,13 @@ bbG
bit
cDu
cDx
-cDz
+bFy
cDC
-cDG
+bOJ
aVR
bBj
-aWy
-aSJ
+bRc
+bXI
aaa
aaa
aaa
@@ -90790,14 +92030,14 @@ aSW
aHM
biF
aQW
-aTr
-cDA
+buM
+bAX
bEN
-bjw
+bOL
aQW
aQW
-aSJ
-aSJ
+buO
+cbp
aaa
aaa
aaa
@@ -90845,7 +92085,7 @@ bcy
cbC
cnO
cnO
-cnO
+csR
cGQ
cGW
cGV
@@ -91047,10 +92287,10 @@ aSW
aHM
bju
aQW
-aSJ
-aSJ
+buO
+buO
aQW
-aSJ
+buO
aQW
aaU
aaa
@@ -91818,9 +93058,9 @@ csr
aNR
blf
aNR
-aTt
-aTt
-aTt
+buR
+bKp
+bKJ
aaa
bdg
bdg
@@ -92074,10 +93314,10 @@ aGq
aNR
aNR
bly
-bFy
-aTJ
+bjF
+byd
aUB
-aTt
+bKK
aaa
bdg
beN
@@ -92329,12 +93569,12 @@ aKS
aSW
cDs
aNR
-aPs
+biq
blA
bqh
buG
bIW
-aTt
+bKK
aaa
bdg
beR
@@ -92591,7 +93831,7 @@ aYR
csE
bvJ
aUF
-aTt
+bKK
aaa
bdg
beJ
@@ -92832,7 +94072,7 @@ aAv
aOO
aCl
aFj
-ciC
+aZT
aGv
bLp
bEV
@@ -92846,9 +94086,9 @@ bbf
bsf
bnI
aRo
-bBt
-biq
-aTt
+bAn
+bKG
+bLe
aaa
bdg
beJ
@@ -93696,7 +94936,7 @@ ckT
ckT
ckT
ckV
-cHK
+cRc
clg
ctc
cua
@@ -93921,8 +95161,8 @@ csN
biA
biA
csL
-cDZ
-bgX
+cDj
+cDy
bPl
bXx
bXT
@@ -93953,7 +95193,7 @@ ckQ
ckU
ckQ
ckW
-cHL
+cRd
csX
ctP
cuk
@@ -94178,8 +95418,8 @@ cve
bky
biA
biA
-cDZ
-bgX
+cDj
+cDy
bWT
bXh
bYa
@@ -94431,11 +95671,11 @@ aaU
aaU
bgW
biI
-cvM
-bkC
-bVN
-bmj
-cEa
+cqB
+czA
+cBt
+csx
+cDv
bgW
bWU
bXl
@@ -94688,8 +95928,8 @@ aaU
aUk
bgW
bgW
-cDj
-bgX
+csl
+cAQ
bgW
bgW
cEb
@@ -96426,10 +97666,10 @@ aQg
akv
aew
azf
-bpW
-aAP
-aEc
+aCb
aFT
+bjV
+bpW
aZO
aXu
aZX
@@ -96487,8 +97727,8 @@ aaU
aTV
aVk
bfu
-bAn
-bFz
+csu
+cAS
cDV
cDX
cEg
@@ -96682,9 +97922,9 @@ alU
aQA
aSZ
aew
-abS
-bEL
-aCb
+aAP
+aEc
+bjB
asL
asL
bfm
@@ -96729,7 +97969,7 @@ aZy
beJ
bfd
bjg
-aYI
+bUt
bai
baV
cKF
@@ -96744,7 +97984,7 @@ aaU
aTV
aVq
bfx
-bCd
+cuQ
cpP
aTV
bVR
@@ -96999,9 +98239,9 @@ aaa
aaa
aaU
aUi
-aVq
+ciC
bzz
-cuQ
+cvM
cts
aTV
bVM
@@ -97258,7 +98498,7 @@ aaU
aTV
aYf
beo
-bCd
+cuQ
cwe
aTV
bVS
@@ -97453,7 +98693,7 @@ awS
azB
aBC
atc
-aLX
+aIF
aJv
aJZ
aLY
@@ -97515,7 +98755,7 @@ aaU
aTV
bHH
aWp
-cDJ
+czf
coI
aTV
bVT
@@ -97710,10 +98950,10 @@ awT
aAk
cjN
atc
-aDF
+aIG
aRU
aDX
-bAX
+aYI
atc
aVQ
aWa
@@ -97771,8 +99011,8 @@ aaa
aaU
aUk
aUk
-aUi
-cDK
+cnm
+czz
aUk
aUk
bWa
@@ -97966,9 +99206,9 @@ bGf
bHh
cqd
cBb
-cBt
+aFP
+aKi
aMN
-cCO
aQw
coU
atc
@@ -98223,9 +99463,9 @@ avL
axw
cqH
bhN
-aDb
+aIC
aDP
-aFk
+aPs
aGh
csn
atc
@@ -98303,7 +99543,7 @@ bRJ
bth
bTB
cek
-cKj
+cAo
cKk
cKl
cKm
@@ -98480,9 +99720,9 @@ avM
avL
csw
aBK
-aCa
-aCa
-aAQ
+aID
+aLX
+aSJ
aHZ
atc
atc
@@ -98808,7 +100048,7 @@ cEn
bWR
bSH
bSG
-cEE
+cij
bSG
bSC
bSC
@@ -100054,9 +101294,9 @@ aWB
bsl
cjJ
aXH
-aYm
-aYm
-aYm
+cbA
+cbH
+ckZ
aZv
bRP
aWB
@@ -100101,9 +101341,9 @@ ceY
bst
cyG
bst
-buM
-buM
-buM
+cDE
+cDG
+cEa
buS
buS
bFX
@@ -100312,7 +101552,7 @@ aWK
aXo
aXI
aYn
-aYD
+cda
aZj
aZw
bRQ
@@ -100358,11 +101598,11 @@ bqm
cdW
cyG
cdY
-buM
-byd
-czf
-csv
-buM
+cDF
+cDJ
+cKC
+cDh
+cPR
bFJ
cFa
cFk
@@ -100569,7 +101809,7 @@ aWM
aXr
aXJ
aXr
-aXr
+cjG
aXr
aXr
bRU
@@ -100616,10 +101856,10 @@ cmU
cyG
cdX
buS
-csu
+cDZ
czg
czt
-czz
+cPS
czD
cFb
bEl
@@ -100826,7 +102066,7 @@ aWO
bPz
bQf
aYs
-aYE
+cjZ
aYs
aYs
bSV
@@ -100876,7 +102116,7 @@ buS
bAJ
czh
czu
-czA
+cPT
czE
cFc
bEl
@@ -101083,7 +102323,7 @@ aWP
aXy
aXN
aXy
-cda
+ckg
aXy
aXy
aXy
@@ -101132,7 +102372,7 @@ bqm
buS
caR
czi
-cdm
+cKj
buS
bFY
cEX
@@ -101340,7 +102580,7 @@ aWQ
aXz
aXU
aYu
-aYF
+ckY
aZn
aZx
bEs
@@ -102380,7 +103620,7 @@ ajO
ajO
ajO
ajO
-ajO
+aQa
ajO
ajO
aRy
@@ -102633,13 +103873,13 @@ ajO
aGi
axI
axI
-axI
aGi
-aNo
-aPE
-beu
ajO
+bFf
+aPE
baW
+aYZ
+beu
beK
bTX
bWI
@@ -102889,10 +104129,10 @@ avv
ajO
bCv
axI
-bCF
-axI
-axI
-aNr
+aNh
+aNz
+bDw
+bFv
bHp
bLm
ajO
@@ -103144,12 +104384,12 @@ aSt
brs
avv
ajO
-axI
avY
-bDw
-bEZ
-bFv
-bGB
+ajO
+ajO
+aOI
+bDU
+bGg
bIF
bLz
bNe
@@ -103193,7 +104433,7 @@ bqq
cPx
cFh
bJe
-cea
+cRb
cHP
bKA
bKV
@@ -103401,12 +104641,12 @@ bns
aya
avy
alo
-axZ
awn
aIS
-awn
+aNo
aJp
-aNz
+bDW
+bGB
aHq
bki
bPp
@@ -103423,11 +104663,11 @@ cwd
bYZ
bZc
cgQ
-bUt
-bUt
-bUt
-bUt
bZe
+bZe
+bZe
+bZe
+cjr
brL
brL
bVW
@@ -103658,19 +104898,19 @@ aSt
brs
avv
ajO
-axI
-avY
-bDU
-bFf
-bGg
+axZ
+ajO
+ajO
+aPf
+bEZ
bGD
bJk
bLC
-bPK
+cRf
bPV
bQT
bVq
-cpM
+cRh
bfh
cbY
cdn
@@ -103917,10 +105157,10 @@ avv
ajO
aze
azJ
-bDW
-azJ
-aNh
-aOI
+aNr
+bCF
+bDw
+bPK
bKx
bmv
ajO
@@ -103958,7 +105198,7 @@ cpI
csK
cKi
cvR
-bzH
+cPP
bts
bCY
bHJ
@@ -104175,9 +105415,9 @@ ajO
aGi
axI
aIX
-axI
aGi
-aPf
+ajO
+cRe
aZP
bmH
aYZ
@@ -104481,7 +105721,7 @@ bJi
bDa
czw
byQ
-cHV
+cPQ
cIc
cIc
cIp
@@ -104986,7 +106226,7 @@ bpE
bpE
cyQ
byQ
-cjr
+cCO
czx
czC
czG
@@ -105196,19 +106436,19 @@ bUp
cci
btZ
aSq
-rTW
-kxw
-kxw
-tpQ
-kxw
-tpQ
-kxw
-kxw
-kxw
-kxw
-kxw
-kxw
-xqa
+bgh
+bIY
+bIY
+bRo
+bIY
+bRo
+bIY
+bIY
+bIY
+bIY
+bIY
+bIY
+bRp
aaa
aaU
bWv
@@ -105453,7 +106693,7 @@ bUL
btT
btT
cjE
-opd
+bsz
aaU
aaU
cdV
@@ -105495,7 +106735,7 @@ bZk
bZn
bZq
bZh
-bIC
+cEE
bpD
cmL
cyS
@@ -105710,7 +106950,7 @@ bUY
ccj
aSw
aaW
-opd
+bsz
aaa
aaa
aaa
@@ -105967,7 +107207,7 @@ bVa
btT
aaU
aby
-opd
+bsz
aaa
aaa
aaa
@@ -106224,7 +107464,7 @@ bVu
bvB
aaU
aby
-opd
+bsz
aaa
aaa
aaa
@@ -106481,7 +107721,7 @@ bVA
btT
aaU
aby
-opd
+bsz
aaa
aaa
aaa
@@ -106738,8 +107978,8 @@ bXp
btT
aaU
abH
-aZp
-kxL
+bAA
+bMK
aZp
ceq
cet
@@ -106996,7 +108236,7 @@ bvB
bWq
acY
adz
-opd
+bsz
aaa
aaU
cdt
@@ -107253,7 +108493,7 @@ btT
btT
btT
cjF
-qnM
+bMX
cdt
cdt
cdt
@@ -107510,7 +108750,7 @@ ccn
ccA
ccy
aTl
-opd
+bsz
cdG
cer
cew
@@ -107767,7 +109007,7 @@ cco
ccE
btZ
aTl
-opd
+bsz
cdU
ces
ces
@@ -107792,7 +109032,7 @@ csQ
cqs
cqG
crt
-csx
+cdm
ctl
cuL
cvd
@@ -108024,7 +109264,7 @@ btT
btT
btT
cjF
-qnM
+bMX
cdt
cdt
cdt
@@ -108281,7 +109521,7 @@ btT
aaU
aVt
adN
-opd
+bsz
aaa
aaU
cdt
@@ -108538,7 +109778,7 @@ aaU
aaU
aTl
qeq
-rbJ
+bPh
guK
hXk
hXk
@@ -108742,11 +109982,11 @@ aFr
aKg
ahO
aml
-aoy
-aoy
+abX
+akd
aoA
awt
-aoy
+aDb
aqL
anB
alS
@@ -108795,7 +110035,7 @@ cuy
cuD
cuG
eUF
-opd
+bsz
aej
agc
agT
@@ -108822,12 +110062,12 @@ bwR
cBx
cCR
cdz
-bPX
+cPI
cdJ
cdM
cdJ
cdO
-bRA
+cPK
bbY
cIM
bZl
@@ -109000,10 +110240,10 @@ apv
aiF
amr
aqL
-abX
+aoy
aoD
aoj
-bEq
+aDm
aqL
aji
aKs
@@ -109052,7 +110292,7 @@ aQJ
aRZ
aVK
cxa
-bsz
+bPr
sVC
aNH
bbQ
@@ -109257,11 +110497,11 @@ apv
ajb
amt
anH
-akd
+aAQ
aoG
bvp
-aDm
-aFP
+aDF
+aFk
aHh
aKB
aNu
@@ -109309,7 +110549,7 @@ aaU
aSu
aYU
cxb
-opd
+bsz
aej
agC
aoJ
@@ -109336,12 +110576,12 @@ bEW
bQF
cah
cdA
-bRn
+cPJ
cdL
cmv
cdL
cdQ
-bVb
+cPL
bUD
cIV
coN
@@ -109563,10 +110803,10 @@ aaa
aaa
aaa
aaa
-rTW
-aTl
-cdp
-wPS
+bgh
+bGQ
+bIT
+bPX
aaU
atF
atF
@@ -109820,7 +111060,7 @@ aaa
aaa
aaa
aaa
-opd
+bsz
aTl
cxc
aaa
@@ -110077,7 +111317,7 @@ aaa
aaa
aaa
aaa
-opd
+bsz
aTl
cxc
aaa
@@ -110334,7 +111574,7 @@ aaa
aWR
aaa
aaU
-opd
+bsz
aTl
cxc
atF
@@ -110591,7 +111831,7 @@ cgd
bwW
beE
bwW
-opd
+bsz
aTl
cxc
atF
@@ -110625,7 +111865,7 @@ biQ
bXf
bkG
cwP
-cDh
+ctn
bob
bib
bXX
@@ -110824,9 +112064,9 @@ aIN
aMK
aOc
aSA
-aVa
-aWn
-bsR
+aTo
+aTt
+aTJ
bsR
bCG
bCK
@@ -110848,7 +112088,7 @@ cgX
chC
cik
bwW
-bGh
+bsT
bGQ
bHe
bHA
@@ -111081,9 +112321,9 @@ aKj
aVy
aRx
aSF
-aHA
+aTr
arH
-aIC
+aVa
aIK
aKk
aTU
@@ -111340,7 +112580,7 @@ aND
aWH
aHx
asc
-aID
+aWn
bvG
aKl
bCQ
@@ -111597,7 +112837,7 @@ bkT
aWJ
aHz
btb
-aID
+aWn
bvR
bCI
bDJ
@@ -111854,14 +113094,14 @@ aci
aXQ
aHy
bDc
-aIF
-aKi
+aWw
+aWy
+aYm
+aYD
+aYE
+aYF
beQ
-cnm
-cAQ
-cAS
-buO
-buR
+bjw
bwu
bAd
aMo
@@ -112111,8 +113351,8 @@ aWX
aZF
anK
aHz
-aIG
-aHA
+aWx
+aTr
boA
cAF
bCL
@@ -112136,7 +113376,7 @@ aMD
arp
bCk
aqk
-bIT
+bRn
qlJ
qlJ
bcG
@@ -112393,9 +113633,9 @@ bwW
ciV
bwW
aaU
-bIY
-bHg
-bMK
+bsT
+bRo
+bRp
anr
bcI
bgw
@@ -112652,10 +113892,10 @@ bwW
aaU
aaa
aaa
-bJv
+bsz
cJx
cJF
-bPh
+bRA
cJJ
bsX
cJM
@@ -112909,11 +114149,11 @@ bwW
aaU
aaa
aaa
-bJv
+bsz
anr
bcI
sdp
-bgw
+bUX
bgw
uwK
bhm
@@ -113166,12 +114406,12 @@ bwW
aaU
aaa
aaa
-bJv
+bsz
anr
bcI
aXp
-cwx
-bTJ
+bVb
+cfx
bhs
bmm
bcI
@@ -113397,7 +114637,7 @@ aCJ
bFn
bFn
aJd
-aJj
+bfH
bdq
bet
bmu
@@ -113423,7 +114663,7 @@ bwW
aaU
aaa
aaa
-bJv
+bsz
anr
bcI
bcI
@@ -113680,13 +114920,13 @@ bwW
aaU
aaa
aaa
-bJv
+bsz
anr
aaU
aaa
cwz
aaa
-bfW
+jyu
aaa
aaa
aaU
@@ -113937,13 +115177,13 @@ bwW
aMD
bwW
aaa
-bIY
-bMX
-tpQ
-xqa
+bsT
+bHe
+bRo
+bRp
aaa
cwD
-bfW
+jyu
aaa
aaa
aaU
@@ -114197,10 +115437,10 @@ bwW
aaU
bdR
cJr
-opd
+bTJ
aaa
aaa
-cwF
+cPz
aaa
aaa
aaU
@@ -114222,11 +115462,11 @@ bUR
cfO
cja
cja
-cgt
+boj
cxq
cxv
bgf
-bVj
+brQ
cxC
bgq
bhX
@@ -114423,7 +115663,7 @@ aNy
aSd
aTq
aVY
-bfH
+aJj
aJd
btm
bdo
@@ -114454,10 +115694,10 @@ cwv
bAQ
bAQ
cJs
-bPr
-bRo
+bUV
+caf
bam
-cwG
+cPA
bam
bYl
bam
@@ -114479,7 +115719,7 @@ cdx
cga
cgq
cgq
-cjb
+bzw
cxr
cxw
cxx
@@ -114712,9 +115952,9 @@ bsu
bsx
cJt
sVC
-bRp
+cdp
sVC
-bsT
+cPB
sVC
bZp
sVC
@@ -114738,7 +115978,7 @@ bZd
cfX
ciP
cjB
-boj
+cgt
bcl
bfc
bgs
@@ -114952,7 +116192,7 @@ aMA
czU
czY
cAe
-cAo
+bFz
cAs
cAx
bhU
@@ -114973,11 +116213,11 @@ bRv
bsD
bww
bsD
-caf
-bsD
-bsD
-bsD
-bAA
+cPE
+cPF
+cPF
+cPF
+cPG
bBL
bBL
bCm
@@ -115003,7 +116243,7 @@ cxC
bhX
biJ
bjQ
-cxT
+ctu
biZ
btz
bPm
@@ -115263,7 +116503,7 @@ cxQ
cxU
cxW
cxX
-bPm
+cPN
clX
bZu
cmM
@@ -115473,7 +116713,7 @@ aMB
bzn
bjz
cgZ
-bmS
+bzH
bJS
bmW
bmW
@@ -115499,7 +116739,7 @@ bbT
bbT
bkm
brV
-bgh
+cPH
bfU
bFD
bgO
@@ -115988,7 +117228,7 @@ bzn
bwW
bxF
aMD
-cih
+bEL
bAK
bjz
aMI
@@ -116034,7 +117274,7 @@ bGC
bpQ
bpQ
cOa
-bYg
+cPO
cya
cya
cya
@@ -116245,8 +117485,8 @@ bzn
bwW
byW
bCB
-ciX
-cij
+bIC
+bVj
cip
cpE
aaa
@@ -116502,7 +117742,7 @@ bzn
aMD
bzh
bwW
-ciV
+cih
aMI
aMI
aMI
@@ -116534,7 +117774,7 @@ bLu
bVr
cth
cje
-ctn
+csv
bcV
bby
bck
@@ -117044,7 +118284,7 @@ bgk
bbT
bkd
bbT
-bUS
+cea
bVG
cgn
cje
@@ -117055,13 +118295,13 @@ bcA
bdM
bdM
cNA
-bhP
-biv
-bjB
-bjV
+bhb
+ciE
+cmT
cnB
csh
-ciE
+cHV
+cPM
bjn
btI
buc
@@ -117283,8 +118523,8 @@ bMY
bMY
bPB
xoj
-cwB
-cwM
+cwx
+cPC
cww
cbN
cww
@@ -117314,9 +118554,9 @@ bdM
bdM
bhP
biv
-bjF
-cqB
-bXI
+cDz
+cDA
+cDD
bnX
bjn
bjn
@@ -117540,8 +118780,8 @@ bMZ
bMZ
bPC
uAY
-cwB
-bUV
+cwF
+cwM
cww
cge
cww
@@ -117793,12 +119033,12 @@ aaa
bJv
bMp
cww
-bNa
+cpM
bNa
bPJ
bRC
-cfx
-bUX
+cwG
+cPD
bVE
cbT
cww
@@ -117830,7 +119070,7 @@ ccv
boS
boI
bqZ
-ctu
+cxT
bMH
btN
buy
@@ -118090,7 +119330,7 @@ cxR
cxV
cxV
cxV
-cxZ
+cjb
cxV
cyb
cyc
@@ -118314,7 +119554,7 @@ qgO
chO
cpN
bWG
-cJo
+cRg
jiZ
bhI
cLY
@@ -118349,7 +119589,7 @@ btd
btd
bDy
bxR
-btS
+cxZ
boI
bBA
bFh
@@ -118582,7 +119822,7 @@ anr
aaa
aaU
bfC
-bhB
+bUS
bAv
bPW
cBz
@@ -119377,7 +120617,7 @@ boI
cre
cow
boI
-bzw
+cRa
boI
aaa
aaa
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index c9b81cefd9..5c054c0bb4 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -7639,7 +7639,7 @@
/obj/item/clothing/suit/space/hardsuit/deathsquad{
pixel_y = 5
},
-/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/shoes/combat/swat,
/obj/item/clothing/mask/gas/sechailer/swat,
/obj/effect/turf_decal/stripes/line,
diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm
index 5a2096d862..2f54d066a0 100644
--- a/code/__DEFINES/construction.dm
+++ b/code/__DEFINES/construction.dm
@@ -73,6 +73,9 @@
#define CAT_AMMO "Ammunition"
#define CAT_ROBOT "Robots"
#define CAT_MISC "Misc"
+#define CAT_MISCELLANEOUS "Miscellaneous"
+#define CAT_TOOL "Tools & Storage"
+#define CAT_FURNITURE "Furniture"
#define CAT_PRIMAL "Tribal"
#define CAT_CLOTHING "Clothing"
#define CAT_FOOD "Foods"
diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
index 53348b3467..b32625a539 100644
--- a/code/__DEFINES/dcs/signals.dm
+++ b/code/__DEFINES/dcs/signals.dm
@@ -119,6 +119,8 @@
#define COMSIG_MOVABLE_UNCROSSED "movable_uncrossed" //from base of atom/movable/Uncrossed(): (/atom/movable)
#define COMSIG_MOVABLE_BUMP "movable_bump" //from base of atom/movable/Bump(): (/atom)
#define COMSIG_MOVABLE_IMPACT "movable_impact" //from base of atom/movable/throw_impact(): (/atom/hit_atom, /datum/thrownthing/throwingdatum)
+ #define COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH 1 ///if true, flip if the impact will push what it hits
+ #define COMPONENT_MOVABLE_IMPACT_NEVERMIND 2 ///return true if you destroyed whatever it was you're impacting and there won't be anything for hitby() to run on
#define COMSIG_MOVABLE_IMPACT_ZONE "item_impact_zone" //from base of mob/living/hitby(): (mob/living/target, hit_zone)
#define COMSIG_MOVABLE_BUCKLE "buckle" //from base of atom/movable/buckle_mob(): (mob, force)
#define COMSIG_MOVABLE_UNBUCKLE "unbuckle" //from base of atom/movable/unbuckle_mob(): (mob, force)
@@ -138,7 +140,6 @@
#define HEARING_SOURCE 8*/
#define COMSIG_MOVABLE_DISPOSING "movable_disposing" //called when the movable is added to a disposal holder object for disposal movement: (obj/structure/disposalholder/holder, obj/machinery/disposal/source)
#define COMSIG_MOVABLE_TELEPORTED "movable_teleported" //from base of do_teleport(): (channel, turf/origin, turf/destination)
-
// /mind signals
#define COMSIG_PRE_MIND_TRANSFER "pre_mind_transfer" //from base of mind/transfer_to() before it's done: (new_character, old_character)
#define COMPONENT_STOP_MIND_TRANSFER 1 //stops the mind transfer from happening.
@@ -148,6 +149,8 @@
#define COMSIG_MOB_EXAMINATE "mob_examinate" //from base of /mob/verb/examinate(): (atom/A)
#define COMSIG_MOB_DEATH "mob_death" //from base of mob/death(): (gibbed)
#define COMPONENT_BLOCK_DEATH_BROADCAST 1 //stops the death from being broadcasted in deadchat.
+#define COMSIG_MOB_CLICKON "mob_clickon" //from base of mob/clickon(): (atom/A, params)
+ #define COMSIG_MOB_CANCEL_CLICKON 1
#define COMSIG_MOB_GHOSTIZE "mob_ghostize" //from base of mob/Ghostize(): (can_reenter_corpse, special, penalize)
#define COMPONENT_BLOCK_GHOSTING (1<<0)
#define COMPONENT_DO_NOT_PENALIZE_GHOSTING (1<<1)
@@ -212,7 +215,7 @@
// /mob/living/carbon signals
#define COMSIG_CARBON_SOUNDBANG "carbon_soundbang" //from base of mob/living/carbon/soundbang_act(): (list(intensity))
#define COMSIG_CARBON_IDENTITY_TRANSFERRED_TO "carbon_id_transferred_to" //from datum/dna/transfer_identity(): (datum/dna, transfer_SE)
-
+#define COMSIG_CARBON_TACKLED "carbon_tackled" //sends from tackle.dm on tackle completion
// /mob/living/simple_animal/hostile signals
#define COMSIG_HOSTILE_ATTACKINGTARGET "hostile_attackingtarget"
#define COMPONENT_HOSTILE_NO_ATTACK 1
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index 439583c859..378667cd82 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -246,6 +246,8 @@ GLOBAL_LIST_INIT(pointed_types, typecacheof(list(
#define isgun(A) (istype(A, /obj/item/gun))
+#define isfood(A) (istype(A, /obj/item/reagent_containers/food))
+
//Assemblies
#define isassembly(O) (istype(O, /obj/item/assembly))
diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index b4735cd0d8..e5f817614b 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -36,16 +36,16 @@
#define BLOODCRAWL_EAT 2
//Mob bio-types flags
-#define MOB_ORGANIC 1 << 0
-#define MOB_MINERAL 1 << 1
-#define MOB_ROBOTIC 1 << 2
-#define MOB_UNDEAD 1 << 3
-#define MOB_HUMANOID 1 << 4
-#define MOB_BUG 1 << 5
-#define MOB_BEAST 1 << 6
-#define MOB_EPIC 1 << 7 //megafauna
-#define MOB_REPTILE 1 << 8
-#define MOB_SPIRIT 1 << 9
+#define MOB_ORGANIC (1 << 0)
+#define MOB_MINERAL (1 << 1)
+#define MOB_ROBOTIC (1 << 2)
+#define MOB_UNDEAD (1 << 3)
+#define MOB_HUMANOID (1 << 4)
+#define MOB_BUG (1 << 5)
+#define MOB_BEAST (1 << 6)
+#define MOB_EPIC (1 << 7) //megafauna
+#define MOB_REPTILE (1 << 8)
+#define MOB_SPIRIT (1 << 9)
//Organ defines for carbon mobs
#define ORGAN_ORGANIC 1
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index e70e0ba743..e1fc8fa001 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -150,6 +150,8 @@
#define TRAIT_PUGILIST "pugilist" //This guy punches people for a living
#define TRAIT_KI_VAMPIRE "ki-vampire" //when someone with this trait rolls maximum damage on a punch and stuns the target, they regain some stamina and do clone damage
#define TRAIT_PASSTABLE "passtable"
+#define TRAIT_GIANT "giant"
+#define TRAIT_DWARF "dwarf"
// mobility flag traits
// IN THE FUTURE, IT WOULD BE NICE TO DO SOMETHING SIMILAR TO https://github.com/tgstation/tgstation/pull/48923/files (ofcourse not nearly the same because I have my.. thoughts on it)
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index f85503a678..632904202d 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -115,5 +115,6 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
/obj/item/autosurgeon/penis = 1,
/obj/item/autosurgeon/testicles = 1,
/obj/item/storage/box/marshmallow = 2,
+ /obj/item/clothing/gloves/tackler/offbrand = 1,
"" = 3
))
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 46c2c919f4..9ce96585d3 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -75,6 +75,9 @@
if(notransform)
return
+ if(SEND_SIGNAL(src, COMSIG_MOB_CLICKON, A, params) & COMSIG_MOB_CANCEL_CLICKON)
+ return
+
var/list/modifiers = params2list(params)
if(modifiers["shift"] && modifiers["middle"])
ShiftMiddleClickOn(A)
diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index 91d0db85d1..7c48adef24 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -428,6 +428,8 @@ SUBSYSTEM_DEF(job)
if(!joined_late)
var/obj/S = null
for(var/obj/effect/landmark/start/sloc in GLOB.start_landmarks_list)
+ if(!sloc.job_spawnpoint)
+ continue
if(sloc.name != rank)
S = sloc //so we can revert to spawning them on top of eachother if something goes wrong
continue
diff --git a/code/controllers/subsystem/time_track.dm b/code/controllers/subsystem/time_track.dm
index cd53c8f0ba..2f4949fc1e 100644
--- a/code/controllers/subsystem/time_track.dm
+++ b/code/controllers/subsystem/time_track.dm
@@ -23,7 +23,7 @@ SUBSYSTEM_DEF(time_track)
var/time_dilation_text
/datum/controller/subsystem/time_track/fire()
- stat_time_text = "Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]\n\nRound Time: [WORLDTIME2TEXT("hh:mm:ss")]\n\nStation Time: [STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)]\n\n[time_dilation_text]"
+ stat_time_text = "Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]\n\nRound Time: [DisplayTimeText(world.time - SSticker.round_start_time, 1)] \n\nStation Time: [STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)]\n\n[time_dilation_text]"
if(++last_measurement == measurement_delay)
last_measurement = 0
diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm
index 06169f64bf..e5625dee6a 100644
--- a/code/datums/components/butchering.dm
+++ b/code/datums/components/butchering.dm
@@ -69,9 +69,13 @@
H.apply_status_effect(/datum/status_effect/neck_slice)
/datum/component/butchering/proc/Butcher(mob/living/butcher, mob/living/meat)
+ var/meat_quality = 50 + (bonus_modifier/10) //increases through quality of butchering tool, and through if it was butchered in the kitchen or not
+ if(istype(get_area(butcher), /area/crew_quarters/kitchen))
+ meat_quality = meat_quality + 10
var/turf/T = meat.drop_location()
var/final_effectiveness = effectiveness - meat.butcher_difficulty
var/bonus_chance = max(0, (final_effectiveness - 100) + bonus_modifier) //so 125 total effectiveness = 25% extra chance
+ var/list/butchered_items = list()
for(var/V in meat.butcher_results)
var/obj/bones = V
var/amount = meat.butcher_results[bones]
@@ -83,16 +87,21 @@
if(butcher)
to_chat(butcher, "You harvest some extra [initial(bones.name)] from [meat]!")
for(var/i in 1 to 2)
- new bones (T)
+ butchered_items += new bones (T)
+
else
- new bones (T)
+ butchered_items += new bones (T)
meat.butcher_results.Remove(bones) //in case you want to, say, have it drop its results on gib
for(var/V in meat.guaranteed_butcher_results)
var/obj/sinew = V
var/amount = meat.guaranteed_butcher_results[sinew]
for(var/i in 1 to amount)
- new sinew (T)
+ butchered_items += new sinew (T)
meat.guaranteed_butcher_results.Remove(sinew)
+ for(var/butchered_item in butchered_items)
+ if(isfood(butchered_item))
+ var/obj/item/reagent_containers/food/butchered_meat = butchered_item
+ butchered_meat.food_quality = meat_quality
if(butcher)
meat.visible_message("[butcher] butchers [meat].")
ButcherEffects(meat)
diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm
index d35daaf59c..8ebd52522a 100644
--- a/code/datums/components/crafting/craft.dm
+++ b/code/datums/components/crafting/craft.dm
@@ -15,7 +15,7 @@
/datum/component/personal_crafting
var/busy
- var/viewing_category = 1 //typical powergamer starting on the Weapons tab
+ var/viewing_category = 1
var/viewing_subcategory = 1
var/list/categories = list(
CAT_WEAPONRY = list(
@@ -23,7 +23,11 @@
CAT_AMMO,
),
CAT_ROBOT = CAT_NONE,
- CAT_MISC = CAT_NONE,
+ CAT_MISC = list(
+ CAT_MISCELLANEOUS,
+ CAT_TOOL,
+ CAT_FURNITURE,
+ ),
CAT_PRIMAL = CAT_NONE,
CAT_FOOD = list(
CAT_BREAD,
@@ -201,6 +205,18 @@
var/atom/movable/I = new R.result (get_turf(user.loc))
I.CheckParts(parts, R)
if(isitem(I))
+ if(isfood(I))
+ var/obj/item/reagent_containers/food/food_result = I
+ var/total_quality = 0
+ var/total_items = 0
+ for(var/obj/item/ingredient in parts)
+ var/obj/item/reagent_containers/food/food_ingredient = ingredient
+ total_items += 1
+ total_quality += food_ingredient.food_quality
+ if(total_items == 0)
+ food_result.adjust_food_quality(50)
+ else
+ food_result.adjust_food_quality(total_quality / total_items)
user.put_in_hands(I)
if(send_feedback)
SSblackbox.record_feedback("tally", "object_crafted", 1, I.type)
diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm
index 2b6f1a5b81..bc76082f0a 100644
--- a/code/datums/components/crafting/recipes.dm
+++ b/code/datums/components/crafting/recipes.dm
@@ -23,3 +23,4 @@
*/
/datum/crafting_recipe/proc/check_requirements(mob/user, list/collected_requirements)
return TRUE
+
diff --git a/code/datums/components/crafting/recipes/recipes_clothing.dm b/code/datums/components/crafting/recipes/recipes_clothing.dm
index 6fc84409e4..02dd3f2c05 100644
--- a/code/datums/components/crafting/recipes/recipes_clothing.dm
+++ b/code/datums/components/crafting/recipes/recipes_clothing.dm
@@ -41,7 +41,7 @@
category = CAT_CLOTHING
/datum/crafting_recipe/armwraps
- name = "armwraps"
+ name = "Armwraps"
result = /obj/item/clothing/gloves/fingerless/pugilist
time = 60
tools = list(TOOL_WIRECUTTER)
@@ -51,7 +51,7 @@
category = CAT_CLOTHING
/datum/crafting_recipe/armwrapsplusone
- name = "armwraps of mighty fists"
+ name = "Armwraps of Mighty Fists"
result = /obj/item/clothing/gloves/fingerless/pugilist/magic
time = 300
tools = list(TOOL_WIRECUTTER, /obj/item/book/codex_gigas, /obj/item/clothing/head/wizard, /obj/item/clothing/suit/wizrobe)
@@ -327,3 +327,16 @@
/obj/item/stack/cable_coil = 10)
time = 100 //Takes awhile to put all the garlics on the coil and knot it.
category = CAT_CLOTHING
+
+/datum/crafting_recipe/gripperoffbrand
+ name = "Improvised Gripper Gloves"
+ reqs = list(
+ /obj/item/clothing/gloves/fingerless = 1,
+ // /obj/item/stack/sticky_tape = 1
+ /obj/item/stack/cable_coil = 5,
+ /obj/item/stack/sheet/cloth = 2,
+ )
+ result = /obj/item/clothing/gloves/tackler/offbrand
+ category = CAT_CLOTHING
+ tools = list(TOOL_WIRECUTTER)
+ time = 20
diff --git a/code/datums/components/crafting/recipes/recipes_misc.dm b/code/datums/components/crafting/recipes/recipes_misc.dm
index ee72745016..cf0e1bdec9 100644
--- a/code/datums/components/crafting/recipes/recipes_misc.dm
+++ b/code/datums/components/crafting/recipes/recipes_misc.dm
@@ -8,6 +8,7 @@
/obj/item/stack/sheet/plastic = 2,
/obj/item/stack/rods = 1)
result = /obj/structure/curtain
+ subcategory = CAT_FURNITURE
category = CAT_MISC
/datum/crafting_recipe/guillotine
@@ -18,6 +19,7 @@
/obj/item/stack/sheet/mineral/wood = 20,
/obj/item/stack/cable_coil = 10)
tools = list(TOOL_SCREWDRIVER, TOOL_WRENCH, TOOL_WELDER)
+ subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/femur_breaker
@@ -27,8 +29,88 @@
reqs = list(/obj/item/stack/sheet/metal = 20,
/obj/item/stack/cable_coil = 30)
tools = list(TOOL_SCREWDRIVER, TOOL_WRENCH, TOOL_WELDER)
+ subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
+// Blood Sucker stuff //
+/datum/crafting_recipe/bloodsucker/blackcoffin
+ name = "Black Coffin"
+ result = /obj/structure/closet/crate/coffin/blackcoffin
+ tools = list(/obj/item/weldingtool,
+ /obj/item/screwdriver)
+ reqs = list(/obj/item/stack/sheet/cloth = 1,
+ /obj/item/stack/sheet/mineral/wood = 5,
+ /obj/item/stack/sheet/metal = 1)
+ ///obj/item/stack/packageWrap = 8,
+ ///obj/item/pipe = 2)
+ time = 150
+ subcategory = CAT_FURNITURE
+ category = CAT_MISC
+ always_availible = TRUE
+
+/datum/crafting_recipe/bloodsucker/meatcoffin
+ name = "Meat Coffin"
+ result =/obj/structure/closet/crate/coffin/meatcoffin
+ tools = list(/obj/item/kitchen/knife,
+ /obj/item/kitchen/rollingpin)
+ reqs = list(/obj/item/reagent_containers/food/snacks/meat/slab = 5,
+ /obj/item/restraints/handcuffs/cable = 1)
+ time = 150
+ subcategory = CAT_FURNITURE
+ category = CAT_MISC
+ always_availible = TRUE
+
+/datum/crafting_recipe/bloodsucker/metalcoffin
+ name = "Metal Coffin"
+ result =/obj/structure/closet/crate/coffin/metalcoffin
+ tools = list(/obj/item/weldingtool,
+ /obj/item/screwdriver)
+ reqs = list(/obj/item/stack/sheet/metal = 5)
+ time = 100
+ subcategory = CAT_FURNITURE
+ category = CAT_MISC
+ always_availible = TRUE
+
+/datum/crafting_recipe/bloodsucker/vassalrack
+ name = "Persuasion Rack"
+ //desc = "For converting crewmembers into loyal Vassals."
+ result = /obj/structure/bloodsucker/vassalrack
+ tools = list(/obj/item/weldingtool,
+ //obj/item/screwdriver,
+ /obj/item/wrench
+ )
+ reqs = list(/obj/item/stack/sheet/mineral/wood = 3,
+ /obj/item/stack/sheet/metal = 2,
+ /obj/item/restraints/handcuffs/cable = 2,
+ //obj/item/storage/belt = 1,
+ //obj/item/stack/sheet/animalhide = 1,
+ //obj/item/stack/sheet/leather = 1,
+ //obj/item/stack/sheet/plasteel = 5
+ )
+ //parts = list(/obj/item/storage/belt = 1
+ // )
+ time = 150
+ subcategory = CAT_MISCELLANEOUS
+ category = CAT_MISC
+ always_availible = FALSE // Disabled til learned
+
+
+/datum/crafting_recipe/bloodsucker/candelabrum
+ name = "Candelabrum"
+ //desc = "For converting crewmembers into loyal Vassals."
+ result = /obj/structure/bloodsucker/candelabrum
+ tools = list(/obj/item/weldingtool,
+ /obj/item/wrench
+ )
+ reqs = list(/obj/item/stack/sheet/metal = 3,
+ /obj/item/stack/rods = 1,
+ /obj/item/candle = 1
+ )
+ time = 100
+ subcategory = CAT_MISCELLANEOUS
+ category = CAT_MISC
+ always_availible = FALSE // Disabled til learned
+
///////////////////
//Tools & Storage//
///////////////////
@@ -42,6 +124,7 @@
/obj/item/pipe = 3,
/obj/item/stack/cable_coil = 30)
category = CAT_MISC
+ subcategory = CAT_TOOL
tools = list(TOOL_WRENCH, TOOL_WELDER, TOOL_WIRECUTTER)
/datum/crafting_recipe/goldenbox
@@ -53,6 +136,23 @@
/obj/item/stack/sheet/mineral/gold = 1,
/datum/reagent/water = 15)
time = 40
+ subcategory = CAT_TOOL
+ category = CAT_MISC
+
+/datum/crafting_recipe/papersack
+ name = "Paper Sack"
+ result = /obj/item/storage/box/papersack
+ time = 10
+ reqs = list(/obj/item/paper = 5)
+ subcategory = CAT_TOOL
+ category = CAT_MISC
+
+/datum/crafting_recipe/smallcarton
+ name = "Small Carton"
+ result = /obj/item/reagent_containers/food/drinks/sillycup/smallcarton
+ time = 10
+ reqs = list(/obj/item/stack/sheet/cardboard = 1)
+ subcategory = CAT_TOOL
category = CAT_MISC
/datum/crafting_recipe/bronze_driver
@@ -64,6 +164,7 @@
/obj/item/stack/tile/bronze = 1,
/datum/reagent/water = 15)
time = 40
+ subcategory = CAT_TOOL
category = CAT_MISC
/datum/crafting_recipe/bronze_welder
@@ -75,6 +176,7 @@
/obj/item/stack/tile/bronze = 1,
/datum/reagent/water = 15)
time = 40
+ subcategory = CAT_TOOL
category = CAT_MISC
/datum/crafting_recipe/bronze_wirecutters
@@ -86,6 +188,7 @@
/obj/item/stack/tile/bronze = 1,
/datum/reagent/water = 15)
time = 40
+ subcategory = CAT_TOOL
category = CAT_MISC
/datum/crafting_recipe/bronze_crowbar
@@ -97,6 +200,7 @@
/obj/item/stack/tile/bronze = 1,
/datum/reagent/water = 15)
time = 40
+ subcategory = CAT_TOOL
category = CAT_MISC
/datum/crafting_recipe/bronze_wrench
@@ -108,6 +212,7 @@
/obj/item/stack/tile/bronze = 1,
/datum/reagent/water = 15)
time = 40
+ subcategory = CAT_TOOL
category = CAT_MISC
/datum/crafting_recipe/rcl
@@ -116,6 +221,16 @@
time = 40
tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WRENCH)
reqs = list(/obj/item/stack/sheet/metal = 15)
+ subcategory = CAT_TOOL
+ category = CAT_MISC
+
+/datum/crafting_recipe/picket_sign
+ name = "Picket Sign"
+ result = /obj/item/picket_sign
+ reqs = list(/obj/item/stack/rods = 1,
+ /obj/item/stack/sheet/cardboard = 2)
+ time = 80
+ subcategory = CAT_TOOL
category = CAT_MISC
////////////
@@ -128,6 +243,7 @@
reqs = list(/obj/item/stack/sheet/plasteel = 2,
/obj/item/stack/rods = 8)
time = 100
+ subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/skateboard
@@ -136,6 +252,7 @@
time = 60
reqs = list(/obj/item/stack/sheet/metal = 5,
/obj/item/stack/rods = 10)
+ subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/scooter
@@ -144,6 +261,7 @@
time = 65
reqs = list(/obj/item/stack/sheet/metal = 5,
/obj/item/stack/rods = 12)
+ subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/////////
@@ -154,18 +272,21 @@
name = "Toy Sword"
reqs = list(/obj/item/light/bulb = 1, /obj/item/stack/cable_coil = 1, /obj/item/stack/sheet/plastic = 4)
result = /obj/item/toy/sword
+ subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/extendohand
name = "Extendo-Hand"
reqs = list(/obj/item/bodypart/r_arm/robot = 1, /obj/item/clothing/gloves/boxing = 1)
result = /obj/item/extendohand
+ subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/toyneb
name = "Non-Euplastic Blade"
reqs = list(/obj/item/light/tube = 1, /obj/item/stack/cable_coil = 1, /obj/item/stack/sheet/plastic = 4)
result = /obj/item/toy/sword/cx
+ subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
////////////
@@ -176,6 +297,7 @@
name = "Black Carpet"
reqs = list(/obj/item/stack/tile/carpet = 50, /obj/item/toy/crayon/black = 1)
result = /obj/item/stack/tile/carpet/black/fifty
+ subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/paperframes
@@ -183,6 +305,7 @@
result = /obj/item/stack/sheet/paperframes/five
time = 10
reqs = list(/obj/item/stack/sheet/mineral/wood = 5, /obj/item/paper = 20)
+ subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/naturalpaper
@@ -191,6 +314,7 @@
reqs = list(/datum/reagent/water = 50, /obj/item/stack/sheet/mineral/wood = 1)
tools = list(/obj/item/hatchet)
result = /obj/item/paper_bin/bundlenatural
+ subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/bluespacehonker
@@ -200,6 +324,7 @@
reqs = list(/obj/item/stack/ore/bluespace_crystal = 1,
/obj/item/toy/crayon/blue = 1,
/obj/item/bikehorn = 1)
+ subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/mousetrap
@@ -208,13 +333,7 @@
time = 10
reqs = list(/obj/item/stack/sheet/cardboard = 1,
/obj/item/stack/rods = 1)
- category = CAT_MISC
-
-/datum/crafting_recipe/papersack
- name = "Paper Sack"
- result = /obj/item/storage/box/papersack
- time = 10
- reqs = list(/obj/item/paper = 5)
+ subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/flashlight_eyes
@@ -225,13 +344,7 @@
/obj/item/flashlight = 2,
/obj/item/restraints/handcuffs/cable = 1
)
- category = CAT_MISC
-
-/datum/crafting_recipe/smallcarton
- name = "Small Carton"
- result = /obj/item/reagent_containers/food/drinks/sillycup/smallcarton
- time = 10
- reqs = list(/obj/item/stack/sheet/cardboard = 1)
+ subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/pressureplate
@@ -242,6 +355,7 @@
/obj/item/stack/tile/plasteel = 1,
/obj/item/stack/cable_coil = 2,
/obj/item/assembly/igniter = 1)
+ subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/gold_horn
@@ -250,6 +364,7 @@
time = 20
reqs = list(/obj/item/stack/sheet/mineral/bananium = 5,
/obj/item/bikehorn = 1)
+ subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/spooky_camera
@@ -259,6 +374,7 @@
reqs = list(/obj/item/camera = 1,
/datum/reagent/water/holywater = 10)
parts = list(/obj/item/camera = 1)
+ subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/paperwork
@@ -267,6 +383,16 @@
time = 10 //Takes time for people to file and complete paper work!
tools = list(/obj/item/pen)
reqs = list(/obj/item/folder/paperwork = 1)
+ subcategory = CAT_MISCELLANEOUS
+ category = CAT_MISC
+
+/datum/crafting_recipe/coconut_bong
+ name = "Coconut Bong"
+ result = /obj/item/bong/coconut
+ reqs = list(/obj/item/stack/sheet/mineral/bamboo = 2,
+ /obj/item/reagent_containers/food/snacks/grown/coconut = 1)
+ time = 70
+ subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
//////////////
@@ -279,6 +405,7 @@
time = 40
reqs = list(/obj/item/stack/rods = 2,
/obj/item/clothing/under/rank/captain/parade = 1)
+ subcategory = CAT_FURNITURE
category = CAT_MISC
/datum/crafting_recipe/engineering_banner
@@ -287,6 +414,7 @@
time = 40
reqs = list(/obj/item/stack/rods = 2,
/obj/item/clothing/under/rank/engineering/engineer = 1)
+ subcategory = CAT_FURNITURE
category = CAT_MISC
/datum/crafting_recipe/cargo_banner
@@ -295,6 +423,7 @@
time = 40
reqs = list(/obj/item/stack/rods = 2,
/obj/item/clothing/under/rank/cargo/tech = 1)
+ subcategory = CAT_FURNITURE
category = CAT_MISC
/datum/crafting_recipe/science_banner
@@ -303,6 +432,7 @@
time = 40
reqs = list(/obj/item/stack/rods = 2,
/obj/item/clothing/under/rank/rnd/scientist = 1)
+ subcategory = CAT_FURNITURE
category = CAT_MISC
/datum/crafting_recipe/medical_banner
@@ -311,6 +441,7 @@
time = 40
reqs = list(/obj/item/stack/rods = 2,
/obj/item/clothing/under/rank/medical/doctor = 1)
+ subcategory = CAT_FURNITURE
category = CAT_MISC
/datum/crafting_recipe/security_banner
@@ -319,50 +450,5 @@
time = 40
reqs = list(/obj/item/stack/rods = 2,
/obj/item/clothing/under/rank/security/officer = 1)
+ subcategory = CAT_FURNITURE
category = CAT_MISC
-
- /datum/crafting_recipe/bloodsucker/vassalrack
- name = "Persuasion Rack"
- //desc = "For converting crewmembers into loyal Vassals."
- result = /obj/structure/bloodsucker/vassalrack
- tools = list(/obj/item/weldingtool,
- ///obj/item/screwdriver,
- /obj/item/wrench
- )
- reqs = list(/obj/item/stack/sheet/mineral/wood = 3,
- /obj/item/stack/sheet/metal = 2,
- /obj/item/restraints/handcuffs/cable = 2,
- ///obj/item/storage/belt = 1
- ///obj/item/stack/sheet/animalhide = 1, // /obj/item/stack/sheet/leather = 1,
- ///obj/item/stack/sheet/plasteel = 5
- )
- //parts = list(/obj/item/storage/belt = 1
- // )
-
- time = 150
- category = CAT_MISC
- always_availible = FALSE // Disabled til learned
-
-
- /datum/crafting_recipe/bloodsucker/candelabrum
- name = "Candelabrum"
- //desc = "For converting crewmembers into loyal Vassals."
- result = /obj/structure/bloodsucker/candelabrum
- tools = list(/obj/item/weldingtool,
- /obj/item/wrench
- )
- reqs = list(/obj/item/stack/sheet/metal = 3,
- /obj/item/stack/rods = 1,
- /obj/item/candle = 1
- )
- time = 100
- category = CAT_MISC
- always_availible = FALSE // Disabled til learned
-
-/datum/crafting_recipe/coconut_bong
- name = "Coconut Bong"
- result = /obj/item/bong/coconut
- reqs = list(/obj/item/stack/sheet/mineral/bamboo = 2,
- /obj/item/reagent_containers/food/snacks/grown/coconut = 1)
- time = 70
- category = CAT_MISC
\ No newline at end of file
diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm
new file mode 100644
index 0000000000..ddc47d59a1
--- /dev/null
+++ b/code/datums/components/tackle.dm
@@ -0,0 +1,491 @@
+#define MAX_TABLE_MESSES 8 // how many things can we knock off a table at once?
+
+/**
+ *#tackle.dm
+ *
+ * For when you want to throw a person at something and have fun stuff happen
+ *
+ * This component is made for carbon mobs (really, humans), and allows its parent to throw themselves and perform tackles. This is done by enabling throw mode, then clicking on your
+ * intended target with an empty hand. You will then launch toward your target. If you hit a carbon, you'll roll to see how hard you hit them. If you hit a solid non-mob, you'll
+ * roll to see how badly you just messed yourself up. If, along your journey, you hit a table, you'll slam onto it and send up to MAX_TABLE_MESSES (8) /obj/items on the table flying,
+ * and take a bit of extra damage and stun for each thing launched.
+ *
+ * There are 2 """skill rolls""" involved here, which are handled and explained in sack() and rollTackle() (for roll 1, carbons), and splat() (for roll 2, walls and solid objects)
+*/
+/datum/component/tackler
+ dupe_mode = COMPONENT_DUPE_UNIQUE
+ ///How much stamina it takes to launch a tackle
+ var/stamina_cost
+ ///Launching a tackle calls Knockdown on you for this long, so this is your cooldown. Once you stand back up, you can tackle again.
+ var/base_knockdown
+ ///Your max range for how far you can tackle.
+ var/range
+ ///How fast you sail through the air. Standard tackles are 1 speed, but gloves that throw you faster come at a cost: higher speeds make it more likely you'll be badly injured if you fly into a non-mob obstacle.
+ var/speed
+ ///A flat modifier to your roll against your target, as described in [rollTackle()][/datum/component/tackler/proc/rollTackle]. Slightly misleading, skills aren't relevant here, this is a matter of what type of gloves (or whatever) is granting you the ability to tackle.
+ var/skill_mod
+ ///Some gloves, generally ones that increase mobility, may have a minimum distance to fly. Rocket gloves are especially dangerous with this, be sure you'll hit your target or have a clear background if you miss, or else!
+ var/min_distance
+ ///The throwdatum we're currently dealing with, if we need it
+ var/datum/thrownthing/tackle
+
+/datum/component/tackler/Initialize(stamina_cost = 25, base_knockdown = 1 SECONDS, range = 4, speed = 1, skill_mod = 0, min_distance = min_distance)
+ if(!iscarbon(parent))
+ return COMPONENT_INCOMPATIBLE
+
+ src.stamina_cost = stamina_cost
+ src.base_knockdown = base_knockdown
+ src.range = range
+ src.speed = speed
+ src.skill_mod = skill_mod
+ src.min_distance = min_distance
+
+ var/mob/living/carbon/P = parent
+ to_chat(P, "You are now able to launch tackles! You can do so by activating throw intent, and clicking on your target with an empty hand.")
+ P.tackling = TRUE
+ addtimer(CALLBACK(src, .proc/resetTackle), base_knockdown, TIMER_STOPPABLE)
+
+/datum/component/tackler/Destroy()
+ var/mob/living/carbon/P = parent
+ to_chat(P, "You can no longer tackle.")
+ P.tackling = FALSE
+ ..()
+
+/datum/component/tackler/RegisterWithParent()
+ RegisterSignal(parent, COMSIG_MOB_CLICKON, .proc/checkTackle)
+ RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, .proc/sack)
+ RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, .proc/registerTackle)
+
+/datum/component/tackler/UnregisterFromParent()
+ UnregisterSignal(parent, list(COMSIG_MOB_CLICKON, COMSIG_MOVABLE_IMPACT, COMSIG_MOVABLE_MOVED, COMSIG_MOVABLE_POST_THROW))
+
+///Store the thrownthing datum for later use
+/datum/component/tackler/proc/registerTackle(mob/living/carbon/user, datum/thrownthing/TT)
+ tackle = TT
+
+///See if we can tackle or not. If we can, leap!
+/datum/component/tackler/proc/checkTackle(mob/living/carbon/user, atom/A, params)
+ if(!user.in_throw_mode || user.get_active_held_item() || user.pulling || user.buckling)
+ return
+
+ if(HAS_TRAIT(user, TRAIT_HULK))
+ to_chat(user, "You're too angry to remember how to tackle!")
+ return
+
+ if(user.restrained())
+ to_chat(user, "You need free use of your hands to tackle!")
+ return
+
+ if(!(user.mobility_flags & MOBILITY_STAND))
+ to_chat(user, "You must be standing to tackle!")
+ return
+
+ if(user.tackling)
+ to_chat(user, "You're not ready to tackle!")
+ return
+
+ if(user.has_status_effect(STATUS_EFFECT_TASED)) // can't tackle if you just got tased
+ to_chat(user, "You can't tackle while tased!")
+ return
+
+ user.face_atom(A)
+
+ var/list/modifiers = params2list(params)
+ if(modifiers["alt"] || modifiers["shift"] || modifiers["ctrl"] || modifiers["middle"])
+ return
+
+ user.tackling = TRUE
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/checkObstacle)
+ playsound(user, 'sound/weapons/thudswoosh.ogg', 40, TRUE, -1)
+
+ var/leap_word = iscatperson(user) ? "pounce" : "leap" ///If cat, "pounce" instead of "leap".
+ if(can_see(user, A, 7))
+ user.visible_message("[user] [leap_word]s at [A]!", "You [leap_word] at [A]!")
+ else
+ user.visible_message("[user] [leap_word]s!", "You [leap_word]!")
+
+ if(get_dist(user, A) < min_distance)
+ A = get_ranged_target_turf(user, get_dir(user, A), min_distance) //TODO: this only works in cardinals/diagonals, make it work with in-betweens too!
+
+ user.Knockdown(base_knockdown, TRUE, TRUE)
+ user.adjustStaminaLoss(stamina_cost)
+ user.throw_at(A, range, speed, user, FALSE)
+ user.toggle_throw_mode()
+ addtimer(CALLBACK(src, .proc/resetTackle), base_knockdown, TIMER_STOPPABLE)
+ return(COMSIG_MOB_CANCEL_CLICKON)
+
+/**
+ * sack()
+ *
+ * sack() is called when you actually smack into something, assuming we're mid-tackle. First it deals with smacking into non-carbons, in two cases:
+ * * If it's a non-carbon mob, we don't care, get out of here and do normal thrown-into-mob stuff
+ * * Else, if it's something dense (walls, machinery, structures, most things other than the floor), go to splat() and get ready for some high grade shit
+ *
+ * If it's a carbon we hit, we'll call rollTackle() which rolls a die and calculates modifiers for both the tackler and target, then gives us a number. Negatives favor the target, while positives favor the tackler.
+ * Check [rollTackle()][/datum/component/tackler/proc/rollTackle] for a more thorough explanation on the modifiers at play.
+ *
+ * Then, we figure out what effect we want, and we get to work! Note that with standard gripper gloves and no modifiers, the range of rolls is (-3, 3). The results are as follows, based on what we rolled:
+ * * -inf to -5: Seriously botched tackle, tackler suffers a concussion, brute damage, and a 3 second paralyze, target suffers nothing
+ * * -4 to -2: weak tackle, tackler gets 3 second knockdown, target gets shove slowdown but is otherwise fine
+ * * -1 to 0: decent tackle, tackler gets up a bit quicker than the target
+ * * 1: solid tackle, tackler has more of an advantage getting up quicker
+ * * 2 to 4: expert tackle, tackler has sizeable advantage and lands on their feet with a free passive grab
+ * * 5 to inf: MONSTER tackle, tackler gets up immediately and gets a free aggressive grab, target takes sizeable stamina damage from the hit and is paralyzed for one and a half seconds and knocked down for three seconds
+ *
+ * Finally, we return a bitflag to [COMSIG_MOVABLE_IMPACT] that forces the hitpush to false so that we don't knock them away.
+*/
+/datum/component/tackler/proc/sack(mob/living/carbon/user, atom/hit)
+ if(!user.tackling || !tackle)
+ return
+
+ if(!iscarbon(hit))
+ if(hit.density)
+ return splat(user, hit)
+ return
+
+ var/mob/living/carbon/target = hit
+ var/tackle_word = iscatperson(user) ? "pounce" : "tackle" ///If cat, "pounce" instead of "tackle".
+
+ var/roll = rollTackle(target)
+ user.tackling = FALSE
+
+ switch(roll)
+ if(-INFINITY to -5)
+ user.visible_message("[user] botches [user.p_their()] [tackle_word] and slams [user.p_their()] head into [target], knocking [user.p_them()]self silly!", "You botch your [tackle_word] and slam your head into [target], knocking yourself silly!", target)
+ to_chat(target, "[user] botches [user.p_their()] [tackle_word] and slams [user.p_their()] head into you, knocking [user.p_them()]self silly!")
+
+ user.Paralyze(30)
+ var/obj/item/bodypart/head/hed = user.get_bodypart(BODY_ZONE_HEAD)
+ if(hed)
+ hed.receive_damage(brute=20, updating_health=TRUE)
+ user.gain_trauma(/datum/brain_trauma/mild/concussion)
+
+ if(-4 to -2) // glancing blow at best
+ user.visible_message("[user] lands a weak [tackle_word] on [target], briefly knocking [target.p_them()] off-balance!", "You land a weak [tackle_word] on [target], briefly knocking [target.p_them()] off-balance!", target)
+ to_chat(target, "[user] lands a weak [tackle_word] on you, briefly knocking you off-balance!")
+
+ user.Knockdown(30)
+ target.apply_status_effect(STATUS_EFFECT_TASED_WEAK, 6 SECONDS)
+
+ if(-1 to 0) // decent hit, both parties are about equally inconvenienced
+ user.visible_message("[user] lands a passable [tackle_word] on [target], sending them both tumbling!", "You land a passable [tackle_word] on [target], sending you both tumbling!", target)
+ to_chat(target, "[user] lands a passable [tackle_word] on you, sending you both tumbling!")
+
+ target.adjustStaminaLoss(stamina_cost)
+ target.Paralyze(5)
+ user.Knockdown(20)
+ target.Knockdown(25)
+
+ if(1 to 2) // solid hit, tackler has a slight advantage
+ user.visible_message("[user] lands a solid [tackle_word] on [target], knocking them both down hard!", "You land a solid [tackle_word] on [target], knocking you both down hard!", target)
+ to_chat(target, "[user] lands a solid [tackle_word] on you, knocking you both down hard!")
+
+ target.adjustStaminaLoss(30)
+ target.Paralyze(5)
+ user.Knockdown(10)
+ target.Knockdown(20)
+
+ if(3 to 4) // really good hit, the target is definitely worse off here. Without positive modifiers, this is as good a tackle as you can land
+ user.visible_message("[user] lands an expert [tackle_word] on [target], knocking [target.p_them()] down hard while landing on [user.p_their()] feet with a passive grip!", "You land an expert [tackle_word] on [target], knocking [target.p_them()] down hard while landing on your feet with a passive grip!", target)
+ to_chat(target, "[user] lands an expert [tackle_word] on you, knocking you down hard and maintaining a passive grab!")
+
+ user.SetKnockdown(0)
+ user.set_resting(FALSE, TRUE, FALSE)
+ user.forceMove(get_turf(target))
+ target.adjustStaminaLoss(40)
+ target.Paralyze(5)
+ target.Knockdown(30)
+ if(ishuman(target) && iscarbon(user))
+ target.grabbedby(user)
+
+ if(5 to INFINITY) // absolutely BODIED
+ user.visible_message("[user] lands a monster [tackle_word] on [target], knocking [target.p_them()] senseless and applying an aggressive pin!", "You land a monster [tackle_word] on [target], knocking [target.p_them()] senseless and applying an aggressive pin!", target)
+ to_chat(target, "[user] lands a monster [tackle_word] on you, knocking you senseless and aggressively pinning you!")
+
+ user.SetKnockdown(0)
+ user.set_resting(FALSE, TRUE, FALSE)
+ user.forceMove(get_turf(target))
+ target.adjustStaminaLoss(40)
+ target.Paralyze(5)
+ target.Knockdown(30)
+ if(ishuman(target) && iscarbon(user))
+ target.grabbedby(user)
+ target.grippedby(user, instant = TRUE)
+
+ SEND_SIGNAL(user, COMSIG_CARBON_TACKLED, roll)
+ return COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH
+
+/**
+ * rollTackle()
+ *
+ * This handles all of the modifiers for the actual carbon-on-carbon tackling, and gets its own proc because of how many there are (with plenty more in mind!)
+ *
+ * The base roll is between (-3, 3), with negative numbers favoring the target, and positive numbers favoring the tackler. The target and the tackler are both assessed for
+ * how easy they are to knock over, with clumsiness and dwarfiness being strong maluses for each, and gigantism giving a bonus for each. These numbers and ideas
+ * are absolutely subject to change.
+
+ * In addition, after subtracting the defender's mod and adding the attacker's mod to the roll, the component's base (skill) mod is added as well. Some sources of tackles
+ * are better at taking people down, like the bruiser and rocket gloves, while the dolphin gloves have a malus in exchange for better mobility.
+*/
+/datum/component/tackler/proc/rollTackle(mob/living/carbon/target)
+ var/defense_mod = 0
+ var/attack_mod = 0
+
+ // DE-FENSE
+ if(target.drunkenness > 60) // drunks are easier to knock off balance
+ defense_mod -= 3
+ else if(target.drunkenness > 30)
+ defense_mod -= 1
+ if(HAS_TRAIT(target, TRAIT_CLUMSY))
+ defense_mod -= 2
+ if(HAS_TRAIT(target, TRAIT_FAT)) // chonkers are harder to knock over
+ defense_mod += 1
+ //if(HAS_TRAIT(target, TRAIT_GRABWEAKNESS)) Todo, port the pushover trait
+ //defense_mod -= 2
+ if(HAS_TRAIT(target, TRAIT_DWARF))
+ defense_mod -= 2
+ if(HAS_TRAIT(target, TRAIT_GIANT))
+ defense_mod += 2
+
+ if(ishuman(target))
+ var/mob/living/carbon/human/T = target
+ var/suit_slot = T.get_item_by_slot(ITEM_SLOT_OCLOTHING)
+
+ if(isnull(T.wear_suit) && isnull(T.w_uniform)) // who honestly puts all of their effort into tackling a naked guy?
+ defense_mod += 2
+ if(suit_slot && (istype(suit_slot,/obj/item/clothing/suit/space/hardsuit)))
+ defense_mod += 1
+ if(T.is_shove_knockdown_blocked()) // riot armor and such
+ defense_mod += 5
+ if(T.is_holding_item_of_type(/obj/item/shield))
+ defense_mod += 2
+
+ if(islizard(T))
+ if(!T.getorganslot(ORGAN_SLOT_TAIL)) // lizards without tails are off-balance
+ defense_mod -= 1
+ else if(T.dna.species.is_wagging_tail()) // lizard tail wagging is robust and can swat away assailants!
+ defense_mod += 1
+
+ // OF-FENSE
+ var/mob/living/carbon/sacker = parent
+
+ if(sacker.drunkenness > 60) // you're far too drunk to hold back!
+ attack_mod += 1
+ else if(sacker.drunkenness > 30) // if you're only a bit drunk though, you're just sloppy
+ attack_mod -= 1
+ if(HAS_TRAIT(sacker, TRAIT_CLUMSY))
+ attack_mod -= 2
+ if(HAS_TRAIT(sacker, TRAIT_DWARF))
+ attack_mod -= 2
+ if(HAS_TRAIT(sacker, TRAIT_GIANT))
+ attack_mod += 2
+
+ if(ishuman(target))
+ var/mob/living/carbon/human/S = sacker
+
+ var/suit_slot = S.get_item_by_slot(ITEM_SLOT_OCLOTHING)
+ if(suit_slot && (istype(suit_slot,/obj/item/clothing/suit/armor/riot))) // tackling in riot armor is more effective, but tiring
+ attack_mod += 2
+ sacker.adjustStaminaLoss(20)
+
+ var/r = rand(-3, 3) - defense_mod + attack_mod + skill_mod
+ return r
+
+
+/**
+ * splat()
+ *
+ * This is where we handle diving into dense atoms, generally with effects ranging from bad to REALLY bad. This works as a percentile roll that is modified in two steps as detailed below. The higher
+ * the roll, the more severe the result.
+ *
+ * Mod 1: Speed
+ * * Base tackle speed is 1, which is what normal gripper gloves use. For other sources with higher speed tackles, like dolphin and ESPECIALLY rocket gloves, we obey Newton's laws and hit things harder.
+ * * For every unit of speed above 1, move the lower bound of the roll up by 15. Unlike Mod 2, this only serves to raise the lower bound, so it can't be directly counteracted by anything you can control.
+ *
+ * Mod 2: Misc
+ * -Flat modifiers, these take whatever you rolled and add/subtract to it, with the end result capped between the minimum from Mod 1 and 100. Note that since we can't roll higher than 100 to start with,
+ * wearing a helmet should be enough to remove any chance of permanently paralyzing yourself and dramatically lessen knocking yourself unconscious, even with rocket gloves. Will expand on maybe
+ * * Wearing a helmet: -6
+ * * Wearing armor: -6
+ * * Clumsy: +6
+ *
+ * Effects: Below are the outcomes based off your roll, in order of increasing severity
+ * * 1-63: Knocked down for a few seconds and a bit of brute and stamina damage
+ * * 64-83: Knocked silly, gain some confusion as well as the above
+ * * 84-93: Cranial trauma, get a concussion and more confusion, plus more damage
+ * * 94-98: Knocked unconscious, significant chance to get a random mild brain trauma, as well as a fair amount of damage
+ * * 99-100: Break your spinal cord, get paralyzed, take a bunch of damage too. Very unlucky!
+*/
+/datum/component/tackler/proc/splat(mob/living/carbon/user, atom/hit)
+ if(istype(hit, /obj/structure/window))
+ var/obj/structure/window/W = hit
+ splatWindow(user, W)
+ if(QDELETED(W))
+ return COMPONENT_MOVABLE_IMPACT_NEVERMIND
+ return
+
+ var/oopsie_mod = 0
+ var/danger_zone = (speed - 1) * 15 // for every extra speed we have over 1, take away 15 of the safest chance
+ danger_zone = max(min(danger_zone, 100), 1)
+
+ if(ishuman(user))
+ var/mob/living/carbon/human/S = user
+ var/head_slot = S.get_item_by_slot(ITEM_SLOT_HEAD)
+ var/suit_slot = S.get_item_by_slot(ITEM_SLOT_OCLOTHING)
+ if(head_slot && (istype(head_slot,/obj/item/clothing/head/helmet) || istype(head_slot,/obj/item/clothing/head/hardhat)))
+ oopsie_mod -= 6
+ if(suit_slot && (istype(suit_slot,/obj/item/clothing/suit/armor/)))
+ oopsie_mod -= 6
+
+ if(HAS_TRAIT(user, TRAIT_CLUMSY))
+ oopsie_mod += 6 //honk!
+
+ var/oopsie = rand(danger_zone, 100)
+ if(oopsie >= 94 && oopsie_mod < 0) // good job avoiding getting paralyzed! gold star!
+ to_chat(user, "You're really glad you're wearing protection!")
+ oopsie += oopsie_mod
+
+ switch(oopsie)
+ if(99 to INFINITY)
+ // can you imagine standing around minding your own business when all of the sudden some guy fucking launches himself into a wall at full speed and irreparably paralyzes himself?
+ user.visible_message("[user] slams face-first into [hit] at an awkward angle, severing [user.p_their()] spinal column with a sickening crack! Holy shit!", "You slam face-first into [hit] at an awkward angle, severing your spinal column with a sickening crack! Holy shit!")
+ user.adjustStaminaLoss(30)
+ user.adjustBruteLoss(30)
+ playsound(user, 'sound/effects/blobattack.ogg', 60, TRUE)
+ playsound(user, 'sound/effects/splat.ogg', 70, TRUE)
+ user.emote("scream")
+ user.gain_trauma(/datum/brain_trauma/severe/paralysis/paraplegic) // oopsie indeed!
+ shake_camera(user, 7, 7)
+ user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash)
+ user.clear_fullscreen("flash", 4.5)
+
+ if(94 to 98)
+ user.visible_message("[user] slams face-first into [hit] with a concerning squish, immediately going limp!", "You slam face-first into [hit], and immediately lose consciousness!")
+ user.adjustStaminaLoss(100)
+ user.adjustBruteLoss(30)
+ user.Unconscious(100)
+ user.gain_trauma_type(BRAIN_TRAUMA_MILD)
+ user.playsound_local(get_turf(user), 'sound/weapons/flashbang.ogg', 100, TRUE, 8, 0.9)
+ shake_camera(user, 6, 6)
+ user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash)
+ user.clear_fullscreen("flash", 3.5)
+
+ if(84 to 93)
+ user.visible_message("[user] slams head-first into [hit], suffering major cranial trauma!", "You slam head-first into [hit], and the world explodes around you!")
+ user.adjustStaminaLoss(30)
+ user.adjustBruteLoss(30)
+ user.confused += 15
+ if(prob(80))
+ user.gain_trauma(/datum/brain_trauma/mild/concussion)
+ user.playsound_local(get_turf(user), 'sound/weapons/flashbang.ogg', 100, TRUE, 8, 0.9)
+ user.DefaultCombatKnockdown(40)
+ shake_camera(user, 5, 5)
+ user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash)
+ user.clear_fullscreen("flash", 2.5)
+
+ if(64 to 83)
+ user.visible_message("[user] slams hard into [hit], knocking [user.p_them()] senseless!", "You slam hard into [hit], knocking yourself senseless!")
+ user.adjustStaminaLoss(30)
+ user.adjustBruteLoss(10)
+ user.confused += 10
+ user.DefaultCombatKnockdown(30)
+ shake_camera(user, 3, 4)
+
+ if(1 to 63)
+ user.visible_message("[user] slams into [hit]!", "You slam into [hit]!")
+ user.adjustStaminaLoss(20)
+ user.adjustBruteLoss(10)
+ user.DefaultCombatKnockdown(30)
+ shake_camera(user, 2, 2)
+
+ playsound(user, 'sound/weapons/smash.ogg', 70, TRUE)
+
+
+/datum/component/tackler/proc/resetTackle()
+ var/mob/living/carbon/P = parent
+ P.tackling = FALSE
+ QDEL_NULL(tackle)
+ UnregisterSignal(parent, COMSIG_MOVABLE_MOVED)
+
+///A special case for splatting for handling windows
+/datum/component/tackler/proc/splatWindow(mob/living/carbon/user, obj/structure/window/W)
+ playsound(user, "sound/effects/Glasshit.ogg", 140, TRUE)
+
+ if(W.type in list(/obj/structure/window, /obj/structure/window/fulltile, /obj/structure/window/unanchored, /obj/structure/window/fulltile/unanchored)) // boring unreinforced windows
+ for(var/i = 0, i < speed, i++)
+ var/obj/item/shard/shard = new /obj/item/shard(get_turf(user))
+ //shard.embedding = list(embed_chance = 100, ignore_throwspeed_threshold = TRUE, impact_pain_mult=3, pain_chance=5)
+ //shard.AddElement(/datum/element/embed, shard.embedding)
+ user.hitby(shard, skipcatch = TRUE, hitpush = FALSE)
+ //shard.embedding = list()
+ //shard.AddElement(/datum/element/embed, shard.embedding)
+ W.obj_destruction()
+ user.adjustStaminaLoss(10 * speed)
+ user.DefaultCombatKnockdown(40)
+ user.Paralyze(5)
+ user.visible_message("[user] slams into [W] and shatters it, shredding [user.p_them()]self with glass!", "You slam into [W] and shatter it, shredding yourself with glass!")
+
+ else
+ user.visible_message("[user] slams into [W] like a bug, then slowly slides off it!", "You slam into [W] like a bug, then slowly slide off it!")
+ user.Paralyze(2)
+ user.DefaultCombatKnockdown(20)
+ W.take_damage(20 * speed)
+ user.adjustStaminaLoss(10 * speed)
+ user.adjustBruteLoss(5 * speed)
+
+/datum/component/tackler/proc/delayedSmash(obj/structure/window/W)
+ if(W)
+ W.obj_destruction()
+ playsound(W, "shatter", 70, TRUE)
+
+///Check to see if we hit a table, and if so, make a big mess!
+/datum/component/tackler/proc/checkObstacle(mob/living/carbon/owner)
+ if(!owner.tackling)
+ return
+
+ var/turf/T = get_turf(owner)
+ var/obj/structure/table/kevved = locate(/obj/structure/table) in T.contents
+ if(!kevved)
+ return
+
+ var/list/messes = list()
+
+ // we split the mess-making into two parts (check what we're gonna send flying, intermission for dealing with the tackler, then actually send stuff flying) for the benefit of making sure the face-slam text
+ // comes before the list of stuff that goes flying, but can still adjust text + damage to how much of a mess it made
+ for(var/obj/item/I in T.contents)
+ if(!I.anchored)
+ messes += I
+ if(messes.len >= MAX_TABLE_MESSES)
+ break
+
+ /// for telling HOW big of a mess we just made
+ var/HOW_big_of_a_miss_did_we_just_make = ""
+ if(messes.len)
+ if(messes.len < MAX_TABLE_MESSES / 4)
+ HOW_big_of_a_miss_did_we_just_make = ", making a mess"
+ else if(messes.len < MAX_TABLE_MESSES / 2)
+ HOW_big_of_a_miss_did_we_just_make = ", making a big mess"
+ else if(messes.len < MAX_TABLE_MESSES)
+ HOW_big_of_a_miss_did_we_just_make = ", making a giant mess"
+ else
+ HOW_big_of_a_miss_did_we_just_make = ", making a ginormous mess!" // an extra exclamation point!! for emphasis!!!
+
+ owner.visible_message("[owner] trips over [kevved] and slams into it face-first[HOW_big_of_a_miss_did_we_just_make]!", "You trip over [kevved] and slam into it face-first[HOW_big_of_a_miss_did_we_just_make]!")
+ owner.adjustStaminaLoss(20 + messes.len * 2)
+ owner.adjustBruteLoss(10 + messes.len)
+ owner.Paralyze(2 * messes.len)
+ owner.DefaultCombatKnockdown(20 + 5 * messes.len) // 2 seconds of knockdown after the paralyze
+
+ for(var/obj/item/I in messes)
+ var/dist = rand(1, 3)
+ var/sp = 2
+ if(prob(25 * (src.speed - 1))) // if our tackle speed is higher than 1, with chance (speed - 1 * 25%), throw the thing at our tackle speed + 1
+ sp = speed + 1
+ I.throw_at(get_ranged_target_turf(I, pick(GLOB.alldirs), range = dist), range = dist, speed = sp)
+ I.visible_message("[I] goes flying[sp > 3 ? " dangerously fast" : ""]!") // standard embed speed
+
+ playsound(owner, 'sound/weapons/smash.ogg', 70, TRUE)
+ tackle.finalize(hit=TRUE)
+ resetTackle()
+
+#undef MAX_TABLE_MESSES
diff --git a/code/datums/elements/squish.dm b/code/datums/elements/squish.dm
new file mode 100644
index 0000000000..823d391e14
--- /dev/null
+++ b/code/datums/elements/squish.dm
@@ -0,0 +1,28 @@
+#define SHORT 5/7
+#define TALL 7/5
+
+/datum/element/squish
+ element_flags = ELEMENT_DETACH
+
+/datum/element/squish/Attach(datum/target, duration)
+ . = ..()
+ if(!iscarbon(target))
+ return ELEMENT_INCOMPATIBLE
+
+ var/mob/living/carbon/C = target
+ var/was_lying = (C.lying != 0)
+ addtimer(CALLBACK(src, .proc/Detach, C, was_lying), duration)
+
+ C.transform = C.transform.Scale(TALL, SHORT)
+
+/datum/element/squish/Detach(mob/living/carbon/C, was_lying)
+ . = ..()
+ if(istype(C))
+ var/is_lying = (C.lying != 0)
+ if(was_lying == is_lying)
+ C.transform = C.transform.Scale(SHORT, TALL)
+ else
+ C.transform = C.transform.Scale(TALL, SHORT)
+
+#undef SHORT
+#undef TALL
diff --git a/code/datums/martial/_martial.dm b/code/datums/martial/_martial.dm
index d8a888871e..e54a80bd81 100644
--- a/code/datums/martial/_martial.dm
+++ b/code/datums/martial/_martial.dm
@@ -10,6 +10,7 @@
var/help_verb
var/pacifism_check = TRUE //are the martial arts combos/attacks unable to be used by pacifist.
var/allow_temp_override = TRUE //if this martial art can be overridden by temporary martial arts
+ var/pugilist = FALSE
/datum/martial_art/proc/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
return FALSE
@@ -61,7 +62,8 @@
if(help_verb)
H.verbs += help_verb
H.mind.martial_art = src
- ADD_TRAIT(H, TRAIT_PUGILIST, MARTIAL_ARTIST_TRAIT)
+ if(pugilist)
+ ADD_TRAIT(H, TRAIT_PUGILIST, MARTIAL_ARTIST_TRAIT)
return TRUE
/datum/martial_art/proc/store(datum/martial_art/M,mob/living/carbon/human/H)
diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm
index 93d70c12cc..848fdc6a41 100644
--- a/code/datums/martial/boxing.dm
+++ b/code/datums/martial/boxing.dm
@@ -2,6 +2,7 @@
name = "Boxing"
id = MARTIALART_BOXING
pacifism_check = FALSE //Let's pretend pacifists can boxe the heck out of other people, it only deals stamina damage right now.
+ pugilist = TRUE
/datum/martial_art/boxing/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
to_chat(A, "Can't disarm while boxing!")
diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm
index 4b19ae25ca..96ba7bf965 100644
--- a/code/datums/martial/cqc.dm
+++ b/code/datums/martial/cqc.dm
@@ -9,6 +9,7 @@
id = MARTIALART_CQC
help_verb = /mob/living/carbon/human/proc/CQC_help
block_chance = 75
+ pugilist = TRUE
var/old_grab_state = null
/datum/martial_art/cqc/reset_streak(mob/living/carbon/human/new_target)
diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm
index 6b3e2d3dc8..4332b09ac6 100644
--- a/code/datums/martial/krav_maga.dm
+++ b/code/datums/martial/krav_maga.dm
@@ -1,6 +1,7 @@
/datum/martial_art/krav_maga
name = "Krav Maga"
id = MARTIALART_KRAVMAGA
+ pugilist = TRUE
var/datum/action/neck_chop/neckchop = new/datum/action/neck_chop()
var/datum/action/leg_sweep/legsweep = new/datum/action/leg_sweep()
var/datum/action/lung_punch/lungpunch = new/datum/action/lung_punch()
diff --git a/code/datums/martial/plasma_fist.dm b/code/datums/martial/plasma_fist.dm
index c751d3b146..16ffb381aa 100644
--- a/code/datums/martial/plasma_fist.dm
+++ b/code/datums/martial/plasma_fist.dm
@@ -6,6 +6,7 @@
name = "Plasma Fist"
id = MARTIALART_PLASMAFIST
help_verb = /mob/living/carbon/human/proc/plasma_fist_help
+ pugilist = TRUE
/datum/martial_art/plasma_fist/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D)
diff --git a/code/datums/martial/rising_bass.dm b/code/datums/martial/rising_bass.dm
index 087867a9c1..0d77644c86 100644
--- a/code/datums/martial/rising_bass.dm
+++ b/code/datums/martial/rising_bass.dm
@@ -9,6 +9,7 @@
id = MARTIALART_RISINGBASS
allow_temp_override = FALSE
help_verb = /mob/living/carbon/human/proc/rising_bass_help
+ pugilist = TRUE
var/datum/action/risingbassmove/sidekick = new/datum/action/risingbassmove/sidekick()
var/datum/action/risingbassmove/deftswitch = new/datum/action/risingbassmove/deftswitch()
var/repulsecool = 0
diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm
index ae5fa98acb..82ddd90b42 100644
--- a/code/datums/martial/sleeping_carp.dm
+++ b/code/datums/martial/sleeping_carp.dm
@@ -7,6 +7,7 @@
id = MARTIALART_SLEEPINGCARP
allow_temp_override = FALSE
help_verb = /mob/living/carbon/human/proc/sleeping_carp_help
+ pugilist = TRUE
/datum/martial_art/the_sleeping_carp/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(findtext(streak,STRONG_PUNCH_COMBO))
@@ -140,8 +141,10 @@
ADD_TRAIT(H, TRAIT_NOGUNS, SLEEPING_CARP_TRAIT)
ADD_TRAIT(H, TRAIT_PIERCEIMMUNE, SLEEPING_CARP_TRAIT)
ADD_TRAIT(H, TRAIT_NODISMEMBER, SLEEPING_CARP_TRAIT)
+ ADD_TRAIT(H, TRAIT_TASED_RESISTANCE, SLEEPING_CARP_TRAIT)
H.physiology.brute_mod *= 0.4 //brute is really not gonna cut it
H.physiology.burn_mod *= 0.7 //burn is distinctly more useful against them than brute but they're still resistant
+ H.physiology.stamina_mod *= 0.5 //You take less stamina damage overall, but you do not reduce the damage from stun batons
H.physiology.stun_mod *= 0.3 //for those rare stuns
H.physiology.pressure_mod *= 0.3 //go hang out with carp
H.physiology.cold_mod *= 0.3 //cold mods are different to burn mods, they do stack however
@@ -154,8 +157,10 @@
REMOVE_TRAIT(H, TRAIT_NOGUNS, SLEEPING_CARP_TRAIT)
REMOVE_TRAIT(H, TRAIT_PIERCEIMMUNE, SLEEPING_CARP_TRAIT)
REMOVE_TRAIT(H, TRAIT_NODISMEMBER, SLEEPING_CARP_TRAIT)
+ REMOVE_TRAIT(H, TRAIT_TASED_RESISTANCE, SLEEPING_CARP_TRAIT)
H.physiology.brute_mod = initial(H.physiology.brute_mod)
H.physiology.burn_mod = initial(H.physiology.burn_mod)
+ H.physiology.stamina_mod = initial(H.physiology.stamina_mod)
H.physiology.stun_mod = initial(H.physiology.stun_mod)
H.physiology.pressure_mod = initial(H.physiology.pressure_mod) //no more carpies
H.physiology.cold_mod = initial(H.physiology.cold_mod)
diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm
index ab7fe986fb..9f8c74e2db 100644
--- a/code/datums/mutations/body.dm
+++ b/code/datums/mutations/body.dm
@@ -81,6 +81,7 @@
/datum/mutation/human/dwarfism/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
+ ADD_TRAIT(owner, TRAIT_DWARF, GENETIC_MUTATION)
owner.transform = owner.transform.Scale(1, 0.8)
passtable_on(owner, GENETIC_MUTATION)
owner.visible_message("[owner] suddenly shrinks!", "Everything around you seems to grow..")
@@ -88,6 +89,7 @@
/datum/mutation/human/dwarfism/on_losing(mob/living/carbon/human/owner)
if(..())
return
+ REMOVE_TRAIT(owner, TRAIT_DWARF, GENETIC_MUTATION)
owner.transform = owner.transform.Scale(1, 1.25)
passtable_off(owner, GENETIC_MUTATION)
owner.visible_message("[owner] suddenly grows!", "Everything around you seems to shrink..")
@@ -339,6 +341,7 @@
/datum/mutation/human/gigantism/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
+ ADD_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION)
owner.resize = 1.25
owner.update_transform()
owner.visible_message("[owner] suddenly grows!", "Everything around you seems to shrink..")
@@ -346,6 +349,7 @@
/datum/mutation/human/gigantism/on_losing(mob/living/carbon/human/owner)
if(..())
return
+ REMOVE_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION)
owner.resize = 0.8
owner.update_transform()
owner.visible_message("[owner] suddenly shrinks!", "Everything around you seems to grow..")
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 6089d11d6c..cc6f84a18f 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -251,8 +251,13 @@
/atom/movable/proc/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
set waitfor = 0
- SEND_SIGNAL(src, COMSIG_MOVABLE_IMPACT, hit_atom, throwingdatum)
- return hit_atom.hitby(src, throwingdatum=throwingdatum)
+ var/hitpush = TRUE
+ var/impact_signal = SEND_SIGNAL(src, COMSIG_MOVABLE_IMPACT, hit_atom, throwingdatum)
+ if(impact_signal & COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH)
+ hitpush = FALSE // hacky, tie this to something else or a proper workaround later
+
+ if(impact_signal & ~COMPONENT_MOVABLE_IMPACT_NEVERMIND) // in case a signal interceptor broke or deleted the thing before we could process our hit
+ return hit_atom.hitby(src, throwingdatum = throwingdatum, hitpush = hitpush)
/atom/movable/hitby(atom/movable/AM, skipcatch, hitpush = TRUE, blocked, datum/thrownthing/throwingdatum)
if(!anchored && hitpush && (!throwingdatum || (throwingdatum.force >= (move_resist * MOVE_FORCE_PUSH_RATIO))))
diff --git a/code/game/gamemodes/gangs/gang.dm b/code/game/gamemodes/gangs/gang.dm
index df94d68688..a766dda57c 100644
--- a/code/game/gamemodes/gangs/gang.dm
+++ b/code/game/gamemodes/gangs/gang.dm
@@ -32,7 +32,7 @@
/datum/antagonist/gang/farewell()
if(ishuman(owner.current))
owner.current.visible_message("[owner.current] looks like [owner.current.p_theyve()] just remembered [owner.current.p_their()] real allegiance!", null, null, null, owner.current)
- to_chat(owner, "You are no longer a gangster!")
+ to_chat(owner, "You are no longer a gangster! Your memories from the time you were in a gang are hazy... You don't seem to be able to recall the names of your previous allies, not even your bosses...")
/datum/antagonist/gang/on_gain()
if(!gang)
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 48a298984c..93852e917c 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -121,7 +121,6 @@
uniform = /obj/item/clothing/under/syndicate
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
- back = /obj/item/storage/backpack
ears = /obj/item/radio/headset/syndicate/alt
l_pocket = /obj/item/pinpointer/nuke/syndicate
id = /obj/item/card/id/syndicate
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 4ed6dc9dc9..04f14692e3 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -36,6 +36,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
var/jobspawn_override = FALSE
var/delete_after_roundstart = TRUE
var/used = FALSE
+ var/job_spawnpoint = TRUE //Is it a potential job spawnpoint or should we skip it?
/obj/effect/landmark/start/proc/after_round_start()
if(delete_after_roundstart)
@@ -281,6 +282,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
name = "bomb or clown beacon spawner"
var/nukie_path = /obj/item/sbeacondrop/bomb
var/clown_path = /obj/item/sbeacondrop/clownbomb
+ job_spawnpoint = FALSE
/obj/effect/landmark/start/nuclear_equipment/after_round_start()
var/npath = nukie_path
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index 2cdf57bf70..9893e9c7d3 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -521,7 +521,7 @@
/obj/item/gun/ballistic/automatic/toy/pistol = 5,
/obj/item/firing_pin = 5,
/obj/item/grenade/empgrenade = 15,
- /obj/item/clothing/gloves/combat = 10,
+ /obj/item/clothing/gloves/tackler/combat/insulated = 10,
/obj/item/clothing/shoes/sneakers/noslip = 10
)
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index c262920ec5..171b5a465a 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -239,19 +239,29 @@
if(user.mind && (user.mind.isholy) && !reskinned)
reskin_holy_weapon(user)
+/**
+ * reskin_holy_weapon: Shows a user a list of all available nullrod reskins and based on his choice replaces the nullrod with the reskinned version
+ *
+ * Arguments:
+ * * M The mob choosing a nullrod reskin
+ */
/obj/item/nullrod/proc/reskin_holy_weapon(mob/living/L)
if(GLOB.holy_weapon_type)
return
var/obj/item/holy_weapon
var/list/holy_weapons_list = subtypesof(/obj/item/nullrod) + list(HOLY_WEAPONS)
var/list/display_names = list()
+ var/list/nullrod_icons = list()
for(var/V in holy_weapons_list)
var/obj/item/nullrod/rodtype = V
if (initial(rodtype.chaplain_spawnable))
display_names[initial(rodtype.name)] = rodtype
+ nullrod_icons += list(initial(rodtype.name) = image(icon = initial(rodtype.icon), icon_state = initial(rodtype.icon_state)))
- var/choice = input(L, "What theme would you like for your holy weapon?","Holy Weapon Theme") as null|anything in display_names
- if(QDELETED(src) || !choice || !in_range(L, src) || !CHECK_MOBILITY(L, MOBILITY_USE) || reskinned)
+ nullrod_icons = sortList(nullrod_icons)
+
+ var/choice = show_radial_menu(L, src , nullrod_icons, custom_check = CALLBACK(src, .proc/check_menu, L), radius = 42, require_near = TRUE)
+ if(!choice || !check_menu(L))
return
var/A = display_names[choice] // This needs to be on a separate var as list member access is not allowed for new
@@ -266,6 +276,21 @@
qdel(src)
L.put_in_active_hand(holy_weapon)
+/**
+ * check_menu: Checks if we are allowed to interact with a radial menu
+ *
+ * Arguments:
+ * * user The mob interacting with a menu
+ */
+/obj/item/nullrod/proc/check_menu(mob/user)
+ if(!istype(user))
+ return FALSE
+ if(QDELETED(src) || reskinned)
+ return FALSE
+ if(user.incapacitated() || !user.is_holding(src))
+ return FALSE
+ return TRUE
+
/obj/item/nullrod/proc/jedi_spin(mob/living/user)
for(var/i in list(NORTH,SOUTH,EAST,WEST,EAST,SOUTH,NORTH,SOUTH,EAST,WEST,EAST,SOUTH))
user.setDir(i)
diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm
index 22767a66ea..6d8e582c29 100644
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -360,7 +360,6 @@ obj/item/shield/riot/bullet_proof
desc = "A massive shield that can block a lot of attacks and can take a lot of abuse before breaking." //It cant break unless it is removed from the implant
item_state = "metal"
icon_state = "metal"
- icon = 'icons/obj/items_and_weapons.dmi'
block_chance = 30 //May be big but hard to move around to block.
slowdown = 1
shield_flags = SHIELD_FLAGS_DEFAULT
diff --git a/code/game/objects/items/signs.dm b/code/game/objects/items/signs.dm
index 2b00114ef8..cf7373b700 100644
--- a/code/game/objects/items/signs.dm
+++ b/code/game/objects/items/signs.dm
@@ -40,12 +40,4 @@
user.visible_message("[user] waves around \the \"[label]\" sign.")
else
user.visible_message("[user] waves around blank sign.")
- user.changeNext_move(CLICK_CD_MELEE)
-
-/datum/crafting_recipe/picket_sign
- name = "Picket Sign"
- result = /obj/item/picket_sign
- reqs = list(/obj/item/stack/rods = 1,
- /obj/item/stack/sheet/cardboard = 2)
- time = 80
- category = CAT_MISC
\ No newline at end of file
+ user.changeNext_move(CLICK_CD_MELEE)
\ No newline at end of file
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index 50620b90fe..64e0a6b492 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -138,7 +138,7 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
new /obj/item/crowbar/red(src)
new /obj/item/wirecutters(src, "red")
new /obj/item/multitool(src)
- new /obj/item/clothing/gloves/combat(src)
+ new /obj/item/clothing/gloves/tackler/combat/insulated(src)
/obj/item/storage/toolbox/drone
name = "mechanical toolbox"
@@ -311,7 +311,7 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
new /obj/item/crowbar/red(src)
new /obj/item/wirecutters(src, "red")
new /obj/item/multitool/ai_detect(src)
- new /obj/item/clothing/gloves/combat(src)
+ new /obj/item/clothing/gloves/tackler/combat/insulated(src)
/obj/item/storage/toolbox/gold_real/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index 83827b56b6..0da502283b 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -37,8 +37,8 @@
..()
new /obj/item/clothing/glasses/eyepatch(src)
new /obj/item/clothing/glasses/sunglasses(src)
- new /obj/item/clothing/gloves/combat(src)
- new /obj/item/clothing/gloves/combat(src)
+ new /obj/item/clothing/gloves/tackler/combat(src)
+ new /obj/item/clothing/gloves/tackler/combat(src)
new /obj/item/clothing/head/helmet/swat(src)
new /obj/item/clothing/head/helmet/swat(src)
new /obj/item/clothing/mask/gas/sechailer/swat(src)
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index c918e7b867..e794e12ad7 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -453,7 +453,7 @@
name = "Syndicate Operative Empty"
uniform = /obj/item/clothing/under/syndicate
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/tackler/combat/insulated
ears = /obj/item/radio/headset/syndicate/alt
back = /obj/item/storage/backpack
implants = list(/obj/item/implant/weapons_auth)
diff --git a/code/modules/antagonists/bloodsucker/objects/bloodsucker_coffin.dm b/code/modules/antagonists/bloodsucker/objects/bloodsucker_coffin.dm
index debeee3775..e85d3af5a0 100644
--- a/code/modules/antagonists/bloodsucker/objects/bloodsucker_coffin.dm
+++ b/code/modules/antagonists/bloodsucker/objects/bloodsucker_coffin.dm
@@ -200,39 +200,3 @@
to_chat(resident, "You fix the mechanism and lock it.")
broken = FALSE
locked = TRUE
-
-// Look up recipes.dm OR pneumaticCannon.dm
-/datum/crafting_recipe/bloodsucker/blackcoffin
- name = "Black Coffin"
- result = /obj/structure/closet/crate/coffin/blackcoffin
- tools = list(/obj/item/weldingtool,
- /obj/item/screwdriver)
- reqs = list(/obj/item/stack/sheet/cloth = 1,
- /obj/item/stack/sheet/mineral/wood = 5,
- /obj/item/stack/sheet/metal = 1)
- ///obj/item/stack/packageWrap = 8,
- ///obj/item/pipe = 2)
- time = 150
- category = CAT_MISC
- always_availible = TRUE
-
-/datum/crafting_recipe/bloodsucker/meatcoffin
- name = "Meat Coffin"
- result =/obj/structure/closet/crate/coffin/meatcoffin
- tools = list(/obj/item/kitchen/knife,
- /obj/item/kitchen/rollingpin)
- reqs = list(/obj/item/reagent_containers/food/snacks/meat/slab = 5,
- /obj/item/restraints/handcuffs/cable = 1)
- time = 150
- category = CAT_MISC
- always_availible = TRUE
-
-/datum/crafting_recipe/bloodsucker/metalcoffin
- name = "Metal Coffin"
- result =/obj/structure/closet/crate/coffin/metalcoffin
- tools = list(/obj/item/weldingtool,
- /obj/item/screwdriver)
- reqs = list(/obj/item/stack/sheet/metal = 5)
- time = 100
- category = CAT_MISC
- always_availible = TRUE
diff --git a/code/modules/antagonists/bloodsucker/powers/fortitude.dm b/code/modules/antagonists/bloodsucker/powers/fortitude.dm
index a58034df0d..76f3cc77a4 100644
--- a/code/modules/antagonists/bloodsucker/powers/fortitude.dm
+++ b/code/modules/antagonists/bloodsucker/powers/fortitude.dm
@@ -3,7 +3,7 @@
/datum/action/bloodsucker/fortitude
- name = "Fortitude"//"Cellular Emporium"
+ name = "Fortitude"
desc = "Withstand egregious physical wounds and walk away from attacks that would stun, pierce, and dismember lesser beings. You cannot run while active."
button_icon_state = "power_fortitude"
bloodcost = 30
@@ -11,28 +11,27 @@
bloodsucker_can_buy = TRUE
amToggle = TRUE
warn_constant_cost = TRUE
+ var/was_running
- var/this_resist // So we can raise and lower your brute resist based on what your level_current WAS.
+ var/fortitude_resist // So we can raise and lower your brute resist based on what your level_current WAS.
/datum/action/bloodsucker/fortitude/ActivatePower()
- var/datum/antagonist/bloodsucker/bloodsuckerdatum = owner.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
+ var/datum/antagonist/bloodsucker/B = owner.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
var/mob/living/user = owner
to_chat(user, "Your flesh, skin, and muscles become as steel.")
// Traits & Effects
ADD_TRAIT(user, TRAIT_PIERCEIMMUNE, "fortitude")
ADD_TRAIT(user, TRAIT_NODISMEMBER, "fortitude")
ADD_TRAIT(user, TRAIT_STUNIMMUNE, "fortitude")
- ADD_TRAIT(user, TRAIT_NORUNNING, "fortitude")
if(ishuman(owner))
var/mob/living/carbon/human/H = owner
- this_resist = max(0.3, 0.7 - level_current * 0.1)
- H.physiology.brute_mod *= this_resist//0.5
- H.physiology.burn_mod *= this_resist//0.5
- // Stop Running (Taken from /datum/quirk/nyctophobia in negative.dm)
- var/was_running = (user.m_intent == MOVE_INTENT_RUN)
+ fortitude_resist = max(0.3, 0.7 - level_current * 0.1)
+ H.physiology.brute_mod *= fortitude_resist
+ H.physiology.burn_mod *= fortitude_resist
+ was_running = (user.m_intent == MOVE_INTENT_RUN)
if(was_running)
user.toggle_move_intent()
- while(bloodsuckerdatum && ContinueActive(user) || user.m_intent == MOVE_INTENT_RUN)
+ while(B && ContinueActive(user) || user.m_intent == MOVE_INTENT_RUN)
if(istype(user.buckled, /obj/vehicle)) //We dont want people using fortitude being able to use vehicles
var/obj/vehicle/V = user.buckled
var/datum/component/riding/VRD = V.GetComponent(/datum/component/riding)
@@ -44,20 +43,21 @@
to_chat(user, "You fall off the [V], your weight making you too heavy to be supported by it.")
// Pay Blood Toll (if awake)
if(user.stat == CONSCIOUS)
- bloodsuckerdatum.AddBloodVolume(-0.5) // Used to be 0.3 blood per 2 seconds, but we're making it more expensive to keep on.
+ B.AddBloodVolume(-0.5)
sleep(20) // Check every few ticks that we haven't disabled this power
// Return to Running (if you were before)
- if(was_running && user.m_intent != MOVE_INTENT_RUN)
- user.toggle_move_intent()
-
+
/datum/action/bloodsucker/fortitude/DeactivatePower(mob/living/user = owner, mob/living/target)
..()
// Restore Traits & Effects
REMOVE_TRAIT(user, TRAIT_PIERCEIMMUNE, "fortitude")
REMOVE_TRAIT(user, TRAIT_NODISMEMBER, "fortitude")
REMOVE_TRAIT(user, TRAIT_STUNIMMUNE, "fortitude")
- REMOVE_TRAIT(user, TRAIT_NORUNNING, "fortitude")
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- H.physiology.brute_mod /= this_resist//0.5
- H.physiology.burn_mod /= this_resist//0.5
+ if(!ishuman(owner))
+ return
+ var/mob/living/carbon/human/H = owner
+ H.physiology.brute_mod /= fortitude_resist
+ H.physiology.burn_mod /= fortitude_resist
+ if(was_running && user.m_intent == MOVE_INTENT_WALK)
+ user.toggle_move_intent()
+
diff --git a/code/modules/antagonists/bloodsucker/powers/lunge.dm b/code/modules/antagonists/bloodsucker/powers/lunge.dm
index f6dfc8ba72..db7868fa8a 100644
--- a/code/modules/antagonists/bloodsucker/powers/lunge.dm
+++ b/code/modules/antagonists/bloodsucker/powers/lunge.dm
@@ -1,88 +1,46 @@
-// Level 1: Grapple level 2
-// Level 2: Grapple 3 from Behind
-// Level 3: Grapple 3 from Shadows
-/datum/action/bloodsucker/targeted/lunge
+
+
+/datum/action/bloodsucker/lunge
name = "Predatory Lunge"
- desc = "Spring at your target and aggressively grapple them without warning. Attacks from concealment or the rear may even knock them down."
+ desc = "Prepare the strenght to grapple your prey."
button_icon_state = "power_lunge"
bloodcost = 10
- cooldown = 120
- target_range = 3
- power_activates_immediately = TRUE
- message_Trigger = "Whom will you ensnare within your grasp?"
- must_be_capacitated = TRUE
+ cooldown = 30
bloodsucker_can_buy = TRUE
+ warn_constant_cost = TRUE
+ amToggle = TRUE
+ var/leap_skill_mod = 5
-/datum/action/bloodsucker/targeted/lunge/CheckCanUse(display_error)
- if(!..(display_error))// DEFAULT CHECKS
- return FALSE
- // Being Grabbed
- if(owner.pulledby && owner.pulledby.grab_state >= GRAB_AGGRESSIVE)
- if(display_error)
- to_chat(owner, "You're being grabbed!")
- return FALSE
- if(!owner.has_gravity(owner.loc))//TODO figure out how to check if theyre able to move while in nograv
- if(display_error)
- to_chat(owner, "You cant lunge while floating!")
- return FALSE
- return TRUE
+/datum/action/bloodsucker/lunge/New()
+ . = ..()
+
-/datum/action/bloodsucker/targeted/lunge/CheckValidTarget(atom/A)
- return iscarbon(A)
+/datum/action/bloodsucker/lunge/Destroy()
+ . = ..()
+ UnregisterSignal(owner, COMSIG_CARBON_TACKLED)
-/datum/action/bloodsucker/targeted/lunge/CheckCanTarget(atom/A, display_error)
- // Check: Self
- if(target == owner)
- return FALSE
- // Check: Range
- //if (!(target in view(target_range, get_turf(owner))))
- // if (display_error)
- // to_chat(owner, "Your victim is too far away.")
- // return FALSE
- // DEFAULT CHECKS (Distance)
- if(!..())
- return FALSE
- // Check: Turf
- var/mob/living/L = A
- if(!isturf(L.loc))
- return FALSE
- return TRUE
+/datum/action/bloodsucker/lunge/ActivatePower()
+ var/mob/living/carbon/user = owner
+ var/datum/antagonist/bloodsucker/B = user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
+ var/datum/component/tackler/T = user.LoadComponent(/datum/component/tackler)
+ T.stamina_cost = 50
+ T.base_knockdown = 3 SECONDS
+ T.range = 4
+ T.speed = 0.8
+ T.skill_mod = 5 //Monstrous tackling
+ T.min_distance = 2
+ active = TRUE
+ user.toggle_throw_mode()
+ RegisterSignal(user, COMSIG_CARBON_TACKLED, .proc/DelayedDeactivatePower)
+ while(B && ContinueActive(user))
+ B.AddBloodVolume(-0.1)
+ sleep(5)
-/datum/action/bloodsucker/targeted/lunge/FireTargetedPower(atom/A)
- // set waitfor = FALSE <---- DONT DO THIS!We WANT this power to hold up ClickWithPower(), so that we can unlock the power when it's done.
- var/mob/living/carbon/target = A
- var/turf/T = get_turf(target)
- var/mob/living/L = owner
- // Clear Vars
- owner.pulling = null
- // Will we Knock them Down?
- var/do_knockdown = !is_A_facing_B(target,owner) || owner.alpha <= 0 || istype(owner.loc, /obj/structure/closet)
- // CAUSES: Target has their back to me, I'm invisible, or I'm in a Closet
- // Step One: Heatseek toward Target's Turf
- addtimer(CALLBACK(GLOBAL_PROC, .proc/_walk, owner, 0), 2 SECONDS)
- target.playsound_local(get_turf(owner), 'sound/bloodsucker/lunge_warn.ogg', 60, FALSE, pressure_affected = FALSE) // target-only telegraphing
- owner.playsound_local(owner, 'sound/bloodsucker/lunge_warn.ogg', 60, FALSE, pressure_affected = FALSE) // audio feedback to the user
- if(do_mob(owner, owner, 7, TRUE, TRUE))
- walk_towards(owner, T, 0.1, 10) // yes i know i shouldn't use this but i don't know how to work in anything better
- if(get_turf(owner) != T && !(isliving(target) && target.Adjacent(owner)) && owner.incapacitated() && !CHECK_MOBILITY(L, MOBILITY_STAND))
- var/send_dir = get_dir(owner, T)
- new /datum/forced_movement(owner, get_ranged_target_turf(owner, send_dir, 1), 1, FALSE)
- owner.spin(10)
- // Step Two: Check if I'm at/adjectent to Target's CURRENT turf (not original...that was just a destination)
- for(var/i in 1 to 6)
- if (target.Adjacent(owner))
- // LEVEL 2: If behind target, mute or unconscious!
- if(do_knockdown) // && level_current >= 1)
- target.Knockdown(15 + 10 * level_current,1)
- target.adjustStaminaLoss(40 + 10 * level_current)
- // Cancel Walk (we were close enough to contact them)
- walk(owner, 0)
- target.Stun(10,1) //Without this the victim can just walk away
- target.grabbedby(owner) // Taken from mutations.dm under changelings
- target.grippedby(owner, instant = TRUE) //instant aggro grab
- break
- sleep(3)
+//Without this, the leap component would get removed too early, causing the normal crash into effects.
+/datum/action/bloodsucker/lunge/proc/DelayedDeactivatePower()
+ addtimer(CALLBACK(src, .proc/DeactivatePower), 1 SECONDS, TIMER_UNIQUE)
-/datum/action/bloodsucker/targeted/lunge/DeactivatePower(mob/living/user = owner, mob/living/target)
- ..() // activate = FALSE
- user.update_mobility()
+/datum/action/bloodsucker/lunge/DeactivatePower(mob/living/user = owner)
+ . = ..()
+ qdel(user.GetComponent(/datum/component/tackler))
+ UnregisterSignal(user, COMSIG_CARBON_TACKLED)
diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm
index 0d96c125a1..f841ae20ca 100644
--- a/code/modules/awaymissions/capture_the_flag.dm
+++ b/code/modules/awaymissions/capture_the_flag.dm
@@ -487,8 +487,7 @@
suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf
toggle_helmet = FALSE // see the whites of their eyes
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
- id = /obj/item/card/id/syndicate
+ gloves = /obj/item/clothing/gloves/tackler/combat
belt = /obj/item/gun/ballistic/automatic/pistol/deagle/ctf
l_pocket = /obj/item/ammo_box/magazine/recharge/ctf
r_pocket = /obj/item/ammo_box/magazine/recharge/ctf
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index 5dc11ed100..c11267a5f3 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -490,7 +490,7 @@
glasses = /obj/item/clothing/glasses/eyepatch
mask = /obj/item/clothing/mask/cigarette/cigar/cohiba
head = /obj/item/clothing/head/centhat
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/tackler/combat
shoes = /obj/item/clothing/shoes/combat/swat
r_pocket = /obj/item/lighter
id = /obj/item/card/id
@@ -507,7 +507,7 @@
uniform = /obj/item/clothing/under/rank/security/officer
suit = /obj/item/clothing/suit/armor/vest
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/tackler/combat
mask = /obj/item/clothing/mask/gas/sechailer/swat
head = /obj/item/clothing/head/helmet/swat/nanotrasen
back = /obj/item/storage/backpack/security
diff --git a/code/modules/cargo/exports/gear.dm b/code/modules/cargo/exports/gear.dm
index 4db7c68efd..8dba7f69da 100644
--- a/code/modules/cargo/exports/gear.dm
+++ b/code/modules/cargo/exports/gear.dm
@@ -309,7 +309,7 @@
/datum/export/gear/combatgloves
cost = 80
unit_name = "combat gloves"
- export_types = list(/obj/item/clothing/gloves/combat, /obj/item/clothing/gloves/fingerless/pugilist/rapid, /obj/item/clothing/gloves/krav_maga)
+ export_types = list(/obj/item/clothing/gloves/tackler/combat, /obj/item/clothing/gloves/tackler/dolphin, /obj/item/clothing/gloves/fingerless/pugilist/rapid, /obj/item/clothing/gloves/krav_maga)
include_subtypes = TRUE
/datum/export/gear/bonegloves
@@ -797,4 +797,4 @@ datum/export/gear/glasses //glasses are not worth selling
export_types = list(/obj/item/clothing/head/chameleon, /obj/item/clothing/mask/chameleon, /obj/item/clothing/under/chameleon, /obj/item/clothing/suit/chameleon, /obj/item/clothing/glasses/chameleon,\
/obj/item/clothing/gloves/chameleon, /obj/item/clothing/head/chameleon, /obj/item/clothing/shoes/chameleon, /obj/item/storage/backpack/chameleon, \
/obj/item/storage/belt/chameleon, /obj/item/radio/headset/chameleon, /obj/item/pda/chameleon, /obj/item/stamp/chameleon, /obj/item/clothing/neck/cloak/chameleon)
- include_subtypes = TRUE
\ No newline at end of file
+ include_subtypes = TRUE
diff --git a/code/modules/cargo/packs/armory.dm b/code/modules/cargo/packs/armory.dm
index d832200201..501b1426ae 100644
--- a/code/modules/cargo/packs/armory.dm
+++ b/code/modules/cargo/packs/armory.dm
@@ -175,7 +175,7 @@
/obj/item/clothing/suit/armor/vest/russian,
/obj/item/clothing/head/helmet/rus_helmet,
/obj/item/clothing/shoes/russian,
- /obj/item/clothing/gloves/combat,
+ /obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/under/syndicate/rus_army,
/obj/item/clothing/under/costume/soviet,
/obj/item/clothing/mask/russian_balaclava,
@@ -201,8 +201,8 @@
/obj/item/clothing/mask/gas/sechailer/swat,
/obj/item/storage/belt/military/assault,
/obj/item/storage/belt/military/assault,
- /obj/item/clothing/gloves/combat,
- /obj/item/clothing/gloves/combat)
+ /obj/item/clothing/gloves/tackler/combat/insulated,
+ /obj/item/clothing/gloves/tackler/combat/insulated)
crate_name = "swat crate"
/datum/supply_pack/security/armory/wt550
diff --git a/code/modules/cargo/packs/security.dm b/code/modules/cargo/packs/security.dm
index aea7b95742..ee750b8df7 100644
--- a/code/modules/cargo/packs/security.dm
+++ b/code/modules/cargo/packs/security.dm
@@ -91,8 +91,8 @@
/obj/item/clothing/suit/armor/bulletproof,
/obj/item/clothing/head/helmet/alt,
/obj/item/clothing/head/helmet/alt,
- /obj/item/clothing/gloves/combat,
- /obj/item/clothing/gloves/combat,
+ /obj/item/clothing/gloves/tackler/combat/insulated,
+ /obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas)
crate_name = "surplus russian clothing"
@@ -109,7 +109,7 @@
/obj/item/clothing/head/ushanka,
/obj/item/clothing/suit/armor/bulletproof,
/obj/item/clothing/head/helmet/alt,
- /obj/item/clothing/gloves/combat,
+ /obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/mask/gas,
/obj/item/gun/ballistic/shotgun/boltaction,
/obj/item/ammo_box/a762)
diff --git a/code/modules/clothing/gloves/tacklers.dm b/code/modules/clothing/gloves/tacklers.dm
new file mode 100644
index 0000000000..47f4aca974
--- /dev/null
+++ b/code/modules/clothing/gloves/tacklers.dm
@@ -0,0 +1,100 @@
+/obj/item/clothing/gloves/tackler
+ name = "gripper gloves"
+ desc = "Special gloves that manipulate the blood vessels in the wearer's hands, granting them the ability to launch headfirst into walls."
+ icon_state = "tackle"
+ item_state = "tackle"
+ transfer_prints = TRUE
+ cold_protection = HANDS
+ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+ resistance_flags = NONE
+ //custom_premium_price = 350
+ /// For storing our tackler datum so we can remove it after
+ var/datum/component/tackler
+ /// See: [/datum/component/tackler/var/stamina_cost]
+ var/tackle_stam_cost = 25
+ /// See: [/datum/component/tackler/var/base_knockdown]
+ var/base_knockdown = 1 SECONDS
+ /// See: [/datum/component/tackler/var/range]
+ var/tackle_range = 4
+ /// See: [/datum/component/tackler/var/min_distance]
+ var/min_distance = 0
+ /// See: [/datum/component/tackler/var/speed]
+ var/tackle_speed = 1
+ /// See: [/datum/component/tackler/var/skill_mod]
+ var/skill_mod = 1
+
+/obj/item/clothing/gloves/tackler/equipped(mob/user, slot)
+ . = ..()
+ if(!ishuman(user))
+ return
+ if(slot == ITEM_SLOT_GLOVES)
+ var/mob/living/carbon/human/H = user
+ tackler = H.AddComponent(/datum/component/tackler, stamina_cost=tackle_stam_cost, base_knockdown = base_knockdown, range = tackle_range, speed = tackle_speed, skill_mod = skill_mod, min_distance = min_distance)
+
+/obj/item/clothing/gloves/tackler/dropped(mob/user)
+ . = ..()
+ if(!ishuman(user))
+ return
+ var/mob/living/carbon/human/H = user
+ if(H.get_item_by_slot(ITEM_SLOT_GLOVES) == src)
+ qdel(tackler)
+
+/obj/item/clothing/gloves/tackler/dolphin
+ name = "dolphin gloves"
+ desc = "Sleek, aerodynamic gripper gloves that are less effective at actually performing takedowns, but more effective at letting the user sail through the hallways and cause accidents."
+ icon_state = "tackledolphin"
+ item_state = "tackledolphin"
+
+ tackle_stam_cost = 15
+ base_knockdown = 0.5 SECONDS
+ tackle_range = 5
+ tackle_speed = 2
+ min_distance = 2
+ skill_mod = -2
+
+/obj/item/clothing/gloves/tackler/combat
+ name = "gorilla gloves"
+ desc = "Premium quality combative gloves, heavily reinforced to give the user an edge in close combat tackles, though they are more taxing to use than normal gripper gloves. Fireproof to boot!"
+ icon_state = "combat"
+ item_state = "blackgloves"
+
+ tackle_stam_cost = 35
+ base_knockdown = 1.5 SECONDS
+ tackle_range = 5
+ skill_mod = 3
+
+ cold_protection = HANDS
+ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+ heat_protection = HANDS
+ max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
+ resistance_flags = NONE
+
+/obj/item/clothing/gloves/tackler/combat/insulated
+ name = "guerrilla gloves"
+ desc = "Superior quality combative gloves, good for performing tackle takedowns as well as absorbing electrical shocks."
+ siemens_coefficient = 0
+ permeability_coefficient = 0.05
+
+/obj/item/clothing/gloves/tackler/rocket
+ name = "rocket gloves"
+ desc = "The ultimate in high risk, high reward, perfect for when you need to stop a criminal from fifty feet away or die trying. Banned in most Spinward gridiron football and rugby leagues."
+ icon_state = "tacklerocket"
+ item_state = "tacklerocket"
+
+ tackle_stam_cost = 50
+ base_knockdown = 2 SECONDS
+ tackle_range = 10
+ min_distance = 7
+ tackle_speed = 6
+ skill_mod = 7
+
+/obj/item/clothing/gloves/tackler/offbrand
+ name = "improvised gripper gloves"
+ desc = "Ratty looking fingerless gloves wrapped with sticky tape. Beware anyone wearing these, for they clearly have no shame and nothing to lose."
+ icon_state = "fingerless"
+ item_state = "fingerless"
+
+ tackle_stam_cost = 30
+ base_knockdown = 1.75 SECONDS
+ min_distance = 2
+ skill_mod = -1
diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm
index 48cc92db61..7cd2e9b394 100644
--- a/code/modules/clothing/outfits/ert.dm
+++ b/code/modules/clothing/outfits/ert.dm
@@ -3,7 +3,7 @@
uniform = /obj/item/clothing/under/rank/centcom/officer
shoes = /obj/item/clothing/shoes/combat/swat
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/tackler/combat/insulated
ears = /obj/item/radio/headset/headset_cent/alt
/datum/outfit/ert/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
@@ -69,8 +69,8 @@
id = /obj/item/card/id/ert/Security
suit = /obj/item/clothing/suit/space/hardsuit/ert/sec
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- back = /obj/item/storage/backpack/security
belt = /obj/item/storage/belt/security/full
+ back = /obj/item/storage/backpack/security
backpack_contents = list(/obj/item/storage/box/engineer=1,\
/obj/item/storage/box/handcuffs=1,\
/obj/item/clothing/mask/gas/sechailer=1,\
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index b1f6e7696d..d692f9c3fb 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -205,7 +205,7 @@
uniform = /obj/item/clothing/under/rank/centcom/commander
suit = /obj/item/clothing/suit/armor/bulletproof
shoes = /obj/item/clothing/shoes/combat/swat
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/tackler/combat/insulated
ears = /obj/item/radio/headset/headset_cent/commander
glasses = /obj/item/clothing/glasses/eyepatch
mask = /obj/item/clothing/mask/cigarette/cigar/cohiba
@@ -234,7 +234,7 @@
uniform = /obj/item/clothing/under/syndicate
suit = /obj/item/clothing/suit/space/officer
shoes = /obj/item/clothing/shoes/combat/swat
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/tackler/combat/insulated
glasses = /obj/item/clothing/glasses/thermal/eyepatch
ears = /obj/item/radio/headset/headset_cent/commander
mask = /obj/item/clothing/mask/cigarette/cigar/havana
@@ -316,7 +316,7 @@
uniform = /obj/item/clothing/under/costume/soviet
head = /obj/item/clothing/head/pirate/captain
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/tackler/combat/insulated
ears = /obj/item/radio/headset/headset_cent
glasses = /obj/item/clothing/glasses/thermal/eyepatch
suit = /obj/item/clothing/suit/pirate/captain
@@ -372,7 +372,7 @@
uniform = /obj/item/clothing/under/color/green
suit = /obj/item/clothing/suit/space/hardsuit/deathsquad
shoes = /obj/item/clothing/shoes/combat/swat
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/tackler/combat/insulated
mask = /obj/item/clothing/mask/gas/sechailer/swat
glasses = /obj/item/clothing/glasses/hud/toggle/thermal
back = /obj/item/storage/backpack/security
@@ -431,7 +431,7 @@
glasses = /obj/item/clothing/glasses/debug
ears = /obj/item/radio/headset/headset_cent/commander
mask = /obj/item/clothing/mask/gas/welding/up
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/tackler/combat/insulated
belt = /obj/item/storage/belt/utility/chief/full
l_pocket = /obj/item/gun/magic/wand/resurrection/debug
r_pocket = /obj/item/gun/magic/wand/death/debug
diff --git a/code/modules/clothing/outfits/vr.dm b/code/modules/clothing/outfits/vr.dm
index ee350e3891..7a057eda41 100644
--- a/code/modules/clothing/outfits/vr.dm
+++ b/code/modules/clothing/outfits/vr.dm
@@ -17,7 +17,7 @@
name = "Syndicate VR Operative - Basic"
uniform = /obj/item/clothing/under/syndicate
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/tackler/combat/insulated
back = /obj/item/storage/backpack
id = /obj/item/card/id/syndicate
belt = /obj/item/gun/ballistic/automatic/pistol
diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm
index 2af24080cb..1342b1fcbf 100644
--- a/code/modules/food_and_drinks/food.dm
+++ b/code/modules/food_and_drinks/food.dm
@@ -16,6 +16,7 @@
resistance_flags = FLAMMABLE
var/foodtype = NONE
var/last_check_time
+ var/food_quality = 50
/obj/item/reagent_containers/food/Initialize(mapload)
. = ..()
@@ -23,6 +24,9 @@
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
+/obj/item/reagent_containers/food/proc/adjust_food_quality(new_quality)
+ food_quality = CLAMP(new_quality,0,100)
+
/obj/item/reagent_containers/food/proc/checkLiked(var/fraction, mob/M)
if(last_check_time + 50 < world.time)
if(ishuman(M))
@@ -32,13 +36,13 @@
to_chat(H,"What the hell was that thing?!")
H.adjust_disgust(25 + 30 * fraction)
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "toxic_food", /datum/mood_event/disgusting_food)
- else if(foodtype & H.dna.species.disliked_food)
+ else if((foodtype & H.dna.species.disliked_food) || food_quality <= 30)
to_chat(H,"That didn't taste very good...")
H.adjust_disgust(11 + 15 * fraction)
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "gross_food", /datum/mood_event/gross_food)
- else if(foodtype & H.dna.species.liked_food)
+ else if(((foodtype & H.dna.species.liked_food) && food_quality >= 50) || food_quality >= 70) //you like food of high quality, and food of regular quality you have a preference for
to_chat(H,"I love this taste!")
- H.adjust_disgust(-5 + -2.5 * fraction)
+ H.adjust_disgust(-5 + (-2.5 * food_quality/50) + -2.5 * fraction)
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "fav_food", /datum/mood_event/favorite_food)
else
if(foodtype & H.dna.species.toxic_food)
@@ -48,4 +52,4 @@
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "breakfast", /datum/mood_event/breakfast)
last_check_time = world.time
-#undef STOP_SERVING_BREAKFAST
\ No newline at end of file
+#undef STOP_SERVING_BREAKFAST
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index bd20ad8d69..0e2bdc63c8 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -20,6 +20,7 @@
var/list/ingredients = list()
var/ingredients_placement = INGREDIENTS_FILL
var/customname = "custom"
+ var/total_quality = 0 //quality of all ingredients added together
/obj/item/reagent_containers/food/snacks/customizable/examine(mob/user)
. = ..()
@@ -56,6 +57,9 @@
S.reagents.trans_to(src,min(S.reagents.total_volume, 15)) //limit of 15, we don't want our custom food to be completely filled by just one ingredient with large reagent volume.
foodtype |= S.foodtype
update_snack_overlays(S)
+ //quality of customised food is average of the ingredient's qualities
+ total_quality += S.food_quality
+ food_quality = total_quality / length(ingredients)
to_chat(user, "You add the [I.name] to the [name].")
update_name(S)
else
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index 8476795a1a..a485f0c864 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -153,6 +153,12 @@ All foods are distributed among various categories. Use common sense.
/obj/item/reagent_containers/food/snacks/examine(mob/user)
. = ..()
+ if(food_quality >= 70)
+ . += "It is of a high quality."
+ else
+ if(food_quality <= 30)
+ . += "It is of a low quality."
+
if(bitecount == 0)
return
else if(bitecount == 1)
@@ -285,7 +291,7 @@ All foods are distributed among various categories. Use common sense.
reagents.trans_to(S, reagents.total_volume)
if(cooking_efficiency && length(S.bonus_reagents))
for(var/r_id in S.bonus_reagents)
- var/amount = S.bonus_reagents[r_id] * cooking_efficiency
+ var/amount = round(S.bonus_reagents[r_id] * cooking_efficiency)
if(r_id == /datum/reagent/consumable/nutriment || r_id == /datum/reagent/consumable/nutriment/vitamin)
S.reagents.add_reagent(r_id, amount, tastes)
else
@@ -296,6 +302,10 @@ All foods are distributed among various categories. Use common sense.
var/obj/item/result
if(cooked_type)
result = new cooked_type(T)
+ //if the result is food, set its food quality to the original food item's quality
+ if(isfood(result))
+ var/obj/item/reagent_containers/food/food_output = result
+ food_output.adjust_food_quality(food_quality + M.quality_increase)
if(istype(M))
initialize_cooked_food(result, M.efficiency)
else
diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm
index 99fd2af9bb..f3d84f7169 100644
--- a/code/modules/food_and_drinks/food/snacks_bread.dm
+++ b/code/modules/food_and_drinks/food/snacks_bread.dm
@@ -197,6 +197,7 @@
icon = 'icons/obj/food/food.dmi'
icon_state = ""
bitesize = 2
+ var/fried_garbage = FALSE //did you really fry a fire extinguisher?
GLOBAL_VAR_INIT(frying_hardmode, TRUE)
GLOBAL_VAR_INIT(frying_bad_chem_add_volume, TRUE)
@@ -227,21 +228,13 @@ GLOBAL_LIST_INIT(frying_bad_chems, list(
item_flags = fried.item_flags
obj_flags = fried.obj_flags
- if(istype(fried, /obj/item/reagent_containers/food/snacks))
+ if(isfood(fried))
fried.reagents.trans_to(src, fried.reagents.total_volume)
qdel(fried)
else
fried.forceMove(src)
trash = fried
- if(!istype(fried, /obj/item/reagent_containers/food) && GLOB.frying_hardmode && GLOB.frying_bad_chems.len)
- var/R = rand(1, GLOB.frying_bad_chems.len)
- var/bad_chem = GLOB.frying_bad_chems[R]
- var/bad_chem_amount = GLOB.frying_bad_chems[bad_chem]
- if(GLOB.frying_bad_chem_add_volume)
- reagents.maximum_volume += bad_chem_amount + 2 //Added room for condensed cooking oil
- reagents.add_reagent(bad_chem, bad_chem_amount)
- //All fried inedible items also get condensed cooking oil added, which induces minor vomiting and heart damage
- reagents.add_reagent(/datum/reagent/toxin/condensed_cooking_oil, 2)
+ fried_garbage = TRUE
/obj/item/reagent_containers/food/snacks/deepfryholder/Destroy()
if(trash)
@@ -249,6 +242,13 @@ GLOBAL_LIST_INIT(frying_bad_chems, list(
. = ..()
/obj/item/reagent_containers/food/snacks/deepfryholder/On_Consume(mob/living/eater)
+ if(fried_garbage && GLOB.frying_hardmode && GLOB.frying_bad_chems.len)
+ var/R = rand(1, GLOB.frying_bad_chems.len)
+ var/bad_chem = GLOB.frying_bad_chems[R]
+ var/bad_chem_amount = GLOB.frying_bad_chems[bad_chem]
+ eater.reagents.add_reagent(bad_chem, bad_chem_amount)
+ //All fried inedible items also get condensed cooking oil added, which induces minor vomiting and heart damage
+ eater.reagents.add_reagent(/datum/reagent/toxin/condensed_cooking_oil, 2)
if(trash)
QDEL_NULL(trash)
..()
@@ -259,18 +259,22 @@ GLOBAL_LIST_INIT(frying_bad_chems, list(
add_atom_colour(rgb(166,103,54), FIXED_COLOUR_PRIORITY)
name = "lightly-fried [name]"
desc = "[desc] It's been lightly fried in a deep fryer."
+ adjust_food_quality(food_quality - 5)
if(16 to 49)
add_atom_colour(rgb(103,63,24), FIXED_COLOUR_PRIORITY)
name = "fried [name]"
desc = "[desc] It's been fried, increasing its tastiness value by [rand(1, 75)]%."
+ adjust_food_quality(food_quality - 10)
if(50 to 59)
add_atom_colour(rgb(63,23,4), FIXED_COLOUR_PRIORITY)
name = "deep-fried [name]"
desc = "[desc] Deep-fried to perfection."
+ adjust_food_quality(food_quality) //we shouldn't punish perfection in the fried arts
if(60 to INFINITY)
add_atom_colour(rgb(33,19,9), FIXED_COLOUR_PRIORITY)
name = "the physical manifestation of the very concept of fried foods"
desc = "A heavily-fried...something. Who can tell anymore?"
+ adjust_food_quality(0) //good job, you're truly the best cook.
filling_color = color
foodtype |= FRIED
diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
index 1215dd7ecb..0a3d172bb0 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
@@ -104,6 +104,12 @@ God bless America.
else if(!frying && user.transferItemToLoc(I, src))
to_chat(user, "You put [I] into [src].")
frying = new/obj/item/reagent_containers/food/snacks/deepfryholder(src, I)
+ //setup food quality for item depending on if it's edible or not
+ if(isfood(I))
+ var/obj/item/reagent_containers/food/original_food = I
+ frying.adjust_food_quality(original_food.food_quality) //food quality remains unchanged until degree of frying is calculated
+ else
+ frying.adjust_food_quality(10) //inedible fried item has low quality
icon_state = "fryer_on"
fry_loop.start()
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index 5117439049..c94aba95b4 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -14,6 +14,7 @@
var/gibtime = 40 // Time from starting until meat appears
var/meat_produced = 0
var/ignore_clothing = FALSE
+ var/meat_quality = 35 //food_quality of meat produced
/obj/machinery/gibber/Initialize()
@@ -23,8 +24,10 @@
/obj/machinery/gibber/RefreshParts()
gibtime = 40
meat_produced = 0
+ meat_quality = 35 // unupgraded this means quality is 50, and max upgraded it is 95
for(var/obj/item/stock_parts/matter_bin/B in component_parts)
meat_produced += B.rating
+ meat_quality += B.rating * 15
for(var/obj/item/stock_parts/manipulator/M in component_parts)
gibtime -= 5 * M.rating
if(M.rating >= 2)
@@ -181,6 +184,7 @@
for (var/i=1 to meat_produced)
var/obj/item/reagent_containers/food/snacks/meat/slab/newmeat = new typeofmeat
+ newmeat.adjust_food_quality(meat_quality)
newmeat.name = "[sourcename] [newmeat.name]"
if(istype(newmeat))
newmeat.subjectname = sourcename
diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
index a8bb6dc187..d9e3bc6165 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
@@ -19,6 +19,8 @@
var/broken = 0 // 0, 1 or 2 // How broken is it???
var/max_n_of_items = 10
var/efficiency = 0
+ var/quality_increase = 5 // how much do we increase the quality of microwaved items
+ var/productivity = 0
var/datum/looping_sound/microwave/soundloop
var/list/ingredients = list() // may only contain /atom/movables
@@ -43,11 +45,16 @@
. = ..()
/obj/machinery/microwave/RefreshParts()
- efficiency = 0
+ efficiency = 0.6
+ productivity = 0
+ max_n_of_items = 5
for(var/obj/item/stock_parts/micro_laser/M in component_parts)
- efficiency += M.rating
+ efficiency += M.rating * 0.4
+ productivity += M.rating
for(var/obj/item/stock_parts/matter_bin/M in component_parts)
+
max_n_of_items = 10 * M.rating
+ quality_increase = M.rating * 5
break
/obj/machinery/microwave/examine(mob/user)
@@ -83,7 +90,7 @@
if(!(stat & (NOPOWER|BROKEN)))
. += "The status display reads:"
. += "- Capacity: [max_n_of_items] items."
- . += "- Cook time reduced by [(efficiency - 1) * 25]%."
+ . += "- Cook time reduced by [(productivity - 1) * 25]%."
/obj/machinery/microwave/update_icon_state()
if(broken)
@@ -240,7 +247,7 @@
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
return
- if(prob(max((5 / efficiency) - 5, dirty * 5))) //a clean unupgraded microwave has no risk of failure
+ if(prob(dirty * 5 / (5 * efficiency))) //a clean unupgraded microwave has no risk of failure
muck()
return
for(var/obj/O in ingredients)
@@ -285,7 +292,7 @@
update_icon()
loop(MICROWAVE_MUCK, 4)
-/obj/machinery/microwave/proc/loop(type, time, wait = max(12 - 2 * efficiency, 2)) // standard wait is 10
+/obj/machinery/microwave/proc/loop(type, time, wait = max(12 - 2 * productivity, 2)) // standard wait is 10
if(stat & (NOPOWER|BROKEN))
if(type == MICROWAVE_PRE)
pre_fail()
diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
index 3fa188fb94..9a3df0a92b 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
@@ -14,10 +14,13 @@
var/processing = FALSE
var/rating_speed = 1
var/rating_amount = 1
+ var/quality_increase = 5
/obj/machinery/processor/RefreshParts()
+ quality_increase = 0
for(var/obj/item/stock_parts/matter_bin/B in component_parts)
rating_amount = B.rating
+ quality_increase += B.rating * 5
for(var/obj/item/stock_parts/manipulator/M in component_parts)
rating_speed = M.rating
@@ -28,8 +31,10 @@
/obj/machinery/processor/proc/process_food(datum/food_processor_process/recipe, atom/movable/what)
if (recipe.output && loc && !QDELETED(src))
+ var/obj/item/reagent_containers/food/food_input = what
for(var/i = 0, i < rating_amount, i++)
- new recipe.output(drop_location())
+ var/obj/item/reagent_containers/food/food_output = new recipe.output(drop_location())
+ food_output.adjust_food_quality(food_input.food_quality + quality_increase)
if (ismob(what))
var/mob/themob = what
themob.gib(TRUE,TRUE,TRUE)
diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm
index c15c1cd2f5..ec96a4537c 100644
--- a/code/modules/food_and_drinks/recipes/food_mixtures.dm
+++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm
@@ -8,7 +8,6 @@
parts |= reqs
//////////////////////////////////////////FOOD MIXTURES////////////////////////////////////
-
/datum/chemical_reaction/tofu
name = "Tofu"
id = "tofu"
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 25f0cb5b89..377540233f 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -98,6 +98,8 @@
/mob/living/carbon/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
. = ..()
var/hurt = TRUE
+ if(GetComponent(/datum/component/tackler))
+ return
if(throwingdatum?.thrower && iscyborg(throwingdatum.thrower))
var/mob/living/silicon/robot/R = throwingdatum.thrower
if(!R.emagged)
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 689ab56842..15413f76d4 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -63,3 +63,4 @@
var/damageoverlaytemp = 0
var/drunkenness = 0 //Overall drunkenness - check handle_alcohol() in life.dm for effects
+ var/tackling = FALSE //Whether or not we are tackling, this will prevent the knock into effects for carbons
diff --git a/code/modules/mob/living/carbon/human/species_types/dwarves.dm b/code/modules/mob/living/carbon/human/species_types/dwarves.dm
index 235dacc70a..7b43f6d565 100644
--- a/code/modules/mob/living/carbon/human/species_types/dwarves.dm
+++ b/code/modules/mob/living/carbon/human/species_types/dwarves.dm
@@ -6,7 +6,7 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) //
name = "Dwarf"
id = "dwarf" //Also called Homo sapiens pumilionis
default_color = "FFFFFF"
- species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,NO_UNDERWEAR)
+ species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,NO_UNDERWEAR,TRAIT_DWARF)
inherent_traits = list()
limbs_id = "human"
use_skintones = USE_SKINTONES_GRAYSCALE_CUSTOM
@@ -36,7 +36,6 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) //
H.transform = H.transform.Scale(1, 0.8) //We use scale, and yeah. Dwarves can become gnomes with DWARFISM.
RegisterSignal(C, COMSIG_MOB_SAY, .proc/handle_speech) //We register handle_speech is being used.
-
/datum/species/dwarf/on_species_loss(mob/living/carbon/H, datum/species/new_species)
. = ..()
H.transform = H.transform.Scale(1, 1.25) //And we undo it.
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 5fa64e5ab5..22a0da2cf6 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -645,7 +645,7 @@
attempt_resist_grab(FALSE)
// Return as we should only resist one thing at a time. Give clickdelay if the grab wasn't passive.
return old_gs? TRUE : FALSE
-
+
// unbuckling yourself. stops the chain if you try it.
if(buckled && last_special <= world.time)
log_combat(src, buckled, "resisted buckle")
@@ -668,19 +668,22 @@
resist_fire() //stop, drop, and roll
// Give clickdelay
return TRUE
+
if(resting) //cit change - allows resisting out of resting
resist_a_rest() // ditto
// DO NOT GIVE CLCIKDELAY - resist_a_rest() handles spam prevention. Somewhat.
return FALSE
- if(last_special <= world.time)
- resist_restraints() //trying to remove cuffs.
- // DO NOT GIVE CLICKDELAY - last_special handles this.
- return FALSE
+
if(CHECK_MOBILITY(src, MOBILITY_USE) && resist_embedded()) //Citadel Change for embedded removal memes - requires being able to use items.
// DO NOT GIVE DEFAULT CLICKDELAY - This is a combat action.
changeNext_move(CLICK_CD_MELEE)
return FALSE
+ if(last_special <= world.time)
+ resist_restraints() //trying to remove cuffs.
+ // DO NOT GIVE CLICKDELAY - last_special handles this.
+ return FALSE
+
/// Proc to resist a grab. moving_resist is TRUE if this began by someone attempting to move. Return FALSE if still grabbed/failed to break out. Use this instead of resist_grab() directly.
/mob/proc/attempt_resist_grab(moving_resist, forced, log = TRUE)
if(!pulledby) //not being grabbed
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index 2e0e9dadb4..585bf58d95 100644
--- a/code/modules/mob/living/simple_animal/corpse.dm
+++ b/code/modules/mob/living/simple_animal/corpse.dm
@@ -20,7 +20,7 @@
uniform = /obj/item/clothing/under/syndicate
suit = /obj/item/clothing/suit/armor/vest
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/tackler/combat/insulated
ears = /obj/item/radio/headset
mask = /obj/item/clothing/mask/gas
head = /obj/item/clothing/head/helmet/swat
@@ -39,7 +39,7 @@
uniform = /obj/item/clothing/under/syndicate
suit = /obj/item/clothing/suit/space/hardsuit/syndi
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/tackler/combat/insulated
ears = /obj/item/radio/headset
mask = /obj/item/clothing/mask/gas/syndicate
back = /obj/item/tank/jetpack/oxygen
@@ -59,7 +59,7 @@
uniform = /obj/item/clothing/under/syndicate
suit = /obj/item/clothing/suit/space/hardsuit/syndi/elite
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/tackler/combat
ears = /obj/item/radio/headset
mask = /obj/item/clothing/mask/gas/syndicate
back = /obj/item/tank/jetpack/oxygen/harness
@@ -130,7 +130,7 @@
uniform = /obj/item/clothing/under/syndicate/camo
suit = /obj/item/clothing/suit/armor/bulletproof
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/tackler/combat
ears = /obj/item/radio/headset
head = /obj/item/clothing/head/helmet/alt
mask = /obj/item/clothing/mask/balaclava
@@ -177,7 +177,7 @@
uniform = /obj/item/clothing/under/rank/security/officer
suit = /obj/item/clothing/suit/armor/vest
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/tackler/combat
ears = /obj/item/radio/headset
mask = /obj/item/clothing/mask/gas/sechailer/swat
head = /obj/item/clothing/head/helmet/swat/nanotrasen
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
index 89d9919981..8487564c98 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
@@ -200,7 +200,7 @@
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/proc/infest(mob/living/carbon/human/H)
visible_message("[name] burrows into the flesh of [H]!")
var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L
- if(H.dna.check_mutation(DWARFISM)) //dwarf legions aren't just fluff!
+ if(HAS_TRAIT(H, TRAIT_DWARF)) //dwarf legions aren't just fluff!
L = new /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf(H.loc)
else
L = new(H.loc)
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index eb2a6ad162..7f57dd1723 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -508,7 +508,6 @@
upgrade_reagents3 = list(
/datum/reagent/drug/mushroomhallucinogen,
/datum/reagent/consumable/nothing,
- /datum/reagent/medicine/cryoxadone,
/datum/reagent/consumable/peachjuice
)
emagged_reagents = list(
@@ -516,7 +515,8 @@
/datum/reagent/consumable/ethanol/changelingsting,
/datum/reagent/consumable/ethanol/whiskey_cola,
/datum/reagent/toxin/mindbreaker,
- /datum/reagent/toxin/staminatoxin
+ /datum/reagent/toxin/staminatoxin,
+ /datum/reagent/medicine/cryoxadone
)
/obj/machinery/chem_dispenser/drinks/fullupgrade //fully ugpraded stock parts, emagged
@@ -722,4 +722,4 @@
component_parts += new /obj/item/stock_parts/manipulator/femto(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new /obj/item/stock_parts/cell/bluespace(null)
- RefreshParts()
\ No newline at end of file
+ RefreshParts()
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index abe5c7de46..bff9c8dcef 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -728,7 +728,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
var/real_dorf = isdwarf(M) //_species(H, /datum/species/dwarf)
if(ishuman(M))
var/mob/living/carbon/human/H = M
- if(H.dna.check_mutation(DWARFISM) || HAS_TRAIT(H, TRAIT_ALCOHOL_TOLERANCE) || real_dorf)
+ if(HAS_TRAIT(H, TRAIT_DWARF) || HAS_TRAIT(H, TRAIT_ALCOHOL_TOLERANCE || real_dorf))
to_chat(H, "Now THAT is MANLY!")
if(real_dorf)
boozepwr = 100 // Don't want dwarves to die because of a low booze power
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 39b687c64a..819af8513f 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -35,8 +35,6 @@
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "quality_drink", /datum/mood_event/quality_fantastic)
if (RACE_DRINK)
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "quality_drink", /datum/mood_event/race_drink)
- if (FOOD_AMAZING)
- SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "quality_food", /datum/mood_event/amazingtaste)
return ..()
/datum/reagent/consumable/nutriment
@@ -819,11 +817,20 @@
nutriment_factor = 2 * REAGENTS_METABOLISM
color = "#792300"
taste_description = "indescribable"
- quality = FOOD_AMAZING
taste_mult = 100
can_synth = FALSE
pH = 6.1
+/datum/reagent/consumable/secretsauce/reaction_obj(obj/O, reac_volume)
+ //splashing any amount above or equal to 1u of secret sauce onto a piece of food turns its quality to 100
+ if(reac_volume >= 1 && isfood(O))
+ var/obj/item/reagent_containers/food/splashed_food = O
+ splashed_food.adjust_food_quality(100)
+ // if it's a customisable food, we need to edit its total quality too, to prevent its quality resetting from adding more ingredients!
+ if(istype(O, /obj/item/reagent_containers/food/snacks/customizable))
+ var/obj/item/reagent_containers/food/snacks/customizable/splashed_custom_food = O
+ splashed_custom_food.total_quality += 10000
+
/datum/reagent/consumable/char
name = "Char"
description = "Essence of the grill. Has strange properties when overdosed."
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 305d12b3c5..bd79ed5fb8 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -506,7 +506,7 @@
taste_description = "awful cooking"
/datum/reagent/toxin/condensed_cooking_oil/on_mob_life(mob/living/carbon/M)
- if(prob(15))
+ if(prob(5))
M.vomit()
else
if(prob(40))
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 425c94cd65..600ee4ad14 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -330,7 +330,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
desc = "A conveyor control switch assembly."
icon = 'icons/obj/recycling.dmi'
icon_state = "switch-off"
- w_class = WEIGHT_CLASS_BULKY
+ w_class = WEIGHT_CLASS_NORMAL
var/id = "" //inherited by the switch
/obj/item/conveyor_switch_construct/Initialize()
diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index c18c33b04b..e407277ebf 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -293,20 +293,20 @@
name = "Broom"
desc = "Just your everyday standard broom."
id = "broom"
- build_type = PROTOLATHE
+ build_type = PROTOLATHE | AUTOLATHE
materials = list(/datum/material/iron = 1000, /datum/material/glass = 600)
build_path = /obj/item/twohanded/broom
- category = list("Equipment")
+ category = list("initial", "Equipment", "Misc")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/mop
name = "Mop"
desc = "Just your everyday standard mop."
id = "mop"
- build_type = PROTOLATHE
+ build_type = PROTOLATHE | AUTOLATHE
materials = list(/datum/material/iron = 1200, /datum/material/glass = 100)
build_path = /obj/item/mop
- category = list("Equipment")
+ category = list("initial", "Equipment", "Misc")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/advmop
@@ -329,6 +329,16 @@
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+/datum/design/normtrash
+ name = "Trashbag"
+ desc = "It's a bag for trash, you put garbage in it."
+ id = "normtrash"
+ build_type = PROTOLATHE
+ materials = list(/datum/material/plastic = 2000)
+ build_path = /obj/item/storage/bag/trash
+ category = list("Equipment")
+ departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
/datum/design/blutrash
name = "Trashbag of Holding"
desc = "An advanced trash bag with bluespace properties; capable of holding a plethora of garbage."
@@ -349,6 +359,17 @@
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+/datum/design/paint_remover
+ name = "Paint Remover"
+ desc = "Removes stains from the floor, and not much else."
+ id = "paint_remover"
+ build_type = PROTOLATHE
+ materials = list(/datum/material/iron = 1000)
+ reagents_list = list(/datum/reagent/acetone = 60)
+ build_path = /obj/item/paint/paint_remover
+ category = list("Equipment")
+ departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
/datum/design/spraybottle
name = "Spray Bottle"
desc = "A spray bottle, with an unscrewable top."
@@ -614,3 +635,27 @@
build_path = /obj/item/circuitboard/computer/sat_control
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
+
+
+/////////////////////////////////////////
+////////////Tackle Gloves////////////////
+/////////////////////////////////////////
+
+/datum/design/tackle_dolphin
+ name = "Dolphin Gloves"
+ id = "tackle_dolphin"
+ build_type = PROTOLATHE
+ materials = list(/datum/material/plastic = 2500)
+ build_path = /obj/item/clothing/gloves/tackler/dolphin
+ category = list("Equipment")
+ departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+/datum/design/tackle_rocket
+ name = "Rocket Gloves"
+ id = "tackle_rocket"
+ build_type = PROTOLATHE
+ materials = list(/datum/material/plasma = 1000, /datum/material/plastic = 2000)
+ build_path = /obj/item/clothing/gloves/tackler/rocket
+ category = list("Equipment")
+ departmental_flags = DEPARTMENTAL_FLAG_SECURITY
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index a34a82c156..24b9ccf81c 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -544,7 +544,7 @@
display_name = "Basic Tools"
description = "Basic mechanical, electronic, surgical and botanical tools."
prereq_ids = list("base")
- design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "broom")
+ design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "broom", "normtrash")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 500)
/datum/techweb_node/basic_mining
@@ -568,7 +568,7 @@
display_name = "Advanced Sanitation Technology"
description = "Clean things better, faster, stronger, and harder!"
prereq_ids = list("adv_engi")
- design_ids = list("advmop", "buffer", "light_replacer", "spraybottle", "beartrap", "ci-janitor")
+ design_ids = list("advmop", "buffer", "light_replacer", "spraybottle", "beartrap", "ci-janitor", "paint_remover")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1750) // No longer has its bag
/datum/techweb_node/botany
diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm
index d09c1ce86f..2192b2fddb 100644
--- a/code/modules/ruins/lavaland_ruin_code.dm
+++ b/code/modules/ruins/lavaland_ruin_code.dm
@@ -142,7 +142,7 @@
uniform = /obj/item/clothing/under/syndicate
suit = /obj/item/clothing/suit/toggle/labcoat
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/tackler/combat/insulated
ears = /obj/item/radio/headset/syndicate/alt
back = /obj/item/storage/backpack
r_pocket = /obj/item/gun/ballistic/automatic/pistol
diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm
index 117a45cdbc..6e5ea0e111 100755
--- a/code/modules/surgery/organs/liver.dm
+++ b/code/modules/surgery/organs/liver.dm
@@ -52,7 +52,7 @@
/obj/item/organ/liver/applyOrganDamage(d, maximum = maxHealth)
. = ..()
- if(!.)
+ if(!. || QDELETED(owner))
return
if(damage >= high_threshold)
var/move_calc = 1+((round(damage) - high_threshold)/(high_threshold/3))
diff --git a/code/modules/uplink/uplink_items/uplink_badass.dm b/code/modules/uplink/uplink_items/uplink_badass.dm
index 681efea5b3..840f100611 100644
--- a/code/modules/uplink/uplink_items/uplink_badass.dm
+++ b/code/modules/uplink/uplink_items/uplink_badass.dm
@@ -24,13 +24,6 @@
Radio headset does not include encryption key. No gun included."
item = /obj/item/storage/box/syndie_kit/centcom_costume
-/datum/uplink_item/badass/claymore
- name = "Claymore"
- cost = 8
- player_minimum = 25
- desc = "A claymore. We don't know why you'd do this."
- item = /obj/item/claymore
-
/datum/uplink_item/badass/costumes/clown
name = "Clown Costume"
desc = "Nothing is more terrifying than clowns with fully automatic weaponry."
@@ -84,11 +77,3 @@
limited_stock = 1
cant_discount = TRUE
include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/badass/shades
- name = "Big Sunglasses"
- desc = "Prevents flashes and looks badbass with some Smokes."
- item = /obj/item/clothing/glasses/sunglasses/big
- cost = 1
- surplus = 5
- illegal_tech = FALSE
diff --git a/code/modules/uplink/uplink_items/uplink_clothing.dm b/code/modules/uplink/uplink_items/uplink_clothing.dm
index d6336bd982..014e0452b5 100644
--- a/code/modules/uplink/uplink_items/uplink_clothing.dm
+++ b/code/modules/uplink/uplink_items/uplink_clothing.dm
@@ -89,4 +89,11 @@
name = "Wall Walking Boots"
desc = "Through bluespace magic stolen from an organisation that hoards technology, these boots simply allow you to slip through the atoms that make up anything, but only while walking, for safety reasons. As well as this, they unfortunately cause minor breath loss as the majority of atoms in your lungs are sucked out into any solid object you walk through."
item = /obj/item/clothing/shoes/wallwalkers
- cost = 6
\ No newline at end of file
+ cost = 6
+
+/datum/uplink_item/device_tools/guerillagloves
+ name = "Guerilla Gloves"
+ desc = "A pair of highly robust combat gripper gloves that excels at performing takedowns at close range, with an added lining of insulation. Careful not to hit a wall!"
+ item = /obj/item/clothing/gloves/tackler/combat/insulated
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+ cost = 2
diff --git a/code/modules/uplink/uplink_items/uplink_dangerous.dm b/code/modules/uplink/uplink_items/uplink_dangerous.dm
index c798aa5cd9..99c9c505c0 100644
--- a/code/modules/uplink/uplink_items/uplink_dangerous.dm
+++ b/code/modules/uplink/uplink_items/uplink_dangerous.dm
@@ -117,17 +117,6 @@
/datum/uplink_item/dangerous/doublesword/get_discount()
return pick(4;0.8,2;0.65,1;0.5)
-/datum/uplink_item/dangerous/cxneb
- name = "Dragon's Tooth Non-Eutactic Blade"
- desc = "An illegal modification of a weapon that is functionally identical to the energy sword, \
- the Non-Eutactic Blade (NEB) forges a hardlight blade on-demand, \
- generating an extremely sharp, unbreakable edge that is guaranteed to satisfy your every need. \
- This particular model has a polychromic hardlight generator, allowing you to murder in style! \
- The illegal modifications bring this weapon up to par with the classic energy sword, and also gives it the energy sword's distinctive sounds."
- item = /obj/item/melee/transforming/energy/sword/cx/traitor
- cost = 8
- exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
-
/datum/uplink_item/dangerous/sword
name = "Energy Sword"
desc = "The energy sword is an edged weapon with a blade of pure energy. The sword is small enough to be \
diff --git a/code/modules/uplink/uplink_items/uplink_roles.dm b/code/modules/uplink/uplink_items/uplink_roles.dm
index 778edf8cc8..28479f8da7 100644
--- a/code/modules/uplink/uplink_items/uplink_roles.dm
+++ b/code/modules/uplink/uplink_items/uplink_roles.dm
@@ -64,14 +64,6 @@
restricted_roles = list("Clown")
*/
-/datum/uplink_item/role_restricted/clumsyDNA
- name = "Clumsy Clown DNA"
- desc = "A DNA injector that has been loaded with the clown gene that makes people clumsy.. \
- Making someone clumsy will allow them to use clown firing pins as well as Reverse Revolvers. For a laugh try using this on the HOS to see how many times they shoot themselves in the foot!"
- cost = 1
- item = /obj/item/dnainjector/clumsymut
- restricted_roles = list("Clown")
-
/datum/uplink_item/role_restricted/haunted_magic_eightball
name = "Haunted Magic Eightball"
desc = "Most magic eightballs are toys with dice inside. Although identical in appearance to the harmless toys, this occult device reaches into the spirit world to find its answers. \
@@ -116,19 +108,11 @@
cost = 4
restricted_roles = list("Cook", "Botanist", "Clown", "Mime")
-/datum/uplink_item/role_restricted/strange_seeds
- name = "Pack of strange seeds"
- desc = "Mysterious seeds as strange as their name implies. Spooky."
- item = /obj/item/seeds/random
- cost = 2
- restricted_roles = list("Botanist")
- illegal_tech = FALSE
-
/datum/uplink_item/role_restricted/strange_seeds_10pack
- name = "Pack of strange seeds x10"
+ name = "Pack of strange seeds"
desc = "Mysterious seeds as strange as their name implies. Spooky. These come in bulk"
item = /obj/item/storage/box/strange_seeds_10pack
- cost = 20
+ cost = 10
restricted_roles = list("Botanist")
/datum/uplink_item/role_restricted/ez_clean_bundle
diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm
index 09681def64..ec741ef574 100644
--- a/code/modules/vending/security.dm
+++ b/code/modules/vending/security.dm
@@ -21,6 +21,7 @@
/obj/item/clothing/head/helmet/blueshirt = 1,
/obj/item/clothing/suit/armor/vest/blueshirt = 1,
/obj/item/clothing/under/rank/security/officer/blueshirt = 1,
+ /obj/item/clothing/gloves/tackler = 5,
/obj/item/ssword_kit = 1)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi
index 74aabf6021..3860fa4b7e 100644
Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index d53f53c029..2a6ce77f38 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/modular_citadel/code/modules/arousal/genitals.dm b/modular_citadel/code/modules/arousal/genitals.dm
index 68e9259183..e0e1b37a3d 100644
--- a/modular_citadel/code/modules/arousal/genitals.dm
+++ b/modular_citadel/code/modules/arousal/genitals.dm
@@ -1,6 +1,6 @@
/obj/item/organ/genital
color = "#fcccb3"
- w_class = WEIGHT_CLASS_NORMAL
+ w_class = WEIGHT_CLASS_SMALL
var/shape
var/sensitivity = 1 // wow if this were ever used that'd be cool but it's not but i'm keeping it for my unshit code
var/genital_flags //see citadel_defines.dm
diff --git a/tgstation.dme b/tgstation.dme
index 3b3bb74df1..41708bc0bd 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -420,6 +420,7 @@
#include "code\datums\components\stationloving.dm"
#include "code\datums\components\summoning.dm"
#include "code\datums\components\swarming.dm"
+#include "code\datums\components\tackle.dm"
#include "code\datums\components\tactical.dm"
#include "code\datums\components\thermite.dm"
#include "code\datums\components\uplink.dm"
@@ -1730,6 +1731,7 @@
#include "code\modules\clothing\gloves\color.dm"
#include "code\modules\clothing\gloves\miscellaneous.dm"
#include "code\modules\clothing\gloves\ring.dm"
+#include "code\modules\clothing\gloves\tacklers.dm"
#include "code\modules\clothing\head\_head.dm"
#include "code\modules\clothing\head\beanie.dm"
#include "code\modules\clothing\head\cit_hats.dm"