diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 6a323ee86f..7e095329af 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -63,21 +63,21 @@
pixel_y = 4
},
/turf/open/floor/holofloor{
- icon_state = "wood";
- dir = 9
+ dir = 9;
+ icon_state = "wood"
},
/area/holodeck/rec_center/lounge)
"am" = (
/obj/structure/closet/crate/bin,
/turf/open/floor/holofloor{
- icon_state = "wood";
- dir = 9
+ dir = 9;
+ icon_state = "wood"
},
/area/holodeck/rec_center/lounge)
"an" = (
/turf/open/floor/holofloor{
- icon_state = "wood";
- dir = 9
+ dir = 9;
+ icon_state = "wood"
},
/area/holodeck/rec_center/lounge)
"ao" = (
@@ -86,8 +86,8 @@
layer = 3.3
},
/turf/open/floor/holofloor{
- icon_state = "wood";
- dir = 9
+ dir = 9;
+ icon_state = "wood"
},
/area/holodeck/rec_center/lounge)
"ap" = (
@@ -166,15 +166,15 @@
pixel_y = 8
},
/turf/open/floor/holofloor{
- icon_state = "wood";
- dir = 9
+ dir = 9;
+ icon_state = "wood"
},
/area/holodeck/rec_center/lounge)
"aA" = (
/obj/structure/chair/wood/normal,
/turf/open/floor/holofloor{
- icon_state = "wood";
- dir = 9
+ dir = 9;
+ icon_state = "wood"
},
/area/holodeck/rec_center/lounge)
"aB" = (
@@ -218,16 +218,16 @@
dir = 4
},
/turf/open/floor/holofloor{
- icon_state = "wood";
- dir = 9
+ dir = 9;
+ icon_state = "wood"
},
/area/holodeck/rec_center/lounge)
"aJ" = (
/obj/structure/table/wood/poker,
/obj/item/clothing/mask/cigarette/pipe,
/turf/open/floor/holofloor{
- icon_state = "wood";
- dir = 9
+ dir = 9;
+ icon_state = "wood"
},
/area/holodeck/rec_center/lounge)
"aK" = (
@@ -235,8 +235,8 @@
/obj/structure/table/wood/poker,
/obj/effect/holodeck_effect/cards,
/turf/open/floor/holofloor{
- icon_state = "wood";
- dir = 9
+ dir = 9;
+ icon_state = "wood"
},
/area/holodeck/rec_center/lounge)
"aL" = (
@@ -244,8 +244,8 @@
dir = 8
},
/turf/open/floor/holofloor{
- icon_state = "wood";
- dir = 9
+ dir = 9;
+ icon_state = "wood"
},
/area/holodeck/rec_center/lounge)
"aM" = (
@@ -259,8 +259,8 @@
dir = 1
},
/turf/open/floor/holofloor{
- icon_state = "wood";
- dir = 9
+ dir = 9;
+ icon_state = "wood"
},
/area/holodeck/rec_center/lounge)
"aO" = (
@@ -272,15 +272,15 @@
dir = 4
},
/turf/open/floor/holofloor{
- icon_state = "wood";
- dir = 9
+ dir = 9;
+ icon_state = "wood"
},
/area/holodeck/rec_center/lounge)
"aQ" = (
/obj/structure/window/reinforced,
/turf/open/floor/holofloor{
- icon_state = "wood";
- dir = 9
+ dir = 9;
+ icon_state = "wood"
},
/area/holodeck/rec_center/lounge)
"aR" = (
@@ -299,8 +299,8 @@
pixel_y = 10
},
/turf/open/floor/holofloor{
- icon_state = "wood";
- dir = 9
+ dir = 9;
+ icon_state = "wood"
},
/area/holodeck/rec_center/lounge)
"aU" = (
@@ -1403,7 +1403,6 @@
/obj/structure/window/reinforced,
/obj/machinery/mass_driver{
dir = 1;
- icon_state = "mass_driver";
id = "trektorpedo1";
name = "photon torpedo tube"
},
@@ -1452,7 +1451,6 @@
/obj/structure/window/reinforced,
/obj/machinery/mass_driver{
dir = 1;
- icon_state = "mass_driver";
id = "trektorpedo2";
name = "photon torpedo tube"
},
@@ -1470,14 +1468,14 @@
dir = 4
},
/turf/open/floor/holofloor{
- icon_state = "chapel";
- dir = 1
+ dir = 1;
+ icon_state = "chapel"
},
/area/holodeck/rec_center/chapelcourt)
"dT" = (
/turf/open/floor/holofloor{
- icon_state = "chapel";
- dir = 4
+ dir = 4;
+ icon_state = "chapel"
},
/area/holodeck/rec_center/chapelcourt)
"dU" = (
@@ -1489,8 +1487,8 @@
/area/holodeck/rec_center/chapelcourt)
"dV" = (
/turf/open/floor/holofloor{
- icon_state = "chapel";
- dir = 1
+ dir = 1;
+ icon_state = "chapel"
},
/area/holodeck/rec_center/chapelcourt)
"dW" = (
@@ -1498,8 +1496,8 @@
dir = 8
},
/turf/open/floor/holofloor{
- icon_state = "chapel";
- dir = 4
+ dir = 4;
+ icon_state = "chapel"
},
/area/holodeck/rec_center/chapelcourt)
"dX" = (
@@ -1523,8 +1521,8 @@
dir = 8
},
/turf/open/floor/holofloor{
- icon_state = "white";
- dir = 8
+ dir = 8;
+ icon_state = "white"
},
/area/holodeck/rec_center/firingrange)
"eb" = (
@@ -1539,8 +1537,8 @@
dir = 4
},
/turf/open/floor/holofloor{
- icon_state = "white";
- dir = 4
+ dir = 4;
+ icon_state = "white"
},
/area/holodeck/rec_center/firingrange)
"ed" = (
@@ -1611,8 +1609,7 @@
/area/holodeck/rec_center/chapelcourt)
"en" = (
/turf/open/floor/holofloor{
- icon_state = "chapel";
- dir = 2
+ icon_state = "chapel"
},
/area/holodeck/rec_center/chapelcourt)
"eo" = (
@@ -1635,8 +1632,7 @@
dir = 8
},
/turf/open/floor/holofloor{
- icon_state = "chapel";
- dir = 2
+ icon_state = "chapel"
},
/area/holodeck/rec_center/chapelcourt)
"er" = (
@@ -1644,8 +1640,8 @@
dir = 8
},
/turf/open/floor/holofloor{
- icon_state = "white";
- dir = 10
+ dir = 10;
+ icon_state = "white"
},
/area/holodeck/rec_center/firingrange)
"es" = (
@@ -1658,8 +1654,8 @@
dir = 4
},
/turf/open/floor/holofloor{
- icon_state = "white";
- dir = 6
+ dir = 6;
+ icon_state = "white"
},
/area/holodeck/rec_center/firingrange)
"eu" = (
@@ -1679,8 +1675,8 @@
/area/holodeck/rec_center/spacechess)
"ex" = (
/turf/open/floor/holofloor{
- icon_state = "stairs-old";
- dir = 8
+ dir = 8;
+ icon_state = "stairs-old"
},
/area/holodeck/rec_center/thunderdome1218)
"ey" = (
@@ -1780,8 +1776,8 @@
dir = 1
},
/turf/open/floor/holofloor{
- icon_state = "chapel";
- dir = 1
+ dir = 1;
+ icon_state = "chapel"
},
/area/holodeck/rec_center/chapelcourt)
"eN" = (
@@ -1789,8 +1785,8 @@
dir = 1
},
/turf/open/floor/holofloor{
- icon_state = "chapel";
- dir = 4
+ dir = 4;
+ icon_state = "chapel"
},
/area/holodeck/rec_center/chapelcourt)
"eO" = (
@@ -1827,8 +1823,7 @@
dir = 1
},
/turf/open/floor/holofloor{
- icon_state = "chapel";
- dir = 2
+ icon_state = "chapel"
},
/area/holodeck/rec_center/chapelcourt)
"eT" = (
@@ -2114,7 +2109,6 @@
/turf/closed/indestructible/riveted,
/area/space)
"fy" = (
-/obj/machinery/igniter/on,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/tdome/arena_source)
@@ -2517,9 +2511,9 @@
/area/ctf)
"gB" = (
/obj/structure/window/reinforced/fulltile{
- obj_integrity = 5000;
max_integrity = 5000;
- name = "hardened window"
+ name = "hardened window";
+ obj_integrity = 5000
},
/turf/open/floor/plating,
/area/ctf)
@@ -3471,8 +3465,7 @@
"ja" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
- name = "CentCom";
- opacity = 1
+ name = "CentCom"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -3565,7 +3558,6 @@
/area/centcom/control)
"jk" = (
/obj/machinery/door/poddoor{
- density = 1;
id = "XCCQMLoaddoor2";
name = "Supply Dock Loading Door"
},
@@ -3580,9 +3572,7 @@
/area/centcom/supply)
"jl" = (
/obj/structure/plasticflaps,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/conveyor{
dir = 4;
id = "XCCQMLoad2"
@@ -3591,13 +3581,10 @@
/area/centcom/supply)
"jm" = (
/obj/machinery/door/poddoor{
- density = 1;
id = "XCCQMLoaddoor2";
name = "Supply Dock Loading Door"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/conveyor{
dir = 4;
id = "XCCQMLoad2"
@@ -3683,7 +3670,6 @@
pixel_y = -5
},
/obj/machinery/button/door{
- dir = 2;
id = "XCCQMLoaddoor2";
layer = 4;
name = "Loading Doors";
@@ -3760,7 +3746,6 @@
/area/centcom/control)
"jI" = (
/obj/machinery/door/poddoor{
- density = 1;
id = "XCCQMLoaddoor";
name = "Supply Dock Loading Door"
},
@@ -3779,14 +3764,11 @@
dir = 8;
id = "XCCQMLoad"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/centcom/supply)
"jK" = (
/obj/machinery/door/poddoor{
- density = 1;
id = "XCCQMLoaddoor";
name = "Supply Dock Loading Door"
},
@@ -3794,9 +3776,7 @@
dir = 8;
id = "XCCQMLoad"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/centcom/supply)
"jL" = (
@@ -4103,7 +4083,6 @@
"ki" = (
/obj/docking_port/stationary{
area_type = /area/syndicate_mothership;
- dir = 1;
dwidth = 25;
height = 50;
id = "emergency_syndicate";
@@ -4282,8 +4261,7 @@
/area/centcom/control)
"kG" = (
/obj/structure/chair/comfy/brown{
- color = "#596479";
- dir = 2
+ color = "#596479"
},
/turf/open/floor/plasteel/grimy,
/area/centcom/control)
@@ -4431,19 +4409,14 @@
"kZ" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
- opacity = 1;
req_access_txt = "101"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/centcom/control)
"la" = (
/obj/machinery/door/window/brigdoor{
base_state = "rightsecure";
- dir = 2;
- icon_state = "leftsecure";
name = "CentCom Stand";
req_access_txt = "109"
},
@@ -4479,8 +4452,6 @@
},
/obj/machinery/door/window/brigdoor{
base_state = "rightsecure";
- dir = 2;
- icon_state = "leftsecure";
name = "CentCom Stand";
req_access_txt = "109"
},
@@ -4498,8 +4469,6 @@
"lf" = (
/obj/machinery/door/window/brigdoor{
base_state = "rightsecure";
- dir = 2;
- icon_state = "leftsecure";
name = "CentCom Stand";
req_access_txt = "109"
},
@@ -4701,12 +4670,9 @@
"lJ" = (
/obj/machinery/door/airlock/centcom{
name = "Shuttle Control Office";
- opacity = 1;
req_access_txt = "109"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/centcom/supply)
"lK" = (
@@ -4714,9 +4680,7 @@
name = "CentCom Supply";
req_access_txt = "106"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/centcom/supply)
"lL" = (
@@ -4792,10 +4756,16 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/control)
+"lS" = (
+/obj/machinery/door/airlock/wood{
+ id_tag = "Ninja1";
+ name = "Dorm 1"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"lT" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
- opacity = 1;
req_access_txt = "101"
},
/obj/effect/turf_decal/stripes/line{
@@ -4852,6 +4822,16 @@
icon_state = "alien11"
},
/area/abductor_ship)
+"ma" = (
+/obj/machinery/button/door{
+ id = "Ninja7";
+ name = "Dorm Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_x = 25;
+ specialfunctions = 4
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"mb" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/tile/neutral{
@@ -5249,9 +5229,7 @@
/area/centcom/control)
"mR" = (
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/centcom/control)
"mS" = (
@@ -5769,8 +5747,6 @@
"nQ" = (
/obj/machinery/door/window/brigdoor{
base_state = "rightsecure";
- dir = 2;
- icon_state = "leftsecure";
name = "CentCom Stand";
req_access_txt = "109"
},
@@ -5793,8 +5769,6 @@
"nR" = (
/obj/machinery/door/window/brigdoor{
base_state = "rightsecure";
- dir = 2;
- icon_state = "leftsecure";
name = "CentCom Stand";
req_access_txt = "109"
},
@@ -6295,7 +6269,6 @@
"oJ" = (
/obj/machinery/door/airlock/centcom{
name = "Administrative Office";
- opacity = 1;
req_access_txt = "109"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -6610,11 +6583,11 @@
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
/obj/machinery/door/window/brigdoor{
- name = "CentCom Customs";
- icon_state = "rightsecure";
+ base_state = "rightsecure";
dir = 4;
- req_access_txt = "109";
- base_state = "rightsecure"
+ icon_state = "rightsecure";
+ name = "CentCom Customs";
+ req_access_txt = "109"
},
/obj/item/clipboard,
/obj/item/folder/yellow,
@@ -6990,9 +6963,7 @@
/area/ai_multicam_room)
"pZ" = (
/obj/machinery/washing_machine,
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
+/turf/open/floor/plasteel/freezer,
/area/syndicate_mothership)
"qa" = (
/obj/structure/flora/tree/pine,
@@ -7275,8 +7246,8 @@
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/fernybush,
/turf/open/floor/plasteel{
- name = "plating";
- icon_state = "asteroid5"
+ icon_state = "asteroid5";
+ name = "plating"
},
/area/centcom/control)
"qx" = (
@@ -7334,24 +7305,26 @@
/turf/closed/indestructible/riveted/uranium,
/area/wizard_station)
"qI" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plating,
/area/syndicate_mothership)
+"qP" = (
+/obj/structure/chair/comfy/brown{
+ color = "#596479";
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"qQ" = (
/obj/machinery/door/airlock/centcom{
name = "Administrative Office";
- opacity = 1;
req_access_txt = "109"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/centcom/ferry)
"qR" = (
@@ -7361,23 +7334,17 @@
"qS" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
- opacity = 1;
req_access_txt = "101"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/centcom/supply)
"qT" = (
/obj/machinery/door/airlock/centcom{
- name = "CentCom";
- opacity = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 2
+ name = "CentCom"
},
+/obj/effect/turf_decal/stripes/line,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/centcom/control)
@@ -7747,8 +7714,8 @@
dir = 4
},
/turf/open/floor/plasteel{
- name = "plating";
- icon_state = "asteroid5"
+ icon_state = "asteroid5";
+ name = "plating"
},
/area/centcom/control)
"rI" = (
@@ -7940,7 +7907,6 @@
"sc" = (
/obj/docking_port/stationary{
area_type = /area/syndicate_mothership/control;
- dir = 1;
dwidth = 3;
height = 7;
name = "escape pod loader";
@@ -8259,7 +8225,6 @@
"sL" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
- opacity = 1;
req_access_txt = "101"
},
/obj/effect/turf_decal/stripes/line{
@@ -8388,7 +8353,6 @@
"te" = (
/obj/machinery/door/airlock/centcom{
name = "Auxillary Dock";
- opacity = 1;
req_access_txt = ""
},
/turf/open/floor/plating,
@@ -8751,6 +8715,10 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plasteel,
/area/centcom/supplypod)
+"tZ" = (
+/obj/structure/chair/wood/normal,
+/turf/open/floor/wood,
+/area/centcom/holding)
"uc" = (
/obj/effect/turf_decal/tile/green{
dir = 1
@@ -8764,9 +8732,7 @@
/obj/item/storage/crayons,
/obj/structure/table,
/obj/item/storage/crayons,
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
+/turf/open/floor/plasteel/freezer,
/area/syndicate_mothership)
"uf" = (
/obj/effect/turf_decal/tile/brown{
@@ -8777,6 +8743,13 @@
},
/turf/open/floor/plasteel,
/area/centcom/supplypod/loading/three)
+"uh" = (
+/obj/machinery/door/airlock/wood{
+ id_tag = "Ninja2";
+ name = "Dorm 2"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"uj" = (
/obj/item/clipboard,
/obj/item/folder/red,
@@ -9078,12 +9051,9 @@
"uO" = (
/obj/machinery/door/airlock/centcom{
name = "Shuttle Control Office";
- opacity = 1;
req_access_txt = "109"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/centcom/ferry)
"uP" = (
@@ -9309,9 +9279,9 @@
dwidth = 25;
height = 50;
id = "emergency_away";
+ json_key = "emergency";
name = "CentCom Emergency Shuttle Dock";
- width = 50;
- json_key = "emergency"
+ width = 50
},
/turf/open/space,
/area/space)
@@ -9446,12 +9416,9 @@
"vF" = (
/obj/machinery/door/airlock/centcom{
name = "Administrative Office";
- opacity = 1;
req_access_txt = "109"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/centcom/ferry)
"vG" = (
@@ -9755,6 +9722,13 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/centcom/supplypod/loading/three)
+"wj" = (
+/obj/structure/closet/secure_closet/personal/cabinet{
+ desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here.";
+ name = "Personal ID-Locked Closet"
+ },
+/turf/open/floor/carpet/royalblue,
+/area/centcom/holding)
"wl" = (
/obj/structure/table/wood,
/obj/item/paicard,
@@ -9814,7 +9788,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
- opacity = 1;
req_access_txt = "101"
},
/obj/effect/turf_decal/stripes/line{
@@ -9881,7 +9854,6 @@
"wC" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Customs";
- opacity = 1;
req_access_txt = "109"
},
/obj/effect/turf_decal/stripes/line{
@@ -9914,8 +9886,7 @@
/area/centcom/control)
"wE" = (
/obj/structure/chair/comfy/brown{
- color = "#596479";
- dir = 2
+ color = "#596479"
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -9967,8 +9938,7 @@
"wJ" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
- name = "CentCom";
- opacity = 1
+ name = "CentCom"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -10033,9 +10003,7 @@
/area/syndicate_mothership)
"xa" = (
/obj/machinery/door/window/northright{
- base_state = "right";
dir = 4;
- icon_state = "right";
name = "Security Desk";
req_access_txt = "103"
},
@@ -10266,6 +10234,14 @@
/obj/item/bedsheet/syndie,
/turf/open/floor/plasteel/dark,
/area/syndicate_mothership)
+"xO" = (
+/obj/structure/curtain,
+/obj/machinery/shower,
+/obj/structure/window{
+ dir = 8
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/centcom/holding)
"xQ" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/light,
@@ -10396,7 +10372,6 @@
"yj" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
- opacity = 1;
req_access_txt = "101"
},
/obj/effect/turf_decal/stripes/line{
@@ -10441,12 +10416,9 @@
"yr" = (
/obj/machinery/door/airlock/centcom{
name = "Briefing Room";
- opacity = 1;
req_access_txt = "101"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/centcom/ferry)
"ys" = (
@@ -10652,11 +10624,17 @@
},
/turf/open/floor/plating,
/area/syndicate_mothership)
+"yS" = (
+/obj/machinery/door/airlock/wood{
+ id_tag = "Ninja7";
+ name = "Dorm 7"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"yU" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
- name = "CentCom";
- opacity = 1
+ name = "CentCom"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -10828,7 +10806,6 @@
"zj" = (
/obj/structure/closet/secure_closet/ertCom,
/obj/structure/sign/directions/command{
- dir = 2;
pixel_y = 24
},
/obj/effect/turf_decal/stripes/line,
@@ -10838,9 +10815,7 @@
/obj/machinery/door/airlock/medical/glass{
name = "Infirmary"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/centcom/control)
"zl" = (
@@ -11098,6 +11073,13 @@
/obj/item/reagent_containers/food/snacks/carpmeat,
/turf/open/floor/plasteel/cafeteria,
/area/centcom/holding)
+"zW" = (
+/obj/machinery/door/airlock/wood{
+ id_tag = "Ninja5";
+ name = "Dorm 5"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"zX" = (
/obj/structure/table,
/obj/machinery/light{
@@ -11106,6 +11088,14 @@
/obj/item/soap/deluxe,
/turf/open/floor/plasteel/cafeteria,
/area/centcom/holding)
+"zY" = (
+/obj/item/bedsheet/wiz{
+ desc = "A glow in the dark blue bedsheet.";
+ name = "blue bedsheet"
+ },
+/obj/structure/bed,
+/turf/open/floor/carpet/royalblue,
+/area/centcom/holding)
"Aa" = (
/turf/open/floor/mech_bay_recharge_floor,
/area/syndicate_mothership)
@@ -11344,6 +11334,16 @@
/obj/effect/decal/remains/xeno,
/turf/open/floor/grass,
/area/wizard_station)
+"AC" = (
+/obj/machinery/button/door{
+ id = "Ninja5";
+ name = "Dorm Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_y = 25;
+ specialfunctions = 4
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"AD" = (
/obj/machinery/door/airlock/centcom{
name = "Leader's Room";
@@ -11585,11 +11585,6 @@
},
/turf/open/floor/plasteel/white,
/area/centcom/holding)
-"Bp" = (
-/obj/item/paicard,
-/obj/structure/table/wood,
-/turf/open/floor/engine/cult,
-/area/wizard_station)
"Bs" = (
/obj/structure/table/wood,
/obj/machinery/computer/libraryconsole/bookmanagement,
@@ -11846,12 +11841,9 @@
"BM" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
- opacity = 1;
req_access_txt = "101"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/centcom/evac)
"BN" = (
@@ -12157,7 +12149,6 @@
icon_state = "plant-22"
},
/obj/machinery/power/apc{
- dir = 2;
name = "Briefing Room APC";
pixel_y = -26
},
@@ -12876,11 +12867,11 @@
/obj/item/folder/red,
/obj/item/pen/red,
/obj/machinery/door/window/brigdoor{
- name = "CentCom Customs";
- icon_state = "rightsecure";
+ base_state = "rightsecure";
dir = 4;
- req_access_txt = "109";
- base_state = "rightsecure"
+ icon_state = "rightsecure";
+ name = "CentCom Customs";
+ req_access_txt = "109"
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -12891,11 +12882,11 @@
/obj/item/folder/white,
/obj/item/pen/blue,
/obj/machinery/door/window/brigdoor{
- name = "CentCom Customs";
- icon_state = "rightsecure";
+ base_state = "rightsecure";
dir = 8;
- req_access_txt = "109";
- base_state = "rightsecure"
+ icon_state = "rightsecure";
+ name = "CentCom Customs";
+ req_access_txt = "109"
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -13101,12 +13092,9 @@
/area/wizard_station)
"Eg" = (
/obj/machinery/door/airlock/centcom{
- name = "Thunderdome Booth";
- opacity = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 2
+ name = "Thunderdome Booth"
},
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/centcom/control)
"Eh" = (
@@ -13121,7 +13109,6 @@
/area/wizard_station)
"Ej" = (
/obj/vehicle/ridden/scooter/skateboard{
- icon_state = "skateboard";
dir = 4
},
/obj/effect/turf_decal/stripes/line,
@@ -13161,9 +13148,7 @@
/area/tdome/tdomeobserve)
"Eq" = (
/obj/machinery/door/airlock/external,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/tdome/tdomeobserve)
"Er" = (
@@ -13263,12 +13248,9 @@
"EB" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
- opacity = 1;
req_access_txt = "101"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/tdome/tdomeobserve)
@@ -13281,9 +13263,7 @@
/turf/open/floor/engine/cult,
/area/wizard_station)
"ED" = (
-/obj/machinery/vending/boozeomat{
- req_access_txt = "0"
- },
+/obj/machinery/vending/boozeomat,
/turf/closed/indestructible{
icon = 'icons/turf/walls/wood_wall.dmi';
icon_state = "wood";
@@ -13323,8 +13303,8 @@
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/fernybush,
/turf/open/floor/plasteel{
- name = "plating";
- icon_state = "asteroid5"
+ icon_state = "asteroid5";
+ name = "plating"
},
/area/tdome/tdomeobserve)
"EH" = (
@@ -13591,7 +13571,6 @@
"Fr" = (
/obj/machinery/door/window/brigdoor{
base_state = "rightsecure";
- dir = 2;
icon_state = "rightsecure";
name = "Thunderdome Booth";
req_access_txt = "109"
@@ -13731,8 +13710,7 @@
/area/tdome/tdomeobserve)
"FK" = (
/obj/machinery/door/airlock/centcom{
- name = "Thunderdome Backstage";
- opacity = 1
+ name = "Thunderdome Backstage"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -13984,9 +13962,9 @@
/area/tdome/tdomeobserve)
"Gr" = (
/obj/structure/window/reinforced{
- resistance_flags = 3;
color = "#008000";
- dir = 1
+ dir = 1;
+ resistance_flags = 3
},
/turf/open/lava,
/area/wizard_station)
@@ -14004,9 +13982,7 @@
/area/tdome/tdomeobserve)
"Gv" = (
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/tdome/tdomeobserve)
"Gw" = (
@@ -14016,12 +13992,9 @@
"Gx" = (
/obj/machinery/door/airlock/centcom{
name = "Thunderdome";
- opacity = 1;
req_access_txt = "101"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/tdome/tdomeobserve)
"Gy" = (
@@ -14033,9 +14006,9 @@
resistance_flags = 3
},
/obj/structure/window/reinforced{
- resistance_flags = 3;
color = "#008000";
- dir = 1
+ dir = 1;
+ resistance_flags = 3
},
/turf/open/lava/airless,
/area/wizard_station)
@@ -14823,12 +14796,9 @@
"HS" = (
/obj/machinery/door/airlock/centcom{
name = "Thunderdome Locker Room";
- opacity = 1;
req_access_txt = "101"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/tdome/tdomeobserve)
"HT" = (
@@ -15148,7 +15118,6 @@
/turf/open/floor/plasteel,
/area/tdome/tdomeobserve)
"Is" = (
-/obj/machinery/igniter/on,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/tdome/arena)
@@ -15176,12 +15145,9 @@
"Ix" = (
/obj/machinery/door/airlock/centcom{
name = "Thunderdome Administration";
- opacity = 1;
req_access_txt = "102"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/tdome/tdomeadmin)
@@ -15348,9 +15314,7 @@
/area/tdome/tdomeadmin)
"IS" = (
/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/tdome/tdomeadmin)
"IT" = (
@@ -15442,8 +15406,8 @@
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/fernybush,
/turf/open/floor/plasteel{
- name = "plating";
- icon_state = "asteroid5"
+ icon_state = "asteroid5";
+ name = "plating"
},
/area/tdome/tdomeadmin)
"Je" = (
@@ -15878,6 +15842,14 @@
},
/turf/open/floor/plasteel/dark,
/area/tdome/tdomeadmin)
+"Kf" = (
+/obj/structure/closet/secure_closet/personal/cabinet,
+/obj/item/lighter,
+/obj/item/stack/sheet/mineral/wood{
+ amount = 10
+ },
+/turf/open/floor/carpet/red,
+/area/centcom/holding)
"Kg" = (
/turf/closed/indestructible/fakedoor{
name = "Thunderdome Admin"
@@ -15887,7 +15859,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
name = "Thunderdome Administration";
- opacity = 1;
req_access_txt = "102"
},
/obj/effect/turf_decal/stripes/line{
@@ -16199,7 +16170,6 @@
/area/centcom/evac)
"KL" = (
/obj/docking_port/stationary{
- dir = 1;
dwidth = 1;
height = 4;
id = "pod4_away";
@@ -16210,7 +16180,6 @@
/area/space)
"KM" = (
/obj/docking_port/stationary{
- dir = 1;
dwidth = 1;
height = 4;
id = "pod3_away";
@@ -16322,6 +16291,12 @@
},
/turf/open/floor/mineral/titanium/blue,
/area/centcom/evac)
+"Ln" = (
+/obj/structure/toilet{
+ dir = 4
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/centcom/holding)
"Lp" = (
/obj/structure/chair{
dir = 4
@@ -16598,6 +16573,12 @@
"Mm" = (
/turf/open/floor/grass,
/area/centcom/holding)
+"Ms" = (
+/obj/effect/mob_spawn/human/ghostcafe{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"Mt" = (
/obj/structure/window/reinforced{
dir = 4
@@ -16701,6 +16682,13 @@
"MI" = (
/turf/open/floor/plating,
/area/syndicate_mothership)
+"MJ" = (
+/obj/structure/bed,
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"MM" = (
/obj/structure/window/reinforced,
/turf/open/floor/carpet/black,
@@ -16767,12 +16755,9 @@
"Nk" = (
/obj/machinery/door/airlock/centcom{
name = "Thunderdome";
- opacity = 1;
req_access_txt = "101"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
@@ -16810,9 +16795,7 @@
/area/syndicate_mothership)
"Nv" = (
/obj/structure/table,
-/turf/open/floor/plasteel/cafeteria{
- dir = 2
- },
+/turf/open/floor/plasteel/cafeteria,
/area/centcom/holding)
"Nw" = (
/obj/machinery/recharge_station,
@@ -16852,12 +16835,9 @@
"NG" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
- opacity = 1;
req_access_txt = "101"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
@@ -16888,12 +16868,9 @@
/area/centcom/holding)
"NU" = (
/obj/machinery/door/airlock/centcom{
- name = "CentCom";
- opacity = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 2
+ name = "CentCom"
},
+/obj/effect/turf_decal/stripes/line,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
@@ -16933,6 +16910,9 @@
/obj/machinery/deepfryer,
/turf/open/floor/plasteel/cafeteria,
/area/syndicate_mothership)
+"Of" = (
+/turf/open/floor/carpet/red,
+/area/centcom/holding)
"Oh" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -16942,8 +16922,7 @@
"Oj" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
- name = "CentCom";
- opacity = 1
+ name = "CentCom"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -16953,6 +16932,10 @@
},
/turf/open/floor/plasteel,
/area/centcom/control)
+"Ol" = (
+/obj/structure/table/wood/fancy,
+/turf/open/floor/wood,
+/area/centcom/holding)
"Om" = (
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/brown{
@@ -16986,6 +16969,12 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/dark,
/area/centcom/supplypod)
+"Ox" = (
+/obj/machinery/door/airlock/wood/glass{
+ name = "Cryo"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"Oz" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -17121,7 +17110,9 @@
/turf/open/floor/wood,
/area/syndicate_mothership)
"Px" = (
-/obj/machinery/vr_sleeper,
+/obj/structure/mineral_door/paperframe{
+ name = "Arcade"
+ },
/turf/open/floor/wood,
/area/centcom/holding)
"PA" = (
@@ -17135,7 +17126,10 @@
/area/syndicate_mothership)
"PF" = (
/obj/machinery/vr_sleeper{
- dir = 1
+ dir = 8
+ },
+/obj/machinery/light{
+ dir = 4
},
/turf/open/floor/wood,
/area/centcom/holding)
@@ -17168,6 +17162,12 @@
/obj/machinery/autolathe,
/turf/open/floor/wood,
/area/centcom/holding)
+"PM" = (
+/obj/machinery/vending/clothing{
+ extended_inventory = 1
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"PO" = (
/obj/machinery/hydroponics/constructable,
/obj/effect/turf_decal/tile/green{
@@ -17246,6 +17246,11 @@
"Qe" = (
/turf/open/ai_visible,
/area/ai_multicam_room)
+"Qi" = (
+/obj/item/paicard,
+/obj/structure/table/wood,
+/turf/open/floor/engine/cult,
+/area/wizard_station)
"Qk" = (
/obj/structure/flora/ausbushes/fullgrass,
/obj/structure/flora/ausbushes/ppflowers,
@@ -17273,11 +17278,8 @@
/turf/open/floor/plasteel,
/area/syndicate_mothership)
"Qu" = (
-/obj/machinery/vr_sleeper{
- dir = 8
- },
-/obj/machinery/light{
- dir = 4
+/obj/machinery/door/airlock/wood/glass{
+ name = "Dorms"
},
/turf/open/floor/wood,
/area/centcom/holding)
@@ -17292,9 +17294,25 @@
},
/turf/open/floor/mineral/plastitanium/red,
/area/syndicate_mothership)
+"QC" = (
+/obj/machinery/door/airlock/wood{
+ name = "Bathroom"
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/centcom/holding)
"QE" = (
/turf/open/floor/plasteel,
/area/centcom/supplypod)
+"QF" = (
+/obj/machinery/button/door{
+ id = "Ninja3";
+ name = "Dorm Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_y = -25;
+ specialfunctions = 4
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"QH" = (
/obj/machinery/chem_master/condimaster{
desc = "Used to separate out liquids - useful for purifying botanical extracts. Also dispenses condiments.";
@@ -17330,6 +17348,12 @@
/obj/structure/window/reinforced/fulltile,
/turf/open/floor/grass,
/area/centcom/holding)
+"QN" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/centcom/holding)
"QP" = (
/obj/machinery/computer/mech_bay_power_console{
dir = 1
@@ -17466,6 +17490,21 @@
/obj/item/tank/internals/plasmaman/belt/full,
/turf/open/floor/wood,
/area/centcom/holding)
+"Rq" = (
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#cee5d2"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
+"Ru" = (
+/obj/structure/fireplace,
+/turf/open/floor/carpet/red,
+/area/centcom/holding)
+"Rv" = (
+/obj/structure/dresser,
+/turf/open/floor/carpet/royalblue,
+/area/centcom/holding)
"Rz" = (
/obj/effect/turf_decal/loading_area,
/turf/open/floor/plating,
@@ -17480,9 +17519,20 @@
},
/turf/open/floor/holofloor,
/area/holodeck/rec_center/basketball)
-"RL" = (
-/obj/structure/mineral_door/paperframe{
- name = "Arcade"
+"RO" = (
+/obj/machinery/shower{
+ dir = 1
+ },
+/obj/structure/window{
+ dir = 8
+ },
+/obj/structure/curtain,
+/turf/open/floor/mineral/titanium/blue,
+/area/centcom/holding)
+"RP" = (
+/obj/machinery/door/airlock/wood{
+ id_tag = "Ninja4";
+ name = "Dorm 4"
},
/turf/open/floor/wood,
/area/centcom/holding)
@@ -17508,6 +17558,12 @@
},
/turf/open/floor/wood,
/area/centcom/holding)
+"RX" = (
+/obj/structure/chair/comfy/brown{
+ color = "#596479"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"RZ" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -17618,9 +17674,7 @@
pixel_x = -3;
pixel_y = 6
},
-/turf/open/floor/plasteel/cafeteria{
- dir = 2
- },
+/turf/open/floor/plasteel/cafeteria,
/area/centcom/holding)
"SH" = (
/obj/effect/turf_decal/tile/green{
@@ -17648,6 +17702,9 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/space/basic,
/area/centcom/supplypod)
+"ST" = (
+/turf/open/floor/mineral/titanium/blue,
+/area/centcom/holding)
"SU" = (
/obj/structure/table/wood,
/obj/item/camera/detective{
@@ -17686,10 +17743,27 @@
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/centcom/holding)
+"SZ" = (
+/obj/machinery/door/airlock/wood{
+ id_tag = "Ninja3";
+ name = "Dorm 3"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"Tb" = (
/obj/structure/closet/crate/freezer/blood,
/turf/open/floor/wood,
/area/centcom/holding)
+"Tc" = (
+/obj/machinery/button/door{
+ id = "Ninja2";
+ name = "Dorm Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_y = -25;
+ specialfunctions = 4
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"Tj" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -17804,6 +17878,10 @@
/obj/effect/landmark/holding_facility,
/turf/open/floor/wood,
/area/centcom/holding)
+"Uf" = (
+/obj/structure/closet/secure_closet,
+/turf/open/floor/wood,
+/area/centcom/holding)
"Ug" = (
/obj/machinery/door/poddoor/shuttledock{
checkdir = 1;
@@ -17861,15 +17939,15 @@
"Un" = (
/obj/machinery/door/airlock/centcom{
name = "Thunderdome";
- opacity = 1;
req_access_txt = "101"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/tdome/tdomeobserve)
+"Ur" = (
+/turf/open/floor/carpet/royalblue,
+/area/centcom/holding)
"Uu" = (
/obj/machinery/light{
dir = 8
@@ -17895,6 +17973,13 @@
/obj/machinery/vending/cola,
/turf/open/floor/plasteel,
/area/centcom/supplypod)
+"UD" = (
+/obj/structure/closet/secure_closet/personal/cabinet{
+ desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here.";
+ name = "Personal ID-Locked Closet"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"UE" = (
/obj/structure/chair/stool/bar,
/turf/open/floor/wood,
@@ -17918,7 +18003,6 @@
"UO" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
- opacity = 1;
req_access_txt = "101"
},
/obj/effect/turf_decal/stripes/line{
@@ -17998,15 +18082,13 @@
dir = 8
},
/obj/machinery/door/window{
- name = "Tactical Toilet";
- icon_state = "right";
dir = 8;
+ icon_state = "right";
+ name = "Tactical Toilet";
opacity = 1
},
/obj/structure/window/reinforced/tinted,
-/turf/open/floor/plasteel/freezer{
- dir = 2
- },
+/turf/open/floor/plasteel/freezer,
/area/syndicate_mothership)
"Vm" = (
/obj/machinery/gibber,
@@ -18124,7 +18206,6 @@
"Wc" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
- opacity = 1;
req_access_txt = "101"
},
/obj/effect/turf_decal/stripes/line{
@@ -18155,11 +18236,24 @@
"Wr" = (
/turf/open/floor/plasteel/dark,
/area/centcom/supplypod)
+"Ws" = (
+/obj/machinery/door/airlock/wood{
+ id_tag = "Ninja6";
+ name = "Dorm 6"
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"WC" = (
/obj/structure/table/reinforced,
/obj/item/pen,
/turf/open/floor/mineral/plastitanium/red,
/area/centcom/evac)
+"WE" = (
+/obj/machinery/vending/kink{
+ extended_inventory = 1
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"WH" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/food/drinks/bottle/whiskey{
@@ -18170,12 +18264,9 @@
"WJ" = (
/obj/machinery/door/airlock/centcom{
name = "Thunderdome Administration";
- opacity = 1;
req_access_txt = "102"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
@@ -18194,6 +18285,16 @@
},
/turf/open/floor/wood,
/area/centcom/holding)
+"WN" = (
+/obj/machinery/button/door{
+ id = "Ninja6";
+ name = "Dorm Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_y = 25;
+ specialfunctions = 4
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"WO" = (
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/brown{
@@ -18205,7 +18306,6 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
- opacity = 1;
req_access_txt = "101"
},
/obj/effect/turf_decal/stripes/line{
@@ -18220,6 +18320,14 @@
/obj/structure/closet/syndicate/personal,
/turf/open/floor/wood,
/area/syndicate_mothership)
+"WV" = (
+/obj/structure/bed,
+/obj/item/bedsheet/hos{
+ desc = "A fancy red bedsheet.";
+ name = "red bedsheet"
+ },
+/turf/open/floor/carpet/red,
+/area/centcom/holding)
"WW" = (
/obj/machinery/processor,
/turf/open/floor/plasteel/cafeteria,
@@ -18232,9 +18340,7 @@
/turf/open/floor/grass,
/area/centcom/holding)
"Xe" = (
-/obj/machinery/vending/autodrobe{
- req_access_txt = "0"
- },
+/obj/machinery/vending/autodrobe,
/turf/open/floor/wood,
/area/centcom/holding)
"Xg" = (
@@ -18260,9 +18366,8 @@
/turf/open/floor/mineral/plastitanium/red,
/area/syndicate_mothership)
"Xn" = (
-/obj/machinery/door/airlock/wood{
- req_one_access_txt = "0"
- },
+/obj/structure/bed,
+/obj/item/bedsheet/random,
/turf/open/floor/wood,
/area/centcom/holding)
"Xo" = (
@@ -18287,20 +18392,15 @@
/turf/open/floor/plasteel,
/area/centcom/supplypod/loading/four)
"Xs" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
-/turf/open/floor/plating,
-/area/syndicate_mothership)
+/obj/structure/chair/comfy/brown,
+/turf/open/floor/wood,
+/area/centcom/holding)
"Xt" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
- opacity = 1;
req_access_txt = "101"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/centcom/control)
@@ -18314,6 +18414,10 @@
/obj/effect/turf_decal/tile/green,
/turf/open/floor/holofloor,
/area/holodeck/rec_center/firingrange)
+"Xw" = (
+/obj/structure/table/wood/fancy/royalblue,
+/turf/open/floor/wood,
+/area/centcom/holding)
"Xx" = (
/obj/machinery/light{
dir = 4
@@ -18332,6 +18436,16 @@
},
/turf/open/floor/plasteel,
/area/centcom/ferry)
+"XD" = (
+/obj/machinery/button/door{
+ id = "Ninja4";
+ name = "Dorm Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_y = 25;
+ specialfunctions = 4
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"XE" = (
/obj/machinery/door/airlock/centcom{
name = "Kitchen";
@@ -18372,6 +18486,16 @@
},
/turf/open/floor/plating,
/area/syndicate_mothership)
+"Ya" = (
+/obj/machinery/button/door{
+ id = "Ninja1";
+ name = "Dorm Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_y = -25;
+ specialfunctions = 4
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"Yc" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
@@ -18428,12 +18552,9 @@
"Yt" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
- opacity = 1;
req_access_txt = "101"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
@@ -18473,6 +18594,12 @@
/mob/living/simple_animal/chicken,
/turf/open/floor/grass,
/area/centcom/holding)
+"YO" = (
+/obj/structure/chair/comfy/brown{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/centcom/holding)
"YQ" = (
/obj/structure/table,
/obj/item/reagent_containers/glass/beaker,
@@ -18495,6 +18622,9 @@
},
/turf/open/floor/wood,
/area/centcom/holding)
+"YW" = (
+/turf/open/floor/plating,
+/area/centcom/holding)
"Za" = (
/obj/machinery/door/airlock/wood{
id_tag = "lmrestroom"
@@ -18529,11 +18659,10 @@
/obj/machinery/light,
/turf/open/floor/plasteel/dark,
/area/syndicate_mothership)
-"Zt" = (
-/obj/machinery/vr_sleeper{
- dir = 1
+"Zu" = (
+/obj/machinery/vending/autodrobe/all_access{
+ extended_inventory = 1
},
-/obj/machinery/light,
/turf/open/floor/wood,
/area/centcom/holding)
"Zw" = (
@@ -18554,6 +18683,16 @@
/obj/effect/landmark/start/nukeop_leader,
/turf/open/floor/wood,
/area/syndicate_mothership)
+"ZE" = (
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 11
+ },
+/obj/structure/mirror{
+ pixel_x = 28
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/centcom/holding)
"ZF" = (
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/brown{
@@ -18570,7 +18709,6 @@
"ZJ" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
- opacity = 1;
req_access_txt = "101"
},
/obj/effect/turf_decal/stripes/line{
@@ -18629,12 +18767,9 @@
"ZX" = (
/obj/machinery/door/airlock/centcom{
name = "CentCom Security";
- opacity = 1;
req_access_txt = "101"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
+/obj/effect/turf_decal/stripes/line,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
@@ -25747,7 +25882,7 @@ lI
lI
lI
Ax
-Bp
+Qi
qZ
qZ
Ax
@@ -39895,7 +40030,7 @@ aa
aa
aa
QV
-Xs
+Yc
MI
MI
MI
@@ -40409,7 +40544,7 @@ aa
aa
aa
QV
-Xs
+Yc
MI
MI
MI
@@ -40666,7 +40801,7 @@ aa
aa
aa
QV
-Xs
+Yc
MI
MI
MI
@@ -42755,17 +42890,17 @@ Nd
Nd
Nd
Nd
+Nd
+Nd
+Nd
+Nd
+Nd
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Nd
+Nd
+Nd
+Nd
+Nd
aa
aa
aa
@@ -43009,20 +43144,20 @@ CT
oV
CT
CT
+CT
oV
CT
Nd
+Xk
+Xk
+Xk
+Nd
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Nd
+Uf
+Xk
+Xk
+Nd
aa
aa
aa
@@ -43268,18 +43403,18 @@ Xk
Xk
Xk
Xk
+Xk
+Nd
+Gs
+Xk
+HH
Nd
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Nd
+MJ
+Xk
+YW
+Nd
aa
aa
aa
@@ -43519,24 +43654,24 @@ UV
CV
Xk
NT
-Xk
+Dj
PF
+Dj
+Xk
+Dj
+PF
+Dj
+Nd
+Xk
Xk
-Px
Xk
-Zt
Nd
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Nd
+ma
+YW
+Xk
+Nd
aa
aa
aa
@@ -43775,25 +43910,25 @@ Nd
Gs
Xk
Xk
-RL
-Xk
-PF
-Xk
-Px
-Xk
-PF
Nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Nd
+Nd
+Nd
+Px
+Nd
+Nd
+Nd
+Nd
+Nd
+Ox
+Nd
+Nd
+Nd
+Nd
+Nd
+yS
+Nd
+Nd
aa
aa
aa
@@ -44034,23 +44169,23 @@ CV
Xk
NT
Xk
-PF
+Yo
Xk
-Px
Xk
-Zt
+Xk
+Yo
+Xk
+Nd
+Xk
+Xk
+Yo
+Xk
+Xk
+Yo
+Xk
+Xk
+WE
Nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
aa
aa
aa
@@ -44277,7 +44412,7 @@ Nd
Xk
Yo
Xk
-Xn
+XL
Xk
Xk
Tn
@@ -44289,13 +44424,24 @@ NT
Zh
Xk
Xk
-NT
+Re
Xk
Xk
Xk
Xk
Xk
Xk
+Xk
+Qu
+Xk
+Xk
+Xk
+Xk
+Xk
+Xk
+Xk
+Xk
+Zu
Nd
aa
aa
@@ -44303,17 +44449,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
KH
KH
KS
@@ -44547,24 +44682,24 @@ Ym
CV
Xk
NT
-Dj
-Qu
-Dj
-Dj
-Qu
-Dj
+Xk
+Xx
+Xk
+Xk
+Xk
+Xx
+Xk
+Nd
+Xk
+Xk
+Xk
+Xk
+Xk
+Xk
+Xk
+Xk
+PM
Nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
aa
aa
aa
@@ -44811,17 +44946,17 @@ Nd
Nd
Nd
Nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Nd
+Nd
+Nd
+Nd
+Rq
+HH
+Nd
+Nd
+Nd
+Nd
+Nd
aa
aa
aa
@@ -45068,17 +45203,17 @@ OU
RS
VF
Nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+UD
+tZ
+SY
+Nd
+Xk
+Xk
+Nd
+SY
+Ri
+UD
+Nd
aa
aa
aa
@@ -45325,17 +45460,17 @@ Xk
Xk
Xk
Nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Gs
+Xk
+Xk
+lS
+Xk
+Xk
+RP
+Xk
+Xk
+HH
+Nd
aa
aa
aa
@@ -45582,17 +45717,17 @@ XM
XM
Xk
Nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Xn
+Xk
+Ya
+Nd
+Xk
+Xk
+Nd
+XD
+Xk
+Xn
+Nd
aa
aa
aa
@@ -45839,17 +45974,17 @@ Po
ZU
Xk
Nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Nd
+Nd
+Nd
+Nd
+Xk
+Xk
+Nd
+Nd
+Nd
+Nd
+Nd
aa
aa
aa
@@ -46096,17 +46231,17 @@ Sd
MM
Xk
Nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+UD
+tZ
+SY
+Nd
+Xk
+Xk
+Nd
+SY
+Ri
+UD
+Nd
aa
aa
aa
@@ -46353,17 +46488,17 @@ Sd
MM
TM
Nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Gs
+Xk
+Xk
+uh
+Xk
+Xk
+zW
+Xk
+Xk
+HH
+Nd
aa
aa
aa
@@ -46610,17 +46745,17 @@ Sd
MM
Xk
Nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Xn
+Xk
+Tc
+Nd
+Xk
+Xk
+Nd
+AC
+Xk
+Xn
+Nd
aa
aa
aa
@@ -46867,17 +47002,17 @@ PA
Pl
Xk
Nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Nd
+Nd
+Nd
+Nd
+Rq
+HH
+Nd
+Nd
+Nd
+Nd
+Nd
aa
aa
aa
@@ -47124,17 +47259,17 @@ GY
GY
Xk
Nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Xs
+Ol
+YO
+Nd
+Xk
+Xk
+Nd
+RX
+Xw
+qP
+Nd
aa
aa
aa
@@ -47381,17 +47516,17 @@ Xk
Xk
Xk
Nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Gs
+Xk
+Xk
+SZ
+Xk
+Xk
+Ws
+Xk
+Xk
+HH
+Nd
aa
aa
aa
@@ -47628,7 +47763,7 @@ Xk
GY
NT
Xk
-Xk
+Ms
Xk
NT
vt
@@ -47638,17 +47773,17 @@ Tb
Uh
tW
Nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Ru
+Of
+QF
+Nd
+Xk
+Xk
+Nd
+WN
+Ur
+wj
+Nd
aa
aa
aa
@@ -47895,17 +48030,17 @@ Nd
Nd
Nd
Nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Kf
+WV
+Xk
+Nd
+Nd
+Nd
+Nd
+Xk
+zY
+Rv
+Nd
aa
aa
aa
@@ -48151,18 +48286,18 @@ aa
aa
aa
aa
+Nd
+Nd
+Nd
+QC
+Nd
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Nd
+QC
+Nd
+Nd
+Nd
aa
aa
aa
@@ -48408,18 +48543,18 @@ aa
aa
aa
aa
+Nd
+Ln
+ST
+ST
+Nd
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Nd
+ST
+ST
+Ln
+Nd
aa
aa
aa
@@ -48665,18 +48800,18 @@ aa
aa
aa
aa
+Nd
+xO
+QN
+ZE
+Nd
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Nd
+ZE
+QN
+RO
+Nd
aa
aa
aa
@@ -48922,18 +49057,18 @@ aa
aa
aa
aa
+Nd
+Nd
+Nd
+Nd
+Nd
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Nd
+Nd
+Nd
+Nd
+Nd
aa
aa
aa
diff --git a/_maps/templates/shelter_3.dmm b/_maps/templates/shelter_3.dmm
new file mode 100644
index 0000000000..b71da1fba0
--- /dev/null
+++ b/_maps/templates/shelter_3.dmm
@@ -0,0 +1,414 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/titanium/survival/pod,
+/area/survivalpod)
+"b" = (
+/obj/structure/sign/mining/survival{
+ dir = 1
+ },
+/turf/closed/wall/mineral/titanium/survival/pod,
+/area/survivalpod)
+"c" = (
+/turf/closed/wall/mineral/titanium/survival/nodiagonal,
+/area/survivalpod)
+"d" = (
+/obj/structure/sign/mining/survival{
+ dir = 1
+ },
+/turf/closed/wall/mineral/titanium/survival/nodiagonal,
+/area/survivalpod)
+"e" = (
+/obj/structure/sign/mining/survival{
+ dir = 8
+ },
+/turf/closed/wall/mineral/titanium/survival/nodiagonal,
+/area/survivalpod)
+"f" = (
+/obj/structure/table/wood/fancy/black,
+/obj/machinery/chem_dispenser/drinks,
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"g" = (
+/obj/structure/table/wood/fancy/black,
+/obj/machinery/chem_dispenser/drinks/beer,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"h" = (
+/obj/machinery/vending/boozeomat,
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"i" = (
+/obj/item/book/manual/wiki/barman_recipes,
+/obj/item/reagent_containers/food/drinks/shaker,
+/obj/item/reagent_containers/rag,
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"j" = (
+/obj/structure/table/wood/fancy/black,
+/obj/item/clipboard,
+/obj/item/toy/figure/bartender,
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"k" = (
+/obj/structure/table/wood/fancy/black,
+/obj/item/storage/fancy/cigarettes/cigars,
+/obj/item/storage/fancy/cigarettes/cigars/cohiba{
+ pixel_y = 4
+ },
+/obj/item/storage/fancy/cigarettes/cigars/havana{
+ pixel_y = 8
+ },
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"l" = (
+/obj/structure/table/wood/fancy/black,
+/obj/structure/reagent_dispensers/beerkeg,
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"m" = (
+/obj/structure/closet/secure_closet/bar,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"n" = (
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/obj/machinery/disposal/bin,
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"o" = (
+/obj/structure/sign/mining/survival{
+ dir = 4
+ },
+/obj/structure/disposalpipe/junction{
+ dir = 4
+ },
+/turf/closed/wall/mineral/titanium/survival/pod,
+/area/survivalpod)
+"p" = (
+/obj/machinery/door/airlock/survival_pod/glass{
+ req_access_txt = "25"
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"q" = (
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"r" = (
+/obj/structure/disposalpipe/segment,
+/turf/closed/wall/mineral/titanium/survival/nodiagonal,
+/area/survivalpod)
+"s" = (
+/obj/structure/table/reinforced,
+/obj/item/lighter{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/item/lighter,
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"t" = (
+/obj/structure/table/reinforced,
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"u" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/box/matches{
+ pixel_x = -4;
+ pixel_y = 8
+ },
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"v" = (
+/obj/machinery/door/window/survival_pod{
+ req_access_txt = "25"
+ },
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"w" = (
+/obj/structure/sign/mining/survival{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/turf/closed/wall/mineral/titanium/survival/nodiagonal,
+/area/survivalpod)
+"x" = (
+/obj/structure/chair/stool/bar,
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+"y" = (
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+"z" = (
+/obj/machinery/vending/cigarette/beach,
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+"A" = (
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/obj/machinery/disposal/bin,
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+"B" = (
+/obj/structure/sign/mining/survival{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/closed/wall/mineral/titanium/survival/nodiagonal,
+/area/survivalpod)
+"C" = (
+/obj/structure/window/reinforced/survival_pod{
+ dir = 8
+ },
+/obj/structure/window/reinforced/survival_pod{
+ dir = 4
+ },
+/obj/structure/window/reinforced/survival_pod{
+ dir = 1
+ },
+/obj/structure/window/reinforced/survival_pod,
+/obj/structure/grille,
+/turf/open/floor/pod/dark,
+/area/survivalpod)
+"D" = (
+/obj/structure/chair/comfy/black,
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+"E" = (
+/obj/machinery/door/airlock/survival_pod,
+/turf/open/floor/pod/light,
+/area/survivalpod)
+"F" = (
+/obj/structure/table/wood/fancy,
+/obj/item/reagent_containers/food/condiment/peppermill{
+ pixel_x = -4;
+ pixel_y = 12
+ },
+/obj/item/reagent_containers/food/condiment/saltshaker{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+"G" = (
+/obj/structure/urinal{
+ pixel_y = 24
+ },
+/turf/open/floor/pod/light,
+/area/survivalpod)
+"H" = (
+/turf/open/floor/pod/light,
+/area/survivalpod)
+"I" = (
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 11
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/open/floor/pod/light,
+/area/survivalpod)
+"J" = (
+/obj/structure/sign/mining/survival{
+ dir = 4
+ },
+/turf/closed/wall/mineral/titanium/survival/nodiagonal,
+/area/survivalpod)
+"K" = (
+/obj/structure/chair/comfy/black{
+ dir = 1
+ },
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+"L" = (
+/obj/machinery/vending/snack/random,
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+"M" = (
+/obj/machinery/light,
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+"N" = (
+/obj/structure/toilet{
+ dir = 8
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/open/floor/pod/light,
+/area/survivalpod)
+"O" = (
+/obj/structure/sign/mining/survival{
+ dir = 4
+ },
+/turf/closed/wall/mineral/titanium/survival/pod,
+/area/survivalpod)
+"P" = (
+/obj/structure/sign/mining/survival,
+/turf/closed/wall/mineral/titanium/survival/pod,
+/area/survivalpod)
+"Q" = (
+/obj/structure/sign/mining/survival,
+/turf/closed/wall/mineral/titanium/survival/nodiagonal,
+/area/survivalpod)
+"R" = (
+/obj/machinery/door/airlock/survival_pod/glass,
+/obj/structure/fans/tiny,
+/turf/open/floor/carpet/black,
+/area/survivalpod)
+
+(1,1,1) = {"
+a
+e
+p
+e
+c
+e
+C
+e
+C
+e
+a
+"}
+(2,1,1) = {"
+b
+f
+q
+s
+x
+y
+D
+F
+K
+L
+P
+"}
+(3,1,1) = {"
+c
+g
+q
+t
+x
+y
+y
+y
+y
+M
+c
+"}
+(4,1,1) = {"
+d
+h
+q
+t
+x
+y
+D
+F
+K
+y
+Q
+"}
+(5,1,1) = {"
+c
+i
+q
+u
+x
+y
+D
+F
+K
+y
+c
+"}
+(6,1,1) = {"
+d
+j
+q
+t
+x
+y
+y
+y
+y
+y
+R
+"}
+(7,1,1) = {"
+c
+k
+q
+t
+x
+y
+c
+c
+c
+c
+c
+"}
+(8,1,1) = {"
+d
+l
+q
+t
+x
+y
+c
+G
+H
+H
+Q
+"}
+(9,1,1) = {"
+c
+m
+q
+v
+y
+y
+E
+H
+c
+E
+c
+"}
+(10,1,1) = {"
+b
+n
+q
+t
+z
+A
+c
+I
+c
+N
+P
+"}
+(11,1,1) = {"
+a
+o
+r
+w
+r
+B
+c
+J
+c
+O
+a
+"}
diff --git a/code/__DEFINES/components.dm b/code/__DEFINES/components.dm
index f95ff93ac3..7b2dd8663c 100644
--- a/code/__DEFINES/components.dm
+++ b/code/__DEFINES/components.dm
@@ -54,6 +54,10 @@
#define EXAMINE_POSITION_BEFORE 2
//End positions
#define COMPONENT_EXNAME_CHANGED 1
+#define COMSIG_ATOM_UPDATE_ICON "atom_update_icon" //from base of atom/update_icon(): ()
+ #define COMSIG_ATOM_NO_UPDATE_ICON_STATE 1
+ #define COMSIG_ATOM_NO_UPDATE_OVERLAYS 2
+#define COMSIG_ATOM_UPDATE_OVERLAYS "atom_update_overlays" //from base of atom/update_overlays(): (list/new_overlays)
#define COMSIG_ATOM_ENTERED "atom_entered" //from base of atom/Entered(): (atom/movable/entering, /atom)
#define COMSIG_ATOM_EXIT "atom_exit" //from base of atom/Exit(): (/atom/movable/exiting, /atom/newloc)
#define COMPONENT_ATOM_BLOCK_EXIT 1
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index 09ef814f68..55bfcaff79 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -224,6 +224,8 @@ GLOBAL_LIST_INIT(heavyfootmob, typecacheof(list(
#define isorgan(A) (istype(A, /obj/item/organ))
+#define isclothing(A) (istype(A, /obj/item/clothing))
+
GLOBAL_LIST_INIT(pointed_types, typecacheof(list(
/obj/item/pen,
/obj/item/screwdriver,
diff --git a/code/__DEFINES/melee.dm b/code/__DEFINES/melee.dm
index cb4a433211..b166b9d21a 100644
--- a/code/__DEFINES/melee.dm
+++ b/code/__DEFINES/melee.dm
@@ -7,4 +7,5 @@
#define MARTIALART_MUSHPUNCH "mushroom punch"
#define MARTIALART_KRAVMAGA "krav maga"
#define MARTIALART_CQC "CQC"
-#define MARTIALART_PLASMAFIST "plasma fist"
\ No newline at end of file
+#define MARTIALART_PLASMAFIST "plasma fist"
+#define MARTIALART_RISINGBASS "rising bass"
\ No newline at end of file
diff --git a/code/__DEFINES/obj_flags.dm b/code/__DEFINES/obj_flags.dm
index 94c2c372f0..831f73ac74 100644
--- a/code/__DEFINES/obj_flags.dm
+++ b/code/__DEFINES/obj_flags.dm
@@ -41,6 +41,7 @@
#define VOICEBOX_TOGGLABLE (1<<6) //The voicebox in this clothing can be toggled.
#define VOICEBOX_DISABLED (1<<7) //The voicebox is currently turned off.
#define IGNORE_HAT_TOSS (1<<8) //Hats with negative effects when worn (i.e the tinfoil hat).
+#define SCAN_REAGENTS (1<<9) // Allows helmets and glasses to scan reagents.
// Flags for the organ_flags var on /obj/item/organ
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index 428d569531..439b3d1493 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -226,6 +226,7 @@
#define NINJA_SUIT_TRAIT "ninja-suit"
#define ANTI_DROP_IMPLANT_TRAIT "anti-drop-implant"
#define SLEEPING_CARP_TRAIT "sleeping_carp"
+#define RISING_BASS_TRAIT "rising_bass"
#define ABDUCTOR_ANTAGONIST "abductor-antagonist"
#define MADE_UNCLONEABLE "made-uncloneable"
#define NUKEOP_TRAIT "nuke-op"
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index 0d6345dae2..ce8b2e4cf0 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -76,6 +76,8 @@
init_sprite_accessory_subtypes(/datum/sprite_accessory/insect_wings, GLOB.insect_wings_list)
if(!GLOB.insect_fluffs_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/insect_fluff, GLOB.insect_fluffs_list)
+ if(!GLOB.insect_markings_list.len)
+ init_sprite_accessory_subtypes(/datum/sprite_accessory/insect_markings, GLOB.insect_markings_list)
//CIT CHANGES - genitals and such
if(!GLOB.cock_shapes_list.len)
@@ -151,6 +153,7 @@
"caps" = pick(GLOB.caps_list),
"insect_wings" = pick(GLOB.insect_wings_list),
"insect_fluff" = "None",
+ "insect_markings" = pick(GLOB.insect_markings_list),
"taur" = "None",
"mam_body_markings" = pick(snowflake_markings_list),
"mam_ears" = pick(snowflake_ears_list),
diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
index e0cf8ebdd5..bf179760c0 100644
--- a/code/_globalvars/bitfields.dm
+++ b/code/_globalvars/bitfields.dm
@@ -143,6 +143,7 @@ GLOBAL_LIST_INIT(bitfields, list(
"VOICEBOX_TOGGLABLE" = VOICEBOX_TOGGLABLE,
"VOICEBOX_DISABLED" = VOICEBOX_DISABLED,
"IGNORE_HAT_TOSS" = IGNORE_HAT_TOSS,
+ "SCAN_REAGENTS" = SCAN_REAGENTS
),
"tesla_flags" = list(
"TESLA_MOB_DAMAGE" = TESLA_MOB_DAMAGE,
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index e2705ad49f..2391d39b3a 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -37,6 +37,7 @@ GLOBAL_LIST_EMPTY(deco_wings_list)
GLOBAL_LIST_EMPTY(r_wings_list)
GLOBAL_LIST_EMPTY(insect_wings_list)
GLOBAL_LIST_EMPTY(insect_fluffs_list)
+GLOBAL_LIST_EMPTY(insect_markings_list)
GLOBAL_LIST_EMPTY(caps_list)
GLOBAL_LIST_INIT(ghost_forms_with_directions_list, list("ghost")) //stores the ghost forms that support directional sprites
diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm
index 49bdd3f3c0..93c3b63d1e 100644
--- a/code/_onclick/hud/ai.dm
+++ b/code/_onclick/hud/ai.dm
@@ -195,89 +195,107 @@
// Language menu
using = new /obj/screen/language_menu
using.screen_loc = ui_borg_language_menu
+ using.hud = src
static_inventory += using
//AI core
using = new /obj/screen/ai/aicore()
using.screen_loc = ui_ai_core
+ using.hud = src
static_inventory += using
//Camera list
using = new /obj/screen/ai/camera_list()
using.screen_loc = ui_ai_camera_list
+ using.hud = src
static_inventory += using
//Track
using = new /obj/screen/ai/camera_track()
using.screen_loc = ui_ai_track_with_camera
+ using.hud = src
static_inventory += using
//Camera light
using = new /obj/screen/ai/camera_light()
using.screen_loc = ui_ai_camera_light
+ using.hud = src
static_inventory += using
//Crew Monitoring
using = new /obj/screen/ai/crew_monitor()
using.screen_loc = ui_ai_crew_monitor
+ using.hud = src
static_inventory += using
//Crew Manifest
using = new /obj/screen/ai/crew_manifest()
using.screen_loc = ui_ai_crew_manifest
+ using.hud = src
static_inventory += using
//Alerts
using = new /obj/screen/ai/alerts()
using.screen_loc = ui_ai_alerts
+ using.hud = src
static_inventory += using
//Announcement
using = new /obj/screen/ai/announcement()
using.screen_loc = ui_ai_announcement
+ using.hud = src
static_inventory += using
//Shuttle
using = new /obj/screen/ai/call_shuttle()
using.screen_loc = ui_ai_shuttle
+ using.hud = src
static_inventory += using
//Laws
using = new /obj/screen/ai/state_laws()
using.screen_loc = ui_ai_state_laws
+ using.hud = src
static_inventory += using
//PDA message
using = new /obj/screen/ai/pda_msg_send()
using.screen_loc = ui_ai_pda_send
+ using.hud = src
static_inventory += using
//PDA log
using = new /obj/screen/ai/pda_msg_show()
using.screen_loc = ui_ai_pda_log
+ using.hud = src
static_inventory += using
//Take image
using = new /obj/screen/ai/image_take()
using.screen_loc = ui_ai_take_picture
+ using.hud = src
static_inventory += using
//View images
using = new /obj/screen/ai/image_view()
using.screen_loc = ui_ai_view_images
+ using.hud = src
static_inventory += using
//Medical/Security sensors
using = new /obj/screen/ai/sensors()
using.screen_loc = ui_ai_sensor
+ using.hud = src
static_inventory += using
//Multicamera mode
using = new /obj/screen/ai/multicam()
using.screen_loc = ui_ai_multicam
+ using.hud = src
static_inventory += using
//Add multicamera camera
using = new /obj/screen/ai/add_multicam()
using.screen_loc = ui_ai_add_multicam
+ using.hud = src
static_inventory += using
diff --git a/code/_onclick/hud/alien.dm b/code/_onclick/hud/alien.dm
index 1f6ba28391..94585cbd52 100644
--- a/code/_onclick/hud/alien.dm
+++ b/code/_onclick/hud/alien.dm
@@ -43,18 +43,20 @@
using.icon = ui_style
using.icon_state = "swap_1"
using.screen_loc = ui_swaphand_position(owner,1)
+ using.hud = src
static_inventory += using
using = new /obj/screen/swap_hand()
using.icon = ui_style
using.icon_state = "swap_2"
using.screen_loc = ui_swaphand_position(owner,2)
+ using.hud = src
static_inventory += using
- using = new /obj/screen/act_intent/alien()
- using.icon_state = mymob.a_intent
- static_inventory += using
- action_intent = using
+ action_intent = new /obj/screen/act_intent/alien()
+ action_intent.icon_state = mymob.a_intent
+ action_intent.hud = src
+ static_inventory += action_intent
if(isalienhunter(mymob))
var/mob/living/carbon/alien/humanoid/hunter/H = mymob
@@ -64,43 +66,52 @@
using = new/obj/screen/language_menu
using.screen_loc = ui_alien_language_menu
+ using.hud = src
static_inventory += using
using = new /obj/screen/drop()
using.icon = ui_style
using.screen_loc = ui_drop_throw
+ using.hud = src
static_inventory += using
using = new /obj/screen/resist()
using.icon = ui_style
using.screen_loc = ui_pull_resist
+ using.hud = src
hotkeybuttons += using
throw_icon = new /obj/screen/throw_catch()
throw_icon.icon = ui_style
throw_icon.screen_loc = ui_drop_throw
+ throw_icon.hud = src
hotkeybuttons += throw_icon
pull_icon = new /obj/screen/pull()
pull_icon.icon = ui_style
- pull_icon.update_icon(mymob)
+ pull_icon.hud = src
+ pull_icon.update_icon()
pull_icon.screen_loc = ui_pull_resist
static_inventory += pull_icon
//begin indicators
healths = new /obj/screen/healths/alien()
+ healths.hud = src
infodisplay += healths
alien_plasma_display = new /obj/screen/alien/plasma_display()
+ alien_plasma_display.hud = src
infodisplay += alien_plasma_display
if(!isalienqueen(mymob))
alien_queen_finder = new /obj/screen/alien/alien_queen_finder
+ alien_queen_finder.hud = src
infodisplay += alien_queen_finder
zone_select = new /obj/screen/zone_sel/alien()
- zone_select.update_icon(mymob)
+ zone_select.hud = src
+ zone_select.update_icon()
static_inventory += zone_select
for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory))
diff --git a/code/_onclick/hud/alien_larva.dm b/code/_onclick/hud/alien_larva.dm
index 3ffdd66fcd..0f3c6ccf17 100644
--- a/code/_onclick/hud/alien_larva.dm
+++ b/code/_onclick/hud/alien_larva.dm
@@ -5,26 +5,32 @@
..()
var/obj/screen/using
- using = new /obj/screen/act_intent/alien()
- using.icon_state = mymob.a_intent
- static_inventory += using
- action_intent = using
+ action_intent = new /obj/screen/act_intent/alien()
+ action_intent.icon_state = mymob.a_intent
+ action_intent.hud = src
+ static_inventory += action_intent
healths = new /obj/screen/healths/alien()
+ healths.hud = src
infodisplay += healths
alien_queen_finder = new /obj/screen/alien/alien_queen_finder()
+ alien_queen_finder.hud = src
infodisplay += alien_queen_finder
+
pull_icon = new /obj/screen/pull()
pull_icon.icon = 'icons/mob/screen_alien.dmi'
- pull_icon.update_icon(mymob)
+ pull_icon.hud = src
+ pull_icon.update_icon()
pull_icon.screen_loc = ui_pull_resist
hotkeybuttons += pull_icon
using = new/obj/screen/language_menu
using.screen_loc = ui_alien_language_menu
+ using.hud = src
static_inventory += using
zone_select = new /obj/screen/zone_sel/alien()
- zone_select.update_icon(mymob)
+ zone_select.hud = src
+ zone_select.update_icon()
static_inventory += zone_select
diff --git a/code/_onclick/hud/blob_overmind.dm b/code/_onclick/hud/blob_overmind.dm
index ab8bc459ae..8257b744d6 100644
--- a/code/_onclick/hud/blob_overmind.dm
+++ b/code/_onclick/hud/blob_overmind.dm
@@ -133,17 +133,21 @@
blobpwrdisplay.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
blobpwrdisplay.layer = ABOVE_HUD_LAYER
blobpwrdisplay.plane = ABOVE_HUD_PLANE
+ blobpwrdisplay.hud = src
infodisplay += blobpwrdisplay
healths = new /obj/screen/healths/blob()
+ healths.hud = src
infodisplay += healths
using = new /obj/screen/blob/BlobHelp()
using.screen_loc = "WEST:6,NORTH:-3"
+ using.hud = src
static_inventory += using
using = new /obj/screen/blob/JumpToNode()
using.screen_loc = ui_inventory
+ using.hud = src
static_inventory += using
using = new /obj/screen/blob/JumpToCore()
@@ -153,18 +157,22 @@
using = new /obj/screen/blob/Blobbernaut()
using.screen_loc = ui_belt
+ using.hud = src
static_inventory += using
using = new /obj/screen/blob/ResourceBlob()
using.screen_loc = ui_back
+ using.hud = src
static_inventory += using
using = new /obj/screen/blob/NodeBlob()
using.screen_loc = ui_hand_position(2)
+ using.hud = src
static_inventory += using
using = new /obj/screen/blob/FactoryBlob()
using.screen_loc = ui_hand_position(1)
+ using.hud = src
static_inventory += using
using = new /obj/screen/blob/ReadaptChemical()
@@ -174,4 +182,5 @@
using = new /obj/screen/blob/RelocateCore()
using.screen_loc = ui_storage2
+ using.hud = src
static_inventory += using
diff --git a/code/_onclick/hud/blobbernauthud.dm b/code/_onclick/hud/blobbernauthud.dm
index 17d3b11a72..ed45d5b1f6 100644
--- a/code/_onclick/hud/blobbernauthud.dm
+++ b/code/_onclick/hud/blobbernauthud.dm
@@ -3,7 +3,9 @@
..()
blobpwrdisplay = new /obj/screen/healths/blob/naut/core()
+ blobpwrdisplay.hud = src
infodisplay += blobpwrdisplay
healths = new /obj/screen/healths/blob/naut()
+ healths.hud = src
infodisplay += healths
diff --git a/code/_onclick/hud/constructs.dm b/code/_onclick/hud/constructs.dm
index 182495c236..06e657d136 100644
--- a/code/_onclick/hud/constructs.dm
+++ b/code/_onclick/hud/constructs.dm
@@ -5,9 +5,11 @@
..()
pull_icon = new /obj/screen/pull()
pull_icon.icon = ui_style
- pull_icon.update_icon(mymob)
+ pull_icon.hud = src
+ pull_icon.update_icon()
pull_icon.screen_loc = ui_construct_pull
static_inventory += pull_icon
healths = new /obj/screen/healths/construct()
+ healths.hud = src
infodisplay += healths
diff --git a/code/_onclick/hud/devil.dm b/code/_onclick/hud/devil.dm
index 40fdc37da3..fd2146424c 100644
--- a/code/_onclick/hud/devil.dm
+++ b/code/_onclick/hud/devil.dm
@@ -9,11 +9,13 @@
using = new /obj/screen/drop()
using.icon = ui_style
using.screen_loc = ui_drone_drop
+ using.hud = src
static_inventory += using
pull_icon = new /obj/screen/pull()
pull_icon.icon = ui_style
- pull_icon.update_icon(mymob)
+ pull_icon.hud = src
+ pull_icon.update_icon()
pull_icon.screen_loc = ui_drone_pull
static_inventory += pull_icon
@@ -26,6 +28,7 @@
using.screen_loc = ui_swaphand_position(owner,1)
using.layer = HUD_LAYER
using.plane = HUD_PLANE
+ using.hud = src
static_inventory += using
using = new /obj/screen/inventory()
@@ -35,14 +38,19 @@
using.screen_loc = ui_swaphand_position(owner,2)
using.layer = HUD_LAYER
using.plane = HUD_PLANE
+ using.hud = src
static_inventory += using
zone_select = new /obj/screen/zone_sel()
zone_select.icon = ui_style
- zone_select.update_icon(mymob)
+ zone_select.hud = src
+ zone_select.update_icon()
lingchemdisplay = new /obj/screen/ling/chems()
+ lingchemdisplay.hud = src
+
devilsouldisplay = new /obj/screen/devil/soul_counter
+ devilsouldisplay.hud = src
infodisplay += devilsouldisplay
diff --git a/code/_onclick/hud/generic_dextrous.dm b/code/_onclick/hud/generic_dextrous.dm
index 131b510f9b..dba9a59748 100644
--- a/code/_onclick/hud/generic_dextrous.dm
+++ b/code/_onclick/hud/generic_dextrous.dm
@@ -6,11 +6,13 @@
using = new /obj/screen/drop()
using.icon = ui_style
using.screen_loc = ui_drone_drop
+ using.hud = src
static_inventory += using
pull_icon = new /obj/screen/pull()
pull_icon.icon = ui_style
- pull_icon.update_icon(mymob)
+ pull_icon.hud = src
+ pull_icon.update_icon()
pull_icon.screen_loc = ui_drone_pull
static_inventory += pull_icon
@@ -20,12 +22,14 @@
using.icon = ui_style
using.icon_state = "swap_1_m"
using.screen_loc = ui_swaphand_position(owner,1)
+ using.hud = src
static_inventory += using
using = new /obj/screen/swap_hand()
using.icon = ui_style
using.icon_state = "swap_2"
using.screen_loc = ui_swaphand_position(owner,2)
+ using.hud = src
static_inventory += using
if(mymob.possible_a_intents)
@@ -36,20 +40,24 @@
action_intent = new /obj/screen/act_intent
action_intent.icon = ui_style
action_intent.icon_state = mymob.a_intent
+ action_intent.hud = src
static_inventory += action_intent
zone_select = new /obj/screen/zone_sel()
zone_select.icon = ui_style
- zone_select.update_icon(mymob)
+ zone_select.hud = src
+ zone_select.update_icon()
static_inventory += zone_select
using = new /obj/screen/craft
using.icon = ui_style
+ using.hud = src
static_inventory += using
using = new /obj/screen/area_creator
using.icon = ui_style
+ using.hud = src
static_inventory += using
mymob.client.screen = list()
diff --git a/code/_onclick/hud/ghost.dm b/code/_onclick/hud/ghost.dm
index 2b70392b39..549b6346ce 100644
--- a/code/_onclick/hud/ghost.dm
+++ b/code/_onclick/hud/ghost.dm
@@ -50,26 +50,32 @@
using = new /obj/screen/ghost/jumptomob()
using.screen_loc = ui_ghost_jumptomob
+ using.hud = src
static_inventory += using
using = new /obj/screen/ghost/orbit()
using.screen_loc = ui_ghost_orbit
+ using.hud = src
static_inventory += using
using = new /obj/screen/ghost/reenter_corpse()
using.screen_loc = ui_ghost_reenter_corpse
+ using.hud = src
static_inventory += using
using = new /obj/screen/ghost/teleport()
using.screen_loc = ui_ghost_teleport
+ using.hud = src
static_inventory += using
using = new /obj/screen/ghost/pai()
using.screen_loc = ui_ghost_pai
+ using.hud = src
static_inventory += using
using = new /obj/screen/language_menu
using.icon = ui_style
+ using.hud = src
static_inventory += using
/datum/hud/ghost/show_hud(version = 0, mob/viewmob)
diff --git a/code/_onclick/hud/guardian.dm b/code/_onclick/hud/guardian.dm
index a66558950a..35b40ee5db 100644
--- a/code/_onclick/hud/guardian.dm
+++ b/code/_onclick/hud/guardian.dm
@@ -4,26 +4,32 @@
var/obj/screen/using
healths = new /obj/screen/healths/guardian()
+ healths.hud = src
infodisplay += healths
using = new /obj/screen/guardian/Manifest()
using.screen_loc = ui_hand_position(2)
+ using.hud = src
static_inventory += using
using = new /obj/screen/guardian/Recall()
using.screen_loc = ui_hand_position(1)
+ using.hud = src
static_inventory += using
using = new owner.toggle_button_type()
using.screen_loc = ui_storage1
+ using.hud = src
static_inventory += using
using = new /obj/screen/guardian/ToggleLight()
using.screen_loc = ui_inventory
+ using.hud = src
static_inventory += using
using = new /obj/screen/guardian/Communicate()
using.screen_loc = ui_back
+ using.hud = src
static_inventory += using
/datum/hud/dextrous/guardian/New(mob/living/simple_animal/hostile/guardian/owner) //for a dextrous guardian
diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
index 1d1836716b..09794444d1 100644
--- a/code/_onclick/hud/hud.dm
+++ b/code/_onclick/hud/hud.dm
@@ -61,6 +61,9 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
// subtypes can override this to force a specific UI style
var/ui_style
+ //Citadel stuff
+ var/obj/screen/arousal
+
/datum/hud/New(mob/owner)
mymob = owner
diff --git a/code/_onclick/hud/hud_cit.dm b/code/_onclick/hud/hud_cit.dm
deleted file mode 100644
index 18ecf2e929..0000000000
--- a/code/_onclick/hud/hud_cit.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-/datum/hud
- var/obj/screen/arousal
\ No newline at end of file
diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index 3b5f851333..78a2d2fd17 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -95,18 +95,21 @@
using.icon = ui_style
if(!widescreenlayout) // CIT CHANGE
using.screen_loc = ui_boxcraft // CIT CHANGE
+ using.hud = src
static_inventory += using
using = new/obj/screen/language_menu
using.icon = ui_style
if(!widescreenlayout) // CIT CHANGE
using.screen_loc = ui_boxlang // CIT CHANGE
+ using.hud = src
static_inventory += using
using = new /obj/screen/area_creator
using.icon = ui_style
if(!widescreenlayout) // CIT CHANGE
using.screen_loc = ui_boxarea // CIT CHANGE
+ using.hud = src
static_inventory += using
using = new /obj/screen/voretoggle() //We fancy Vore now
@@ -114,16 +117,19 @@
using.screen_loc = ui_voremode
if(!widescreenlayout)
using.screen_loc = ui_boxvore
+ using.hud = src
static_inventory += using
action_intent = new /obj/screen/act_intent/segmented
action_intent.icon_state = mymob.a_intent
+ action_intent.hud = src
static_inventory += action_intent
using = new /obj/screen/mov_intent
using.icon = tg_ui_icon_to_cit_ui(ui_style) // CIT CHANGE - overrides mov intent icon
using.icon_state = (mymob.m_intent == MOVE_INTENT_RUN ? "running" : "walking")
using.screen_loc = ui_movi
+ using.hud = src
static_inventory += using
//CITADEL CHANGES - sprint button
@@ -131,19 +137,21 @@
using.icon = tg_ui_icon_to_cit_ui(ui_style)
using.icon_state = (owner.sprinting ? "act_sprint_on" : "act_sprint")
using.screen_loc = ui_movi
+ using.hud = src
static_inventory += using
//END OF CITADEL CHANGES
//same as above but buffer.
- using = new /obj/screen/sprint_buffer
- using.screen_loc = ui_sprintbufferloc
- sprint_buffer = using
- static_inventory += using
+ sprint_buffer = new /obj/screen/sprint_buffer
+ sprint_buffer.screen_loc = ui_sprintbufferloc
+ sprint_buffer.hud = src
+ static_inventory += sprint_buffer
using = new /obj/screen/drop()
using.icon = ui_style
using.screen_loc = ui_drop_throw
+ using.hud = src
static_inventory += using
inv_box = new /obj/screen/inventory()
@@ -168,12 +176,14 @@
using.icon = ui_style
using.icon_state = "swap_1"
using.screen_loc = ui_swaphand_position(owner,1)
+ using.hud = src
static_inventory += using
using = new /obj/screen/swap_hand()
using.icon = ui_style
using.icon_state = "swap_2"
using.screen_loc = ui_swaphand_position(owner,2)
+ using.hud = src
static_inventory += using
inv_box = new /obj/screen/inventory()
@@ -235,28 +245,33 @@
using = new /obj/screen/resist()
using.icon = ui_style
using.screen_loc = ui_overridden_resist // CIT CHANGE - changes this to overridden resist
+ using.hud = src
hotkeybuttons += using
//CIT CHANGES - rest and combat mode buttons
using = new /obj/screen/restbutton()
using.icon = tg_ui_icon_to_cit_ui(ui_style)
using.screen_loc = ui_pull_resist
+ using.hud = src
static_inventory += using
using = new /obj/screen/combattoggle()
using.icon = tg_ui_icon_to_cit_ui(ui_style)
using.screen_loc = ui_combat_toggle
+ using.hud = src
static_inventory += using
//END OF CIT CHANGES
using = new /obj/screen/human/toggle()
using.icon = ui_style
using.screen_loc = ui_inventory
+ using.hud = src
static_inventory += using
using = new /obj/screen/human/equip()
using.icon = ui_style
using.screen_loc = ui_equip_position(mymob)
+ using.hud = src
static_inventory += using
inv_box = new /obj/screen/inventory()
@@ -311,54 +326,71 @@
throw_icon = new /obj/screen/throw_catch()
throw_icon.icon = ui_style
throw_icon.screen_loc = ui_drop_throw
+ throw_icon.hud = src
hotkeybuttons += throw_icon
internals = new /obj/screen/internals()
+ internals.hud = src
infodisplay += internals
healths = new /obj/screen/healths()
+ healths.hud = src
infodisplay += healths
//CIT CHANGE - adds arousal and stamina to hud
arousal = new /obj/screen/arousal()
arousal.icon_state = (owner.canbearoused == 1 ? "arousal0" : "")
+ arousal.hud = src
infodisplay += arousal
staminas = new /obj/screen/staminas()
+ staminas.hud = src
infodisplay += staminas
if(!CONFIG_GET(flag/disable_stambuffer))
staminabuffer = new /obj/screen/staminabuffer()
+ staminabuffer.hud = src
infodisplay += staminabuffer
//END OF CIT CHANGES
healthdoll = new /obj/screen/healthdoll()
+ healthdoll.hud = src
infodisplay += healthdoll
pull_icon = new /obj/screen/pull()
pull_icon.icon = ui_style
- pull_icon.update_icon(mymob)
+ pull_icon.hud = src
+ pull_icon.update_icon()
pull_icon.screen_loc = ui_pull_resist
static_inventory += pull_icon
lingchemdisplay = new /obj/screen/ling/chems()
+ lingchemdisplay.hud = src
infodisplay += lingchemdisplay
lingstingdisplay = new /obj/screen/ling/sting()
+ lingstingdisplay.hud = src
infodisplay += lingstingdisplay
devilsouldisplay = new /obj/screen/devil/soul_counter
+ devilsouldisplay.hud = src
infodisplay += devilsouldisplay
blood_display = new /obj/screen/bloodsucker/blood_counter // Blood Volume
+ blood_display.hud = src
infodisplay += blood_display
+
vamprank_display = new /obj/screen/bloodsucker/rank_counter // Vampire Rank
+ vamprank_display.hud = src
infodisplay += vamprank_display
+
sunlight_display = new /obj/screen/bloodsucker/sunlight_counter // Sunlight
+ sunlight_display.hud = src
infodisplay += sunlight_display
zone_select = new /obj/screen/zone_sel()
zone_select.icon = ui_style
- zone_select.update_icon(mymob)
+ zone_select.hud = src
+ zone_select.update_icon()
static_inventory += zone_select
for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory))
diff --git a/code/_onclick/hud/lavaland_elite.dm b/code/_onclick/hud/lavaland_elite.dm
index 277ea8b898..a36d9a0f36 100644
--- a/code/_onclick/hud/lavaland_elite.dm
+++ b/code/_onclick/hud/lavaland_elite.dm
@@ -6,9 +6,9 @@
pull_icon = new /obj/screen/pull()
pull_icon.icon = ui_style
+ pull_icon.hud = src
pull_icon.update_icon()
pull_icon.screen_loc = ui_living_pull
- pull_icon.hud = src
static_inventory += pull_icon
healths = new /obj/screen/healths/lavaland_elite()
diff --git a/code/_onclick/hud/monkey.dm b/code/_onclick/hud/monkey.dm
index bbf2cca9f9..3d3c3cf64a 100644
--- a/code/_onclick/hud/monkey.dm
+++ b/code/_onclick/hud/monkey.dm
@@ -7,21 +7,25 @@
action_intent.icon = ui_style
action_intent.icon_state = mymob.a_intent
action_intent.screen_loc = ui_acti
+ action_intent.hud = src
static_inventory += action_intent
using = new /obj/screen/mov_intent()
using.icon = ui_style
using.icon_state = (mymob.m_intent == MOVE_INTENT_RUN ? "running" : "walking")
using.screen_loc = ui_movi
+ using.hud = src
static_inventory += using
using = new/obj/screen/language_menu
using.icon = ui_style
+ using.hud = src
static_inventory += using
using = new /obj/screen/drop()
using.icon = ui_style
using.screen_loc = ui_drop_throw
+ using.hud = src
static_inventory += using
build_hand_slots()
@@ -30,12 +34,14 @@
using.icon = ui_style
using.icon_state = "swap_1_m" //extra wide!
using.screen_loc = ui_swaphand_position(owner,1)
+ using.hud = src
static_inventory += using
using = new /obj/screen/swap_hand()
using.icon = ui_style
using.icon_state = "swap_2"
using.screen_loc = ui_swaphand_position(owner,2)
+ using.hud = src
static_inventory += using
inv_box = new /obj/screen/inventory()
@@ -76,30 +82,37 @@
throw_icon = new /obj/screen/throw_catch()
throw_icon.icon = ui_style
throw_icon.screen_loc = ui_drop_throw
+ throw_icon.hud = src
hotkeybuttons += throw_icon
internals = new /obj/screen/internals()
+ internals.hud = src
infodisplay += internals
healths = new /obj/screen/healths()
+ healths.hud = src
infodisplay += healths
pull_icon = new /obj/screen/pull()
pull_icon.icon = ui_style
- pull_icon.update_icon(mymob)
pull_icon.screen_loc = ui_pull_resist
+ pull_icon.hud = src
+ pull_icon.update_icon()
static_inventory += pull_icon
lingchemdisplay = new /obj/screen/ling/chems()
+ lingchemdisplay.hud = src
infodisplay += lingchemdisplay
lingstingdisplay = new /obj/screen/ling/sting()
+ lingstingdisplay.hud = src
infodisplay += lingstingdisplay
zone_select = new /obj/screen/zone_sel()
zone_select.icon = ui_style
- zone_select.update_icon(mymob)
+ zone_select.hud = src
+ zone_select.update_icon()
static_inventory += zone_select
mymob.client.screen = list()
@@ -107,6 +120,7 @@
using = new /obj/screen/resist()
using.icon = ui_style
using.screen_loc = ui_pull_resist
+ using.hud = src
hotkeybuttons += using
for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory))
diff --git a/code/_onclick/hud/revenanthud.dm b/code/_onclick/hud/revenanthud.dm
index bc8a2bde7d..9369313941 100644
--- a/code/_onclick/hud/revenanthud.dm
+++ b/code/_onclick/hud/revenanthud.dm
@@ -3,4 +3,5 @@
..()
healths = new /obj/screen/healths/revenant()
+ healths.hud = src
infodisplay += healths
diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm
index 11517d79b8..00c89644b6 100644
--- a/code/_onclick/hud/robot.dm
+++ b/code/_onclick/hud/robot.dm
@@ -118,26 +118,31 @@
using = new/obj/screen/robot/language_menu
using.screen_loc = ui_borg_language_menu
+ using.hud = src
static_inventory += using
//Radio
using = new /obj/screen/robot/radio()
using.screen_loc = ui_borg_radio
+ using.hud = src
static_inventory += using
//Module select
using = new /obj/screen/robot/module1()
using.screen_loc = ui_inv1
+ using.hud = src
static_inventory += using
mymobR.inv1 = using
using = new /obj/screen/robot/module2()
using.screen_loc = ui_inv2
+ using.hud = src
static_inventory += using
mymobR.inv2 = using
using = new /obj/screen/robot/module3()
using.screen_loc = ui_inv3
+ using.hud = src
static_inventory += using
mymobR.inv3 = using
@@ -146,36 +151,43 @@
//Photography stuff
using = new /obj/screen/ai/image_take()
using.screen_loc = ui_borg_camera
+ using.hud = src
static_inventory += using
using = new /obj/screen/ai/image_view()
using.screen_loc = ui_borg_album
+ using.hud = src
static_inventory += using
//Sec/Med HUDs
using = new /obj/screen/robot/sensors()
using.screen_loc = ui_borg_sensor
+ using.hud = src
static_inventory += using
//Headlamp control
using = new /obj/screen/robot/lamp()
using.screen_loc = ui_borg_lamp
+ using.hud = src
static_inventory += using
mymobR.lamp_button = using
//Thrusters
using = new /obj/screen/robot/thrusters()
using.screen_loc = ui_borg_thrusters
+ using.hud = src
static_inventory += using
mymobR.thruster_button = using
//Intent
action_intent = new /obj/screen/act_intent/robot()
action_intent.icon_state = mymob.a_intent
+ action_intent.hud = src
static_inventory += action_intent
//Health
healths = new /obj/screen/healths/robot()
+ healths.hud = src
infodisplay += healths
//Installed Module
@@ -185,17 +197,20 @@
//Store
module_store_icon = new /obj/screen/robot/store()
+ module_store_icon.hud = src
module_store_icon.screen_loc = ui_borg_store
pull_icon = new /obj/screen/pull()
pull_icon.icon = 'icons/mob/screen_cyborg.dmi'
- pull_icon.update_icon(mymob)
+ pull_icon.hud = src
+ pull_icon.update_icon()
pull_icon.screen_loc = ui_borg_pull
hotkeybuttons += pull_icon
zone_select = new /obj/screen/zone_sel/robot()
- zone_select.update_icon(mymob)
+ zone_select.hud = src
+ zone_select.update_icon()
static_inventory += zone_select
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 86b4b0c024..dec743d35c 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -110,21 +110,21 @@
// At this point in client Click() code we have passed the 1/10 sec check and little else
// We don't even know if it's a middle click
if(world.time <= usr.next_move)
- return 1
+ return TRUE
if(usr.incapacitated())
- return 1
+ return TRUE
if(ismecha(usr.loc)) // stops inventory actions in a mech
- return 1
+ return TRUE
- if(hud && hud.mymob && slot_id)
+ if(hud?.mymob && slot_id)
var/obj/item/inv_item = hud.mymob.get_item_by_slot(slot_id)
if(inv_item)
return inv_item.Click(location, control, params)
if(usr.attack_ui(slot_id))
usr.update_inv_hands()
- return 1
+ return TRUE
/obj/screen/inventory/MouseEntered()
..()
@@ -135,35 +135,37 @@
cut_overlay(object_overlays)
object_overlays.Cut()
-/obj/screen/inventory/update_icon()
+/obj/screen/inventory/update_icon_state()
if(!icon_empty)
icon_empty = icon_state
- if(hud && hud.mymob && slot_id && icon_full)
+ if(hud?.mymob && slot_id && icon_full)
if(hud.mymob.get_item_by_slot(slot_id))
icon_state = icon_full
else
icon_state = icon_empty
/obj/screen/inventory/proc/add_overlays()
- var/mob/user = hud.mymob
+ var/mob/user = hud?.mymob
- if(hud && user && slot_id)
- var/obj/item/holding = user.get_active_held_item()
+ if(!user || !slot_id)
+ return
- if(!holding || user.get_item_by_slot(slot_id))
- return
+ var/obj/item/holding = user.get_active_held_item()
- var/image/item_overlay = image(holding)
- item_overlay.alpha = 92
+ if(!holding || user.get_item_by_slot(slot_id))
+ return
- if(!user.can_equip(holding, slot_id, TRUE))
- item_overlay.color = "#FF0000"
- else
- item_overlay.color = "#00ff00"
+ var/image/item_overlay = image(holding)
+ item_overlay.alpha = 92
- object_overlays += item_overlay
- add_overlay(object_overlays)
+ if(!user.can_equip(holding, slot_id, TRUE))
+ item_overlay.color = "#FF0000"
+ else
+ item_overlay.color = "#00ff00"
+
+ object_overlays += item_overlay
+ add_overlay(object_overlays)
/obj/screen/inventory/hand
var/mutable_appearance/handcuff_overlay
@@ -171,45 +173,50 @@
var/held_index = 0
/obj/screen/inventory/hand/update_icon()
- ..()
+ . = ..()
if(!handcuff_overlay)
var/state = (!(held_index % 2)) ? "markus" : "gabrielle"
handcuff_overlay = mutable_appearance('icons/mob/screen_gen.dmi', state)
- cut_overlays()
+ cut_overlay(list(handcuff_overlay, blocked_overlay, "hand_active"))
- if(hud && hud.mymob)
- if(iscarbon(hud.mymob))
- var/mob/living/carbon/C = hud.mymob
- if(C.handcuffed)
- add_overlay(handcuff_overlay)
+ if(!hud?.mymob)
+ return
- if(held_index)
- if(!C.has_hand_for_held_index(held_index))
- add_overlay(blocked_overlay)
+ if(iscarbon(hud.mymob))
+ var/mob/living/carbon/C = hud.mymob
+ if(C.handcuffed)
+ add_overlay(handcuff_overlay)
- if(held_index == hud.mymob.active_hand_index)
- add_overlay("hand_active")
+ if(held_index)
+ if(!C.has_hand_for_held_index(held_index))
+ add_overlay(blocked_overlay)
+
+ if(held_index == hud.mymob.active_hand_index)
+ add_overlay("hand_active")
/obj/screen/inventory/hand/Click(location, control, params)
// At this point in client Click() code we have passed the 1/10 sec check and little else
// We don't even know if it's a middle click
- if(world.time <= usr.next_move)
- return 1
- if(usr.incapacitated() || isobserver(usr))
- return 1
- if (ismecha(usr.loc)) // stops inventory actions in a mech
- return 1
+ var/mob/user = hud?.mymob
+ if(usr != user)
+ return TRUE
+ if(world.time <= user.next_move)
+ return TRUE
+ if(user.incapacitated())
+ return TRUE
+ if (ismecha(user.loc)) // stops inventory actions in a mech
+ return TRUE
- if(hud.mymob.active_hand_index == held_index)
- var/obj/item/I = hud.mymob.get_active_held_item()
+ if(user.active_hand_index == held_index)
+ var/obj/item/I = user.get_active_held_item()
if(I)
I.Click(location, control, params)
else
- hud.mymob.swap_hand(held_index)
- return 1
+ user.swap_hand(held_index)
+ return TRUE
/obj/screen/close
name = "close"
@@ -343,12 +350,8 @@
/obj/screen/mov_intent/Click()
toggle(usr)
-/obj/screen/mov_intent/update_icon(mob/user)
- if(!user && hud)
- user = hud.mymob
- if(!user)
- return
- switch(user.m_intent)
+/obj/screen/mov_intent/update_icon_state()
+ switch(hud?.mymob?.m_intent)
if(MOVE_INTENT_WALK)
icon_state = "walking"
if(MOVE_INTENT_RUN)
@@ -369,10 +372,8 @@
return
usr.stop_pulling()
-/obj/screen/pull/update_icon(mob/mymob)
- if(!mymob)
- return
- if(mymob.pulling)
+/obj/screen/pull/update_icon_state()
+ if(hud?.mymob?.pulling)
icon_state = "pull"
else
icon_state = "pull0"
@@ -401,11 +402,11 @@
var/mob/living/L = usr
L.lay_down()
-/obj/screen/rest/update_icon(mob/mymob)
- if(!isliving(mymob))
+/obj/screen/rest/update_icon_state()
+ var/mob/living/user = hud?.mymob
+ if(!istype(user))
return
- var/mob/living/L = mymob
- if(!L.resting)
+ if(!user.resting)
icon_state = "act_rest"
else
icon_state = "act_rest0"
@@ -448,7 +449,7 @@
name = "damage zone"
icon_state = "zone_sel"
screen_loc = ui_zonesel
- var/selecting = BODY_ZONE_CHEST
+ var/overlay_icon = 'icons/mob/screen_gen.dmi'
var/static/list/hover_overlays_cache = list()
var/hovering
@@ -541,26 +542,24 @@
return BODY_ZONE_HEAD
/obj/screen/zone_sel/proc/set_selected_zone(choice, mob/user)
- if(isobserver(user))
+ if(user != hud?.mymob)
return
- if(choice != selecting)
- selecting = choice
- update_icon(usr)
- return 1
+ if(choice != hud.mymob.zone_selected)
+ hud.mymob.zone_selected = choice
+ update_icon()
-/obj/screen/zone_sel/update_icon(mob/user)
- cut_overlays()
- add_overlay(mutable_appearance('icons/mob/screen_gen.dmi', "[selecting]"))
- user.zone_selected = selecting
+ return TRUE
+
+/obj/screen/zone_sel/update_overlays()
+ . = ..()
+ if(!hud?.mymob)
+ return
+ . += mutable_appearance(overlay_icon, "[hud.mymob.zone_selected]")
/obj/screen/zone_sel/alien
icon = 'icons/mob/screen_alien.dmi'
-
-/obj/screen/zone_sel/alien/update_icon(mob/user)
- cut_overlays()
- add_overlay(mutable_appearance('icons/mob/screen_alien.dmi', "[selecting]"))
- user.zone_selected = selecting
+ overlay_icon = 'icons/mob/screen_alien.dmi'
/obj/screen/zone_sel/robot
icon = 'icons/mob/screen_cyborg.dmi'
diff --git a/code/_onclick/hud/swarmer.dm b/code/_onclick/hud/swarmer.dm
index 6cf4c73e44..80cc01c3b3 100644
--- a/code/_onclick/hud/swarmer.dm
+++ b/code/_onclick/hud/swarmer.dm
@@ -69,24 +69,30 @@
using = new /obj/screen/swarmer/FabricateTrap()
using.screen_loc = ui_hand_position(2)
+ using.hud = src
static_inventory += using
using = new /obj/screen/swarmer/Barricade()
using.screen_loc = ui_hand_position(1)
+ using.hud = src
static_inventory += using
using = new /obj/screen/swarmer/Replicate()
using.screen_loc = ui_zonesel
+ using.hud = src
static_inventory += using
using = new /obj/screen/swarmer/RepairSelf()
using.screen_loc = ui_storage1
+ using.hud = src
static_inventory += using
using = new /obj/screen/swarmer/ToggleLight()
using.screen_loc = ui_back
+ using.hud = src
static_inventory += using
using = new /obj/screen/swarmer/ContactSwarmers()
using.screen_loc = ui_inventory
+ using.hud = src
static_inventory += using
diff --git a/code/datums/martial.dm b/code/datums/martial.dm
index 32850c69df..c8caa853c3 100644
--- a/code/datums/martial.dm
+++ b/code/datums/martial.dm
@@ -8,6 +8,8 @@
var/deflection_chance = 0 //Chance to deflect projectiles
var/reroute_deflection = FALSE //Delete the bullet, or actually deflect it in some direction?
var/block_chance = 0 //Chance to block melee attacks using items while on throw mode.
+ var/dodge_chance = 0
+ var/restraining = 0 //used in cqc's disarm_act to check if the disarmed is being restrained and so whether they should be put in a chokehold or not
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
diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm
index 09a493a670..4ec16ac18c 100644
--- a/code/datums/martial/cqc.dm
+++ b/code/datums/martial/cqc.dm
@@ -10,7 +10,6 @@
help_verb = /mob/living/carbon/human/proc/CQC_help
block_chance = 75
var/old_grab_state = null
- var/restraining = FALSE
/datum/martial_art/cqc/reset_streak(mob/living/carbon/human/new_target)
. = ..()
diff --git a/code/datums/martial/rising_bass.dm b/code/datums/martial/rising_bass.dm
new file mode 100644
index 0000000000..a3b71c6784
--- /dev/null
+++ b/code/datums/martial/rising_bass.dm
@@ -0,0 +1,156 @@
+#define SIDE_KICK_COMBO "DH"
+#define SHOULDER_FLIP_COMBO "GHDGHH"
+#define REPULSE_PUNCH_COMBO "GHGH"
+#define FOOT_SMASH_COMBO "HH"
+#define DEFT_SWITCH_COMBO "GDD"
+
+/datum/martial_art/the_rising_bass
+ name = "The Rising Bass"
+ id = MARTIALART_RISINGBASS
+ dodge_chance = 100
+ allow_temp_override = FALSE
+ help_verb = /mob/living/carbon/human/proc/rising_bass_help
+
+/datum/martial_art/the_rising_bass/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D)
+ if(findtext(streak,SIDE_KICK_COMBO))
+ streak = ""
+ sideKick(A,D)
+ return 1
+ if(findtext(streak,SHOULDER_FLIP_COMBO))
+ streak = ""
+ shoulderFlip(A,D)
+ return 1
+ if(findtext(streak,REPULSE_PUNCH_COMBO))
+ streak = ""
+ repulsePunch(A,D)
+ return 1
+ if(findtext(streak,FOOT_SMASH_COMBO))
+ streak = ""
+ footSmash(A,D)
+ return 1
+ if(findtext(streak,DEFT_SWITCH_COMBO))
+ streak = ""
+ deftSwitch(A,D)
+ return 1
+ return 0
+
+
+/datum/martial_art/the_rising_bass/proc/sideKick(mob/living/carbon/human/A, mob/living/carbon/human/D)
+ if(!D.IsKnockdown() || D.lying == 0)
+ var/turf/H = get_step(D, A.dir & (NORTH | SOUTH) ? pick(EAST, WEST) : pick(NORTH, SOUTH))
+ A.do_attack_animation(D, ATTACK_EFFECT_KICK)
+ D.visible_message("[A] kicks [D] in the side, sliding them over!", \
+ "[A] kicks you in the side, forcing you to step away!")
+ playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+ D.apply_damage(5, BRUTE, BODY_ZONE_CHEST)
+ D.Knockdown(60)
+ var/L = H
+ for(var/obj/i in H.contents)
+ if(!istype(i,/mob) && i.density == 1)
+ L = D.loc
+ D.forceMove(L)
+ log_combat(A, D, "side kicked (Rising Bass)")
+ return 1
+ return basic_hit(A,D)
+
+/datum/martial_art/the_rising_bass/proc/shoulderFlip(mob/living/carbon/human/A, mob/living/carbon/human/D)
+ if(!D.IsKnockdown() || !D.lying)
+ var/turf/H = get_step(A, get_dir(D,A))
+ var/L = H
+ for(var/obj/i in H.contents)
+ if(!istype(i,/mob) && i.density == 1)//(i.anchored == 1 && i.density == 1) || istype(i,/obj/structure) || istype(i,/turf/closed)
+ L = A.loc
+ A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
+ D.visible_message("[A] flips [D] over their shoulder, slamming them into the ground!", \
+ "[A] flips you over their shoulder, slamming you into the ground!")
+ playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+ D.emote("scream")
+ D.apply_damage(10, BRUTE, BODY_ZONE_CHEST)
+ D.apply_damage(30, BRUTE, BODY_ZONE_HEAD)
+ D.Sleeping(60)
+ D.Knockdown(300)
+ D.forceMove(L)
+ log_combat(A, D, "shoulder flipped (Rising Bass)")
+ return 1
+ return basic_hit(A,D)
+
+/datum/martial_art/the_rising_bass/proc/repulsePunch(mob/living/carbon/human/A, mob/living/carbon/human/D)
+ if(!D.IsKnockdown() || !D.lying)
+ A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
+ D.visible_message("[A] smashes [D] in the chest, throwing them away!", \
+ "[A] smashes you in the chest, repelling you away!")
+ playsound(get_turf(A), 'sound/weapons/punch1.ogg', 50, 1, -1)
+ var/atom/F = get_edge_target_turf(D, get_dir(A, get_step_away(D, A)))
+ D.throw_at(F, 10, 1)
+ D.apply_damage(10, BRUTE, BODY_ZONE_CHEST)
+ D.Knockdown(90)
+ log_combat(A, D, "repulse punched (Rising Bass)")
+ return 1
+ return basic_hit(A,D)
+
+/datum/martial_art/the_rising_bass/proc/footSmash(mob/living/carbon/human/A, mob/living/carbon/human/D)
+ if(!D.IsKnockdown() || !D.lying)
+ A.do_attack_animation(D, ATTACK_EFFECT_KICK)
+ D.visible_message("[A] smashes their foot down on [D]'s foot!", \
+ "[A] smashes your foot!")
+ playsound(get_turf(A), 'sound/weapons/punch1.ogg', 50, 1, -1)
+ D.apply_damage(5, BRUTE, pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
+ D.dropItemToGround(D.get_active_held_item())
+ log_combat(A, D, "foot smashed (Rising Bass)")
+ return 1
+ return basic_hit(A,D)
+
+/datum/martial_art/the_rising_bass/proc/deftSwitch(mob/living/carbon/human/A, mob/living/carbon/human/D)
+ if(!D.IsKnockdown() || !D.lying)
+ if (D.get_active_held_item())
+ var/obj/item/G = D.get_active_held_item()
+ if (G && !(G.item_flags & (ABSTRACT|DROPDEL)) && D.temporarilyRemoveItemFromInventory(G))
+ A.put_in_hands(G)
+ D.visible_message("[A] slaps [D]'s hands, taking [G] from them!", \
+ "[A] slaps you, taking [G] from you!")
+ log_combat(A, D, "deft switched (Rising Bass)")
+ return 1
+ else
+ to_chat(A, "[G] can't be taken out of [D]'s hands!")
+ return 0
+
+/datum/martial_art/the_rising_bass/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
+ add_to_streak("D",D)
+ if(check_streak(A,D))
+ return 1
+ return ..()
+
+/datum/martial_art/the_rising_bass/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
+ add_to_streak("H",D)
+ if(check_streak(A,D))
+ return 1
+ return ..()
+
+/datum/martial_art/the_rising_bass/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
+ add_to_streak("G",D)
+ if(check_streak(A,D))
+ return 1
+ return ..()
+
+/mob/living/carbon/human/proc/rising_bass_help()
+ set name = "Recall Teachings"
+ set desc = "Remember the martial techniques of the Rising Bass clan."
+ set category = "Rising Bass"
+
+ to_chat(usr, "You retreat inward and recall the teachings of the Rising Bass...")
+
+ to_chat(usr, "Side Kick: Disarm Harm. Forces opponent to step to the side.")
+ to_chat(usr, "Shoulder Flip: Grab Harm Disarm Grab Harm Harm. Flips opponent over your shoulder and stuns.")
+ to_chat(usr, "Repulse Punch: Grab Harm Grab Harm. Slams the opponent far away from you.")
+ to_chat(usr, "Foot Smash: Harm Harm. Stuns opponent, minor damage.")
+ to_chat(usr, "Deft Switch: Grab Disarm Disarm. Switches the opponent's held item for your own. Most useful with nothing in your hand.")
+
+/datum/martial_art/the_rising_bass/teach(mob/living/carbon/human/H, make_temporary = FALSE)
+ . = ..()
+ if(!.)
+ return
+ ADD_TRAIT(H, TRAIT_NOGUNS, RISING_BASS_TRAIT)
+
+/datum/martial_art/the_rising_bass/on_remove(mob/living/carbon/human/H)
+ . = ..()
+ REMOVE_TRAIT(H, TRAIT_NOGUNS, RISING_BASS_TRAIT)
\ No newline at end of file
diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm
index bb652208ee..85f8a4a101 100644
--- a/code/datums/martial/sleeping_carp.dm
+++ b/code/datums/martial/sleeping_carp.dm
@@ -185,9 +185,8 @@
righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
block_chance = 50
-/obj/item/twohanded/bostaff/update_icon()
+/obj/item/twohanded/bostaff/update_icon_state()
icon_state = "bostaff[wielded]"
- return
/obj/item/twohanded/bostaff/attack(mob/target, mob/living/user)
add_fingerprint(user)
diff --git a/code/datums/radiation_wave.dm b/code/datums/radiation_wave.dm
index 8555e4cf3f..5dce5791c2 100644
--- a/code/datums/radiation_wave.dm
+++ b/code/datums/radiation_wave.dm
@@ -3,6 +3,7 @@
var/turf/master_turf //The center of the wave
var/steps=0 //How far we've moved
var/intensity //How strong it was originaly
+ var/remaining_contam //How much contaminated material it still has
var/range_modifier //Higher than 1 makes it drop off faster, 0.5 makes it drop off half etc
var/move_dir //The direction of movement
var/list/__dirs //The directions to the side of the wave, stored for easy looping
@@ -18,6 +19,7 @@
__dirs+=turn(dir, -90)
intensity = _intensity
+ remaining_contam = intensity
range_modifier = _range_modifier
can_contaminate = _can_contaminate
@@ -46,8 +48,9 @@
qdel(src)
return
- radiate(atoms, FLOOR(strength, 1))
-
+ if(radiate(atoms, FLOOR(min(strength,remaining_contam), 1)))
+ //oof ow ouch
+ remaining_contam = max(0,remaining_contam-((min(strength,remaining_contam)-RAD_MINIMUM_CONTAMINATION) * RAD_CONTAMINATION_STR_COEFFICIENT))
check_obstructions(atoms) // reduce our overall strength if there are radiation insulators
/datum/radiation_wave/proc/get_rad_atoms()
@@ -89,7 +92,8 @@
intensity *= (1-((1-thing.rad_insulation)/width))
/datum/radiation_wave/proc/radiate(list/atoms, strength)
- var/contamination_chance = (strength-RAD_MINIMUM_CONTAMINATION) * RAD_CONTAMINATION_CHANCE_COEFFICIENT * min(1, 1/(steps*range_modifier))
+ var/can_contam = strength >= RAD_MINIMUM_CONTAMINATION
+ var/list/contam_atoms = list()
for(var/k in 1 to atoms.len)
var/atom/thing = atoms[k]
if(!thing)
@@ -109,8 +113,14 @@
))
if(!can_contaminate || blacklisted[thing.type])
continue
- if(prob(contamination_chance)) // Only stronk rads get to have little baby rads
- if(CHECK_BITFIELD(thing.rad_flags, RAD_NO_CONTAMINATE) || SEND_SIGNAL(thing, COMSIG_ATOM_RAD_CONTAMINATING, strength) & COMPONENT_BLOCK_CONTAMINATION)
- continue
- var/rad_strength = (strength-RAD_MINIMUM_CONTAMINATION) * RAD_CONTAMINATION_STR_COEFFICIENT
+ if(CHECK_BITFIELD(thing.rad_flags, RAD_NO_CONTAMINATE) || SEND_SIGNAL(thing, COMSIG_ATOM_RAD_CONTAMINATING, strength) & COMPONENT_BLOCK_CONTAMINATION)
+ continue
+ contam_atoms += thing
+ var/did_contam = 0
+ if(can_contam)
+ var/rad_strength = ((strength-RAD_MINIMUM_CONTAMINATION) * RAD_CONTAMINATION_STR_COEFFICIENT)/contam_atoms.len
+ for(var/k in 1 to contam_atoms.len)
+ var/atom/thing = contam_atoms[k]
thing.AddComponent(/datum/component/radioactive, rad_strength, source)
+ did_contam = 1
+ return did_contam
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index f5e285a5c2..f65ea98cab 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -326,8 +326,13 @@ GLOBAL_LIST_EMPTY(teleportlocs)
F.update_fire_light(fire)
for(var/obj/machinery/light/L in src)
L.update()
-
-/area/proc/update_icon()
+/**
+ * Update the icon state of the area
+ *
+ * Im not sure what the heck this does, somethign to do with weather being able to set icon
+ * states on areas?? where the heck would that even display?
+ */
+/area/update_icon_state()
var/weather_icon
for(var/V in SSweather.processing)
var/datum/weather/W = V
@@ -337,7 +342,10 @@ GLOBAL_LIST_EMPTY(teleportlocs)
if(!weather_icon)
icon_state = null
-/area/space/update_icon()
+/**
+ * Update the icon of the area (overridden to always be null for space
+ */
+/area/space/update_icon_state()
icon_state = null
/*
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 7de5707032..66570205e3 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -24,6 +24,8 @@
var/list/add_overlays // a very temporary list of overlays to add
var/list/managed_vis_overlays //vis overlays managed by SSvis_overlays to automaticaly turn them like other overlays
+ ///overlays managed by update_overlays() to prevent removing overlays that weren't added by the same proc
+ var/list/managed_overlays
var/datum/proximity_monitor/proximity_monitor
var/buckle_message_cooldown = 0
@@ -310,6 +312,32 @@
SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .)
+/// Updates the icon of the atom
+/atom/proc/update_icon()
+ // I expect we're going to need more return flags and options in this proc
+ var/signalOut = SEND_SIGNAL(src, COMSIG_ATOM_UPDATE_ICON)
+
+ if(!(signalOut & COMSIG_ATOM_NO_UPDATE_ICON_STATE))
+ update_icon_state()
+
+ if(!(signalOut & COMSIG_ATOM_NO_UPDATE_OVERLAYS))
+ var/list/new_overlays = update_overlays()
+ if(managed_overlays)
+ cut_overlay(managed_overlays)
+ managed_overlays = null
+ if(length(new_overlays))
+ managed_overlays = new_overlays
+ add_overlay(new_overlays)
+
+/// Updates the icon state of the atom
+/atom/proc/update_icon_state()
+
+/// Updates the overlays of the atom
+/atom/proc/update_overlays()
+ SHOULD_CALL_PARENT(1)
+ . = list()
+ SEND_SIGNAL(src, COMSIG_ATOM_UPDATE_OVERLAYS, .)
+
/atom/proc/relaymove(mob/user)
if(buckle_message_cooldown <= world.time)
buckle_message_cooldown = world.time + 50
diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm
index 075184046d..0890d81dfb 100644
--- a/code/game/gamemodes/dynamic/dynamic.dm
+++ b/code/game/gamemodes/dynamic/dynamic.dm
@@ -741,7 +741,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
if (M.mind && (M.mind.special_role || M.mind.antag_datums?.len > 0))
current_players[CURRENT_LIVING_ANTAGS].Add(M)
else
- if (istype(M,/mob/dead/observer))
+ if (isobserver(M))
var/mob/dead/observer/O = M
if (O.started_as_observer) // Observers
current_players[CURRENT_OBSERVERS].Add(M)
diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm
index 968cbe7254..24c9e32969 100644
--- a/code/game/machinery/buttons.dm
+++ b/code/game/machinery/buttons.dm
@@ -38,21 +38,22 @@
board.one_access = 1
board.accesses = req_one_access
-
-/obj/machinery/button/update_icon()
- cut_overlays()
+/obj/machinery/button/update_icon_state()
if(panel_open)
icon_state = "button-open"
- if(device)
- add_overlay("button-device")
- if(board)
- add_overlay("button-board")
-
+ else if(stat & (NOPOWER|BROKEN))
+ icon_state = "[skin]-p"
else
- if(stat & (NOPOWER|BROKEN))
- icon_state = "[skin]-p"
- else
- icon_state = skin
+ icon_state = skin
+
+/obj/machinery/button/update_overlays()
+ . = ..()
+ if(!panel_open)
+ return
+ if(device)
+ . += "button-device"
+ if(board)
+ . += "button-board"
/obj/machinery/button/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/screwdriver))
@@ -168,7 +169,7 @@
if(device)
device.pulsed()
- addtimer(CALLBACK(src, .proc/update_icon), 15)
+ addtimer(CALLBACK(src, /atom/.proc/update_icon), 15)
/obj/machinery/button/power_change()
..()
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 17136d3c4f..bef5effb54 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -292,7 +292,7 @@
new /obj/item/stack/cable_coil(loc, 2)
qdel(src)
-/obj/machinery/camera/update_icon()
+/obj/machinery/camera/update_icon_state()
if(!status)
icon_state = "[initial(icon_state)]1"
else if (stat & EMPED)
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 8d950f8458..b561224668 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -67,7 +67,9 @@
/obj/item/clothing/shoes/kindleKicks = ARCADE_WEIGHT_RARE,
/obj/item/storage/belt/military/snack = ARCADE_WEIGHT_RARE,
- /obj/item/clothing/mask/fakemoustache/italian = ARCADE_WEIGHT_RARE
+ /obj/item/clothing/mask/fakemoustache/italian = ARCADE_WEIGHT_RARE,
+ /obj/item/clothing/suit/hooded/wintercoat/ratvar/fake = ARCADE_WEIGHT_TRICK,
+ /obj/item/clothing/suit/hooded/wintercoat/narsie/fake = ARCADE_WEIGHT_TRICK
)
light_color = LIGHT_COLOR_GREEN
diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm
index 40ccc61b2b..f3be6ac214 100644
--- a/code/game/machinery/defibrillator_mount.dm
+++ b/code/game/machinery/defibrillator_mount.dm
@@ -38,17 +38,21 @@
defib.cell.give(180) //90% efficiency, slightly better than the cell charger's 87.5%
update_icon()
-/obj/machinery/defibrillator_mount/update_icon()
- cut_overlays()
- if(defib)
- add_overlay("defib")
- if(defib.powered)
- add_overlay(defib.safety ? "online" : "emagged")
- var/ratio = defib.cell.charge / defib.cell.maxcharge
- ratio = CEILING(ratio * 4, 1) * 25
- add_overlay("charge[ratio]")
- if(clamps_locked)
- add_overlay("clamps")
+/obj/machinery/defibrillator_mount/update_overlays()
+ . = ..()
+ if(!defib)
+ return
+
+ . += "defib"
+
+ if(defib.powered)
+ . += (defib.safety ? "online" : "emagged")
+ var/ratio = defib.cell.charge / defib.cell.maxcharge
+ ratio = CEILING(ratio * 4, 1) * 25
+ . += "charge[ratio]"
+
+ if(clamps_locked)
+ . += "clamps"
/obj/machinery/defibrillator_mount/get_cell()
if(defib)
diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index 702347c220..07d58c1754 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -47,8 +47,7 @@
/obj/item/defibrillator/update_icon()
update_power()
- update_overlays()
- update_charge()
+ return ..()
/obj/item/defibrillator/proc/update_power()
if(!QDELETED(cell))
@@ -59,23 +58,20 @@
else
powered = FALSE
-/obj/item/defibrillator/proc/update_overlays()
- cut_overlays()
+/obj/item/defibrillator/update_overlays()
+ . = ..()
if(!on)
- add_overlay("[initial(icon_state)]-paddles")
+ . += "[initial(icon_state)]-paddles"
if(powered)
- add_overlay("[initial(icon_state)]-powered")
- if(!cell)
- add_overlay("[initial(icon_state)]-nocell")
- if(!safety)
- add_overlay("[initial(icon_state)]-emagged")
-
-/obj/item/defibrillator/proc/update_charge()
- if(powered) //so it doesn't show charge if it's unpowered
+ . += "[initial(icon_state)]-powered"
if(!QDELETED(cell))
var/ratio = cell.charge / cell.maxcharge
ratio = CEILING(ratio*4, 1) * 25
add_overlay("[initial(icon_state)]-charge[ratio]")
+ if(!cell)
+ . += "[initial(icon_state)]-nocell"
+ if(!safety)
+ . += "[initial(icon_state)]-emagged"
/obj/item/defibrillator/CheckParts(list/parts_list)
..()
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index 4d91fee9aa..cc009b5fc2 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -44,11 +44,6 @@
icon_state = "eng_cypherkey"
channels = list(RADIO_CHANNEL_ENGINEERING = 1)
-/obj/item/encryptionkey/headset_rob
- name = "robotics radio encryption key"
- icon_state = "rob_cypherkey"
- channels = list(RADIO_CHANNEL_SCIENCE = 1, RADIO_CHANNEL_ENGINEERING = 1)
-
/obj/item/encryptionkey/headset_med
name = "medical radio encryption key"
icon_state = "med_cypherkey"
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 1d0f94de71..42d9ec0269 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -123,12 +123,6 @@ GLOBAL_LIST_INIT(channel_tokens, list(
icon_state = "eng_headset"
keyslot = new /obj/item/encryptionkey/headset_eng
-/obj/item/radio/headset/headset_rob
- name = "robotics radio headset"
- desc = "Made specifically for the roboticists, who cannot decide between departments."
- icon_state = "rob_headset"
- keyslot = new /obj/item/encryptionkey/headset_rob
-
/obj/item/radio/headset/headset_med
name = "medical radio headset"
desc = "A headset for the trained staff of the medbay."
@@ -230,6 +224,14 @@ GLOBAL_LIST_INIT(channel_tokens, list(
icon_state = "srv_headset"
keyslot = new /obj/item/encryptionkey/headset_service
+/obj/item/radio/headset/headset_clown
+ name = "clown's headset"
+ desc = "A headset for the clown. Finally. A megaphone you can't take away."
+ icon_state = "srv_headset"
+ keyslot = new /obj/item/encryptionkey/headset_service
+ command = TRUE
+ commandspan = SPAN_CLOWN
+
/obj/item/radio/headset/headset_cent
name = "\improper CentCom headset"
desc = "A headset used by the upper echelons of Nanotrasen."
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 7823e6bf87..22012a114f 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -29,6 +29,7 @@
var/freqlock = FALSE // Frequency lock to stop the user from untuning specialist radios.
var/use_command = FALSE // If true, broadcasts will be large and BOLD.
var/command = FALSE // If true, use_command can be toggled at will.
+ var/commandspan = SPAN_COMMAND //allow us to set what the fuck we want for headsets
// Encryption key handling
var/obj/item/encryptionkey/keyslot
@@ -206,7 +207,7 @@
return
if(use_command)
- spans |= SPAN_COMMAND
+ spans |= commandspan
/*
Roughly speaking, radios attempt to make a subspace transmission (which
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index fca7f9bc6d..a8d57fab69 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -224,7 +224,7 @@
merge_gases()
for(var/i in 1 to 6)
- addtimer(CALLBACK(src, .proc/update_icon), 20 + (i - 1) * 10)
+ addtimer(CALLBACK(src, /atom/.proc/update_icon), 20 + (i - 1) * 10)
else if(valve_open && tank_one && tank_two)
split_gases()
diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm
index 62a7742628..70cd503ef4 100644
--- a/code/game/objects/items/granters.dm
+++ b/code/game/objects/items/granters.dm
@@ -414,6 +414,23 @@
name = "empty scroll"
icon_state = "blankscroll"
+/obj/item/book/granter/martial/bass
+ martial = /datum/martial_art/the_rising_bass
+ name = "shifting scroll"
+ martialname = "rising bass"
+ desc = "A paper scroll that seems to move even as you read it, the letters never seem to stay still."
+ greet = "You have learned the ancient martial art of the Rising Bass. Your skill at running away has increased quite a bit. Use the combos to get away from opponents quickly. Along with this, you now dodge all projectiles and catch anything thrown at you."
+ icon = 'icons/obj/wizard.dmi'
+ icon_state = "scroll2"
+ remarks = list("The trick is to disarm them...","Running away helps in many situations...","Never stay still...","Fighting won't help unless you're forced to...", "Crush their limbs to incapacitate them...", "Stay as far away as possible...")
+
+/obj/item/book/granter/martial/bass/onlearned(mob/living/carbon/user)
+ ..()
+ if(oneuse == TRUE)
+ desc = "It's completely blank."
+ name = "empty scroll"
+ icon_state = "blankscroll"
+
/obj/item/book/granter/martial/plasma_fist
martial = /datum/martial_art/plasma_fist
name = "frayed scroll"
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index 223c8e9cf6..817465a16c 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -390,4 +390,10 @@
new /obj/item/seeds/random(src)
if(prob(50))
- new /obj/item/seeds/random(src) //oops, an additional packet might have slipped its way into the box
\ No newline at end of file
+ new /obj/item/seeds/random(src) //oops, an additional packet might have slipped its way into the box
+
+/obj/item/storage/box/syndie_kit/revolver
+
+/obj/item/storage/box/syndie_kit/revolver/PopulateContents()
+ new /obj/item/gun/ballistic/revolver(src)
+ new /obj/item/ammo_box/a357(src)
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 51386c791c..f5dfa690db 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -173,9 +173,6 @@
/obj/proc/container_resist(mob/living/user)
return
-/obj/proc/update_icon()
- return
-
/mob/proc/unset_machine()
if(machine)
machine.on_unset_machine(src)
diff --git a/code/game/objects/structures/divine.dm b/code/game/objects/structures/divine.dm
index b8137d831b..e7a0ac2d04 100644
--- a/code/game/objects/structures/divine.dm
+++ b/code/game/objects/structures/divine.dm
@@ -41,7 +41,7 @@
to_chat(user, "The water feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards.")
user.reagents.add_reagent("godblood",20)
update_icon()
- addtimer(CALLBACK(src, .proc/update_icon), time_between_uses)
+ addtimer(CALLBACK(src, /atom/.proc/update_icon), time_between_uses)
/obj/structure/healingfountain/update_icon()
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index 07a66505e7..271ae72d47 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -73,7 +73,7 @@
else if(glass)
user.visible_message("[user] welds the glass panel out of the airlock assembly.", "You start to weld the glass panel out of the airlock assembly...")
- if(W.use_tool(src, user, 40, volume=50))
+ if(W.use_tool(src, user, 40, volume=50) && glass)
to_chat(user, "You weld the glass panel out.")
if(heat_proof_finished)
new /obj/item/stack/sheet/rglass(get_turf(src))
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index 688006a6e3..fdc85475fb 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -595,3 +595,48 @@
/obj/effect/mob_spawn/human/pirate/gunner
rank = "Gunner"
+
+/obj/effect/mob_spawn/human/ghostcafe
+ name = "ghost cafe sleeper"
+ uses = -1
+ icon = 'icons/obj/machines/sleeper.dmi'
+ icon_state = "sleeper"
+ mob_name = "a ghost cafe visitor"
+ roundstart = FALSE
+ anchored = TRUE
+ density = FALSE
+ death = FALSE
+ assignedrole = "Ghost Cafe Visitor"
+ flavour_text = "Is this what life after death is like?"
+ skip_reentry_check = TRUE
+ banType = "ghostcafe"
+
+/obj/effect/mob_spawn/human/ghostcafe/special(mob/living/carbon/human/new_spawn)
+ if(new_spawn.client)
+ new_spawn.client.prefs.copy_to(new_spawn)
+ var/datum/outfit/O = new /datum/outfit/ghostcafe()
+ O.equip(new_spawn, FALSE, new_spawn.client)
+ SSjob.equip_loadout(null, new_spawn, FALSE)
+ SSquirks.AssignQuirks(new_spawn, new_spawn.client, TRUE, TRUE, null, FALSE, new_spawn)
+
+/datum/outfit/ghostcafe
+ name = "ID, jumpsuit and shoes"
+ uniform = /obj/item/clothing/under/color/random
+ shoes = /obj/item/clothing/shoes/sneakers/black
+ id = /obj/item/card/id
+
+
+/datum/outfit/ghostcafe/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
+ ..()
+ var/suited = !preference_source || preference_source.prefs.jumpsuit_style == PREF_SUIT
+ if (CONFIG_GET(flag/grey_assistants))
+ if(suited)
+ uniform = /obj/item/clothing/under/color/grey
+ else
+ uniform = /obj/item/clothing/under/skirt/color/grey
+ else
+ if(suited)
+ uniform = /obj/item/clothing/under/color/random
+ else
+ uniform = /obj/item/clothing/under/skirt/color/random
+
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index 194014b61a..d14a4c7385 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -103,9 +103,9 @@
/turf/open/floor/blob_act(obj/structure/blob/B)
return
-/turf/open/floor/proc/update_icon()
+/turf/open/floor/update_icon()
+ . = ..()
update_visuals()
- return 1
/turf/open/floor/attack_paw(mob/user)
return attack_hand(user)
diff --git a/code/game/turfs/simulated/wall/reinf_walls.dm b/code/game/turfs/simulated/wall/reinf_walls.dm
index b4e84648c2..8eab4c34fe 100644
--- a/code/game/turfs/simulated/wall/reinf_walls.dm
+++ b/code/game/turfs/simulated/wall/reinf_walls.dm
@@ -202,15 +202,20 @@
return 1
return 0
-/turf/closed/wall/r_wall/proc/update_icon()
+/turf/closed/wall/r_wall/update_icon()
+ . = ..()
if(d_state != INTACT)
smooth = SMOOTH_FALSE
clear_smooth_overlays()
- icon_state = "r_wall-[d_state]"
else
smooth = SMOOTH_TRUE
queue_smooth_neighbors(src)
queue_smooth(src)
+
+/turf/closed/wall/r_wall/update_icon_state()
+ if(d_state != INTACT)
+ icon_state = "r_wall-[d_state]"
+ else
icon_state = "r_wall"
/turf/closed/wall/r_wall/singularity_pull(S, current_size)
diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm
index f0f0667c37..db5fc8a1f8 100644
--- a/code/game/turfs/space/transit.dm
+++ b/code/game/turfs/space/transit.dm
@@ -103,10 +103,13 @@
for(var/atom/movable/AM in src)
throw_atom(AM)
-/turf/open/space/transit/proc/update_icon()
- icon_state = "speedspace_ns_[get_transit_state(src)]"
+/turf/open/space/transit/update_icon()
+ . = ..()
transform = turn(matrix(), get_transit_angle(src))
+/turf/open/space/transit/update_icon_state()
+ icon_state = "speedspace_ns_[get_transit_state(src)]"
+
/proc/get_transit_state(turf/T)
var/p = 9
. = 1
diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_integration.dm b/code/modules/antagonists/bloodsucker/bloodsucker_integration.dm
index bf4ae4b6b5..3a6b4efedb 100644
--- a/code/modules/antagonists/bloodsucker/bloodsucker_integration.dm
+++ b/code/modules/antagonists/bloodsucker/bloodsucker_integration.dm
@@ -128,7 +128,7 @@
/mob/living/carbon/human/ShowAsPaleExamine()
// Check for albino, as per human/examine.dm's check.
- if(skin_tone == "albino")
+ if(dna.species.use_skintones && skin_tone == "albino")
return TRUE
return ..() // Return vamp check
diff --git a/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm b/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm
index bd986bac25..05f11294de 100644
--- a/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm
+++ b/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm
@@ -345,3 +345,8 @@
if(!power_amount)
power_amount = -(CLOCKCULT_POWER_UNIT*0.02)
return ..()
+
+
+// Winter coat
+/obj/item/clothing/suit/hooded/wintercoat/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) //four sheets of metal
+ return list("operation_time" = 30, "new_obj_type" = /obj/item/clothing/suit/hooded/wintercoat/ratvar, "power_cost" = POWER_METAL * 4, "spawn_dir" = SOUTH)
diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
index a833aa8a94..794010d9c0 100644
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ b/code/modules/antagonists/cult/blood_magic.dm
@@ -585,6 +585,12 @@
new /obj/item/stack/sheet/runed_metal(T,quantity)
to_chat(user, "A dark cloud emanates from you hand and swirls around the plasteel, transforming it into runed metal!")
SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25))
+ if(istype(target, /obj/item/clothing/suit/hooded/wintercoat) && target.type != /obj/item/clothing/suit/hooded/wintercoat/narsie)
+ if (do_after(user,30,target=target))
+ new /obj/item/clothing/suit/hooded/wintercoat/narsie(T)
+ qdel(target)
+ to_chat(user, "A dark cloud emanates from you hand and swirls around [target], transforming it into a narsian winter coat!")
+ SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25))
else if(istype(target,/mob/living/silicon/robot))
var/mob/living/silicon/robot/candidate = target
if(candidate.mmi)
diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm
index 6b87278e00..2ac3b34f60 100644
--- a/code/modules/assembly/flash.dm
+++ b/code/modules/assembly/flash.dm
@@ -39,7 +39,7 @@
if(flash)
add_overlay(flashing_overlay)
attached_overlays += flashing_overlay
- addtimer(CALLBACK(src, .proc/update_icon), 5)
+ addtimer(CALLBACK(src, /atom/.proc/update_icon), 5)
if(holder)
holder.update_icon()
@@ -308,7 +308,7 @@
else if(flash)
icon_state = "flashshield_flash"
item_state = "flashshield_flash"
- addtimer(CALLBACK(src, .proc/update_icon), 5)
+ addtimer(CALLBACK(src, /atom/.proc/update_icon), 5)
if(holder)
holder.update_icon()
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index 0d5fa6bc8a..34886c5b27 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -29,6 +29,7 @@
var/show_flavour = TRUE
var/banType = "lavaland"
var/ghost_usable = TRUE
+ var/skip_reentry_check = FALSE //Skips the ghost role blacklist time for people who ghost/suicide/cryo
//ATTACK GHOST IGNORING PARENT RETURN VALUE
/obj/effect/mob_spawn/attack_ghost(mob/user, latejoinercalling)
@@ -44,7 +45,7 @@
return
if(isobserver(user))
var/mob/dead/observer/O = user
- if(!O.can_reenter_round())
+ if(!O.can_reenter_round() && !skip_reentry_check)
return FALSE
var/ghost_role = alert(latejoinercalling ? "Latejoin as [mob_name]? (This is a ghost role, and as such, it's very likely to be off-station.)" : "Become [mob_name]? (Warning, You can no longer be cloned!)",,"Yes","No")
if(ghost_role == "No" || !loc)
diff --git a/code/modules/cargo/gondolapod.dm b/code/modules/cargo/gondolapod.dm
index 7b78facf00..1b4ebd6c1a 100644
--- a/code/modules/cargo/gondolapod.dm
+++ b/code/modules/cargo/gondolapod.dm
@@ -29,7 +29,7 @@
name = linked_pod.name
. = ..()
-/mob/living/simple_animal/pet/gondola/gondolapod/proc/update_icon()
+/mob/living/simple_animal/pet/gondola/gondolapod/update_icon_state()
if(opened)
icon_state = "gondolapod_open"
else
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 284d442413..00cc01105d 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -103,6 +103,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
"legs" = "Plantigrade",
"insect_wings" = "Plain",
"insect_fluff" = "None",
+ "insect_markings" = "None",
"mcolor2" = "FFF",
"mcolor3" = "FFF",
"mam_body_markings" = "Plain",
@@ -620,6 +621,19 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "[features["taur"]]"
+ if("insect_markings" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Insect markings
"
+
+ dat += "[features["insect_markings"]]
"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ mutant_category = 0
+
mutant_category++
if(mutant_category >= MAX_MUTANT_ROWS)
dat += ""
@@ -1743,6 +1757,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(new_insect_fluff)
features["insect_fluff"] = new_insect_fluff
+ if("insect_markings")
+ var/new_insect_markings
+ new_insect_markings = input(user, "Choose your character's markings:", "Character Preference") as null|anything in GLOB.insect_markings_list
+ if(new_insect_markings)
+ features["insect_markings"] = new_insect_markings
+
if("s_tone")
var/new_s_tone = input(user, "Choose your character's skin-tone:", "Character Preference") as null|anything in GLOB.skin_tones
if(new_s_tone)
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index f7f49a66af..c88d246b96 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -366,9 +366,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["feature_lizard_legs"] >> features["legs"]
S["feature_human_tail"] >> features["tail_human"]
S["feature_human_ears"] >> features["ears"]
+ S["feature_deco_wings"] >> features["deco_wings"]
S["feature_insect_wings"] >> features["insect_wings"]
- S["feature_deco_wings"] >> features["deco_wings"]
S["feature_insect_fluff"] >> features["insect_fluff"]
+ S["feature_insect_markings"] >> features["insect_markings"]
//Custom names
for(var/custom_name_id in GLOB.preferences_custom_names)
@@ -503,9 +504,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
features["spines"] = sanitize_inlist(features["spines"], GLOB.spines_list)
features["body_markings"] = sanitize_inlist(features["body_markings"], GLOB.body_markings_list)
features["feature_lizard_legs"] = sanitize_inlist(features["legs"], GLOB.legs_list)
- features["insect_wings"] = sanitize_inlist(features["insect_wings"], GLOB.insect_wings_list)
features["deco_wings"] = sanitize_inlist(features["deco_wings"], GLOB.deco_wings_list, "None")
features["insect_fluff"] = sanitize_inlist(features["insect_fluff"], GLOB.insect_fluffs_list)
+ features["insect_markings"] = sanitize_inlist(features["insect_markings"], GLOB.insect_markings_list, "None")
+ features["insect_wings"] = sanitize_inlist(features["insect_wings"], GLOB.insect_wings_list)
joblessrole = sanitize_integer(joblessrole, 1, 3, initial(joblessrole))
//Validate job prefs
@@ -570,11 +572,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["feature_lizard_spines"] , features["spines"])
WRITE_FILE(S["feature_lizard_body_markings"] , features["body_markings"])
WRITE_FILE(S["feature_lizard_legs"] , features["legs"])
- WRITE_FILE(S["feature_insect_wings"] , features["insect_wings"])
WRITE_FILE(S["feature_deco_wings"] , features["deco_wings"])
+ WRITE_FILE(S["feature_insect_wings"] , features["insect_wings"])
WRITE_FILE(S["feature_insect_fluff"] , features["insect_fluff"])
+ WRITE_FILE(S["feature_insect_markings"] , features["insect_markings"])
WRITE_FILE(S["feature_meat"] , features["meat_type"])
+
//Custom names
for(var/custom_name_id in GLOB.preferences_custom_names)
var/savefile_slot_name = custom_name_id + "_name" //TODO remove this
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index dc9e46c4b4..60b8e1565e 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -22,7 +22,6 @@
var/cooldown = 0
var/obj/item/flashlight/F = null
var/can_flashlight = 0
- var/scan_reagents = 0 //Can the wearer see reagents while it's equipped?
var/blocks_shove_knockdown = FALSE //Whether wearing the clothing item blocks the ability for shove to knock down.
@@ -47,6 +46,17 @@
//Add a "exclude" string to do the opposite, making it only only species listed that can't wear it.
//You append this to clothing objects.
+ //Polychrome stuff:
+ var/hasprimary = FALSE //These vars allow you to choose which overlays a clothing has
+ var/hassecondary = FALSE
+ var/hastertiary = FALSE
+ var/primary_color = "#FFFFFF" //RGB in hexcode
+ var/secondary_color = "#FFFFFF"
+ var/tertiary_color = "#808080"
+
+ //No idea what this is but eh -tori
+ var/force_alternate_icon = FALSE
+
/obj/item/clothing/Initialize()
. = ..()
@@ -54,6 +64,8 @@
actions_types += /datum/action/item_action/toggle_voice_box
if(ispath(pocket_storage_component_path))
LoadComponent(pocket_storage_component_path)
+ if(hasprimary | hassecondary | hastertiary) //Checks if polychrome is enabled
+ update_icon() //Applies the overlays and default colors onto the clothes on spawn.
/obj/item/clothing/MouseDrop(atom/over_object)
. = ..()
@@ -138,6 +150,8 @@
how_cool_are_your_threads += "Adding or removing items from [src] makes no noise.\n"
how_cool_are_your_threads += ""
. += how_cool_are_your_threads.Join()
+ if(hasprimary | hassecondary | hastertiary) //Checks if polychrome is enabled
+ . += "Alt-click to recolor it."
/obj/item/clothing/obj_break(damage_flag)
if(!damaged_clothes)
@@ -260,8 +274,31 @@ BLIND // can't see anything
remove_accessory(user)
else
rolldown()
+ // Polychrome stuff:
+ if(hasprimary | hassecondary | hastertiary)
+ var/choice = input(user,"polychromic thread options", "Clothing Recolor") as null|anything in list("[hasprimary ? "Primary Color" : ""]", "[hassecondary ? "Secondary Color" : ""]", "[hastertiary ? "Tertiary Color" : ""]") //generates a list depending on the enabled overlays
+ switch(choice) //Lets the list's options actually lead to something
+ if("Primary Color")
+ var/primary_color_input = input(usr,"","Choose Primary Color",primary_color) as color|null //color input menu, the "|null" adds a cancel button to it.
+ if(primary_color_input) //Checks if the color selected is NULL, rejects it if it is NULL.
+ primary_color = sanitize_hexcolor(primary_color_input, desired_format=6, include_crunch=1) //formats the selected color properly
+ update_icon() //updates the item icon
+ user.regenerate_icons() //updates the worn icon. Probably a bad idea, but it works.
+ if("Secondary Color")
+ var/secondary_color_input = input(usr,"","Choose Secondary Color",secondary_color) as color|null
+ if(secondary_color_input)
+ secondary_color = sanitize_hexcolor(secondary_color_input, desired_format=6, include_crunch=1)
+ update_icon()
+ user.regenerate_icons()
+ if("Tertiary Color")
+ var/tertiary_color_input = input(usr,"","Choose Tertiary Color",tertiary_color) as color|null
+ if(tertiary_color_input)
+ tertiary_color = sanitize_hexcolor(tertiary_color_input, desired_format=6, include_crunch=1)
+ update_icon()
+ user.regenerate_icons()
return TRUE
+
/obj/item/clothing/under/verb/jumpsuit_adjust()
set name = "Adjust Jumpsuit Style"
set category = null
@@ -377,3 +414,18 @@ BLIND // can't see anything
return FALSE
return TRUE
+
+/obj/item/clothing/update_icon() // Polychrome stuff
+ ..()
+ if(hasprimary) //Checks if the overlay is enabled
+ var/mutable_appearance/primary_overlay = mutable_appearance(icon, "[item_color]-primary") //Automagically picks overlays
+ primary_overlay.color = primary_color //Colors the greyscaled overlay
+ add_overlay(primary_overlay) //Applies the coloured overlay onto the item sprite. but NOT the mob sprite.
+ if(hassecondary)
+ var/mutable_appearance/secondary_overlay = mutable_appearance(icon, "[item_color]-secondary")
+ secondary_overlay.color = secondary_color
+ add_overlay(secondary_overlay)
+ if(hastertiary)
+ var/mutable_appearance/tertiary_overlay = mutable_appearance(icon, "[item_color]-tertiary")
+ tertiary_overlay.color = tertiary_color
+ add_overlay(tertiary_overlay)
\ No newline at end of file
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index 206165a495..1a178158d8 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -99,7 +99,7 @@
desc = "A pair of snazzy goggles used to protect against chemical spills. Fitted with an analyzer for scanning items and reagents."
icon_state = "purple"
item_state = "glasses"
- scan_reagents = TRUE //You can see reagents while wearing science goggles
+ clothing_flags = SCAN_REAGENTS //You can see reagents while wearing science goggles
actions_types = list(/datum/action/item_action/toggle_research_scanner)
glass_colour_type = /datum/client_colour/glass_colour/purple
resistance_flags = ACID_PROOF
@@ -203,7 +203,7 @@
/obj/item/clothing/glasses/sunglasses/reagent
name = "beer goggles"
desc = "A pair of sunglasses outfitted with apparatus to scan reagents."
- scan_reagents = TRUE
+ clothing_flags = SCAN_REAGENTS
/obj/item/clothing/glasses/sunglasses/garb
name = "black gar glasses"
@@ -405,7 +405,7 @@
item_state = "godeye"
vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS
darkness_view = 8
- scan_reagents = TRUE
+ clothing_flags = SCAN_REAGENTS
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
resistance_flags = LAVA_PROOF | FIRE_PROOF
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 0d22b16388..9a5c919720 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -445,7 +445,7 @@
flash_protect = 0
armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 75)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
- scan_reagents = TRUE
+ clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS | SCAN_REAGENTS
/obj/item/clothing/suit/space/hardsuit/medical
icon_state = "hardsuit-medical"
@@ -467,7 +467,7 @@
max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 100, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 80)
var/obj/machinery/doppler_array/integrated/bomb_radar
- scan_reagents = TRUE
+ clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS | SCAN_REAGENTS
actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/toggle_research_scanner)
/obj/item/clothing/head/helmet/space/hardsuit/rd/Initialize()
@@ -638,7 +638,7 @@
armor = list("melee" = 20, "bullet" = 15, "laser" = 15, "energy" = 45, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
item_color = "ancient"
brightness_on = 16
- scan_reagents = TRUE
+ clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS | SCAN_REAGENTS
flash_protect = 5 //We will not be flash by bombs
tint = 1
var/obj/machinery/doppler_array/integrated/bomb_radar
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 6548b4e7fe..4e155cd341 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -742,6 +742,7 @@
name = "assistant's formal winter coat"
icon_state = "coataformal"
item_state = "coataformal"
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter,/obj/item/clothing/gloves/color/yellow)
hoodtype = /obj/item/clothing/head/hooded/winterhood/aformal
/obj/item/clothing/head/hooded/winterhood/aformal
@@ -762,7 +763,10 @@
name = "ratvarian winter coat"
icon_state = "coatratvar"
item_state = "coatratvar"
+ armor = list("melee" = 30, "bullet" = 45, "laser" = -10, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/clockwork/replica_fabricator, /obj/item/clockwork/integration_cog, /obj/item/clockwork/slab, /obj/item/clockwork/weapon/ratvarian_spear)
hoodtype = /obj/item/clothing/head/hooded/winterhood/ratvar
+ var/real = TRUE
/obj/item/clothing/head/hooded/winterhood/ratvar
icon_state = "winterhood_ratvar"
@@ -770,15 +774,59 @@
light_power = 1
light_color = "#B18B25" //clockwork slab background top color
+/obj/item/clothing/suit/hooded/wintercoat/ratvar/equipped(mob/living/user,slot)
+ ..()
+ if (slot != SLOT_WEAR_SUIT || !real)
+ return
+ if (is_servant_of_ratvar(user))
+ return
+ else
+ user.dropItemToGround(src)
+ to_chat(user,"\"Amusing that you think you are fit to wear this.\"")
+ to_chat(user,"Your skin burns where the coat touched your skin!")
+ user.adjustFireLoss(rand(10,16))
+
/obj/item/clothing/suit/hooded/wintercoat/narsie
name = "narsian winter coat"
icon_state = "coatnarsie"
item_state = "coatnarsie"
+ armor = list("melee" = 30, "bullet" = 20, "laser" = 30,"energy" = 10, "bomb" = 30, "bio" = 10, "rad" = 10, "fire" = 30, "acid" = 30)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/restraints/legcuffs/bola/cult,/obj/item/melee/cultblade,/obj/item/melee/cultblade/dagger,/obj/item/reagent_containers/glass/beaker/unholywater,/obj/item/cult_shift,/obj/item/flashlight/flare/culttorch,/obj/item/twohanded/cult_spear)
hoodtype = /obj/item/clothing/head/hooded/winterhood/narsie
+ var/real = TRUE
+
+/obj/item/clothing/suit/hooded/wintercoat/narsie/equipped(mob/living/user,slot)
+ ..()
+ if (slot != SLOT_WEAR_SUIT || !real)
+ return
+ if (iscultist(user))
+ return
+ else
+ user.dropItemToGround(src)
+ to_chat(user,"\"You are not fit to wear my follower's coat!\"")
+ to_chat(user,"Sharp spines jab you from within the coat!")
+ user.adjustBruteLoss(rand(10,16))
/obj/item/clothing/head/hooded/winterhood/narsie
icon_state = "winterhood_narsie"
+/obj/item/clothing/suit/hooded/wintercoat/ratvar/fake
+ name = "brass winter coat"
+ icon_state = "coatratvar"
+ item_state = "coatratvar"
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+ real = FALSE
+
+/obj/item/clothing/suit/hooded/wintercoat/narsie/fake
+ name = "runed winter coat"
+ icon_state = "coatnarsie"
+ item_state = "coatnarsie"
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+ real = FALSE
+
+
/obj/item/clothing/suit/spookyghost
name = "spooky ghost"
desc = "This is obviously just a bedsheet, but maybe try it on?"
diff --git a/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm b/code/modules/clothing/under/polychromic_clothes.dm
similarity index 86%
rename from modular_citadel/code/modules/clothing/under/polychromic_clothes.dm
rename to code/modules/clothing/under/polychromic_clothes.dm
index c0f7a5d639..9649d93eed 100644
--- a/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm
+++ b/code/modules/clothing/under/polychromic_clothes.dm
@@ -4,7 +4,7 @@
// Polychromic clothes simply consist of 4 sprites: A base, unrecoloured sprite, and up to 3 greyscaled sprites. //
// In order to add more polychromic clothes, simply create a base sprite, and up to 3 recolourable overlays for it, //
// and then name them as follows: [name], [name]-primary, [name]-secondary, [name]-tertiary. The sprites should //
-// ideally be in 'modular_citadel/icons/polyclothes/item/uniform.dmi' and 'modular_citadel/icons/polyclothes/mob/uniform.dmi' for the //
+// ideally be in 'icons/obj/clothing/uniform.dmi' and 'icons/mob/uniform.dmi' for the //
// worn sprites. After that, copy paste the code from any of the example clothes and //
// change the names around. [name] should go in BOTH icon_state and item_color. You can preset colors and disable //
// any overlays using the self-explainatory vars. //
@@ -15,8 +15,6 @@
/obj/item/clothing/under/polychromic //enables all three overlays to reduce copypasta and defines basic stuff
name = "polychromic suit"
desc = "For when you want to show off your horrible colour coordination skills."
- icon = 'modular_citadel/icons/polyclothes/item/uniform.dmi'
- alternate_worn_icon = 'modular_citadel/icons/polyclothes/mob/uniform.dmi'
icon_state = "polysuit"
item_color = "polysuit"
item_state = "sl_suit"
@@ -27,23 +25,22 @@
secondary_color = "#FFFFFF"
tertiary_color = "#808080"
can_adjust = FALSE
- mutantrace_variation = NO_MUTANTRACE_VARIATION // because I'm too lazy to port these to digi-compatible and to prove a point from /tg/ whining - Pooj
- suit_style = NORMAL_SUIT_STYLE
+ mutantrace_variation = NO_MUTANTRACE_VARIATION //Not all clothes are currently digi-compatible (only the shorts are as of time of writing)
-/obj/item/clothing/under/polychromic/worn_overlays(isinhands, icon_file) //this is where the main magic happens. Also mandates that ALL polychromic stuff MUST USE alternate_worn_icon
+/obj/item/clothing/under/polychromic/worn_overlays(isinhands, icon_file) //this is where the main magic happens.
. = ..()
if(hasprimary | hassecondary | hastertiary)
if(!isinhands) //prevents the worn sprites from showing up if you're just holding them
if(hasprimary) //checks if overlays are enabled
- var/mutable_appearance/primary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-primary") //automagical sprite selection
+ var/mutable_appearance/primary_worn = mutable_appearance(icon_file, "[item_color]-primary") //automagical sprite selection
primary_worn.color = primary_color //colors the overlay
. += primary_worn //adds the overlay onto the buffer list to draw on the mob sprite.
if(hassecondary)
- var/mutable_appearance/secondary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-secondary")
+ var/mutable_appearance/secondary_worn = mutable_appearance(icon_file, "[item_color]-secondary")
secondary_worn.color = secondary_color
. += secondary_worn
if(hastertiary)
- var/mutable_appearance/tertiary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-tertiary")
+ var/mutable_appearance/tertiary_worn = mutable_appearance(icon_file, "[item_color]-tertiary")
tertiary_worn.color = tertiary_color
. += tertiary_worn
@@ -89,6 +86,7 @@
secondary_color = "#808080"
tertiary_color = "#808080"
body_parts_covered = CHEST|GROIN|ARMS
+ mutantrace_variation = MUTANTRACE_VARIATION //to enable digitigrade wearing
/obj/item/clothing/under/polychromic/jumpsuit
name = "polychromic tri-tone jumpsuit"
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index 8724841643..239273e421 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -55,7 +55,7 @@
mix_filling_color(S)
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_overlays(S)
+ update_snack_overlays(S)
to_chat(user, "You add the [I.name] to the [name].")
update_name(S)
else
@@ -103,7 +103,7 @@
rgbcolor[4] = (customcolor[4]+ingcolor[4])/2
filling_color = rgb(rgbcolor[1], rgbcolor[2], rgbcolor[3], rgbcolor[4])
-/obj/item/reagent_containers/food/snacks/customizable/update_overlays(obj/item/reagent_containers/food/snacks/S)
+/obj/item/reagent_containers/food/snacks/customizable/update_snack_overlays(obj/item/reagent_containers/food/snacks/S)
var/mutable_appearance/filling = mutable_appearance(icon, "[initial(icon_state)]_filling")
if(S.filling_color == "#FFFFFF")
filling.color = pick("#FF0000","#0000FF","#008000","#FFFF00")
@@ -139,7 +139,7 @@
/obj/item/reagent_containers/food/snacks/customizable/initialize_slice(obj/item/reagent_containers/food/snacks/slice, reagents_per_slice)
..()
slice.filling_color = filling_color
- slice.update_overlays(src)
+ slice.update_snack_overlays(src)
/obj/item/reagent_containers/food/snacks/customizable/Destroy()
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index 30a0195555..97e8423e78 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -269,7 +269,7 @@ All foods are distributed among various categories. Use common sense.
trash = null
return
-/obj/item/reagent_containers/food/snacks/proc/update_overlays(obj/item/reagent_containers/food/snacks/S)
+/obj/item/reagent_containers/food/snacks/proc/update_snack_overlays(obj/item/reagent_containers/food/snacks/S)
cut_overlays()
var/mutable_appearance/filling = mutable_appearance(icon, "[initial(icon_state)]_filling")
if(S.filling_color == "#FFFFFF")
diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm
index 13200d0276..de5d577193 100644
--- a/code/modules/food_and_drinks/food/snacks_pastry.dm
+++ b/code/modules/food_and_drinks/food/snacks_pastry.dm
@@ -692,13 +692,13 @@
to_chat(user, "You add the [I] to the [name].")
P.name = initial(P.name)
contents += P
- update_overlays(P)
+ update_snack_overlays(P)
if (P.contents.len)
for(var/V in P.contents)
P = V
P.name = initial(P.name)
contents += P
- update_overlays(P)
+ update_snack_overlays(P)
P = I
clearlist(P.contents)
return
@@ -707,7 +707,7 @@
return O.attackby(I, user, params)
..()
-/obj/item/reagent_containers/food/snacks/pancakes/update_overlays(obj/item/reagent_containers/food/snacks/P)
+/obj/item/reagent_containers/food/snacks/pancakes/update_snack_overlays(obj/item/reagent_containers/food/snacks/P)
var/mutable_appearance/pancake = mutable_appearance(icon, "[P.item_state]_[rand(1,3)]")
pancake.pixel_x = rand(-1,1)
pancake.pixel_y = 3 * contents.len - 1
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index 3574f8a9c1..7b5b0586d1 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -111,11 +111,10 @@
/turf/open/floor/holofloor/carpet/Initialize()
. = ..()
- addtimer(CALLBACK(src, .proc/update_icon), 1)
+ addtimer(CALLBACK(src, /atom/.proc/update_icon), 1)
/turf/open/floor/holofloor/carpet/update_icon()
- if(!..())
- return 0
+ . = ..()
if(intact)
queue_smooth(src)
diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm
index beecb258a7..b7c9550bb9 100644
--- a/code/modules/hydroponics/grown/flowers.dm
+++ b/code/modules/hydroponics/grown/flowers.dm
@@ -148,7 +148,7 @@
icon_grow = "sunflower-grow"
icon_dead = "sunflower-dead"
mutatelist = list(/obj/item/seeds/sunflower/moonflower, /obj/item/seeds/sunflower/novaflower)
- reagents_add = list("cornoil" = 0.08, "nutriment" = 0.04)
+ reagents_add = list("cooking_oil" = 0.08, "nutriment" = 0.04)
/obj/item/grown/sunflower // FLOWER POWER!
seed = /obj/item/seeds/sunflower
@@ -316,4 +316,4 @@
filling_color = "#FF6347"
bitesize_mod = 8
tastes = list("wax" = 1)
- foodtype = SUGAR
\ No newline at end of file
+ foodtype = SUGAR
diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm
index 23d20cd27a..ca4280a2a1 100644
--- a/code/modules/jobs/jobs.dm
+++ b/code/modules/jobs/jobs.dm
@@ -71,7 +71,7 @@ GLOBAL_LIST_INIT(exp_jobsmap, list(
GLOBAL_LIST_INIT(exp_specialmap, list(
EXP_TYPE_LIVING = list(), // all living mobs
EXP_TYPE_ANTAG = list(),
- EXP_TYPE_SPECIAL = list("Lifebringer","Ash Walker","Exile","Servant Golem","Free Golem","Hermit","Translocated Vet","Escaped Prisoner","Hotel Staff","SuperFriend","Space Syndicate","Ancient Crew","Space Doctor","Space Bartender","Beach Bum","Skeleton","Zombie","Space Bar Patron","Lavaland Syndicate","Ghost Role"), // Ghost roles
+ EXP_TYPE_SPECIAL = list("Lifebringer","Ash Walker","Exile","Servant Golem","Free Golem","Hermit","Translocated Vet","Escaped Prisoner","Hotel Staff","SuperFriend","Space Syndicate","Ancient Crew","Space Doctor","Space Bartender","Beach Bum","Skeleton","Zombie","Space Bar Patron","Lavaland Syndicate","Ghost Role", "Ghost Cafe Visitor"), // Ghost roles
EXP_TYPE_GHOST = list() // dead people, observers
))
GLOBAL_PROTECT(exp_jobsmap)
diff --git a/code/modules/language/language_holder.dm b/code/modules/language/language_holder.dm
index c1a336eb69..00f63510b6 100644
--- a/code/modules/language/language_holder.dm
+++ b/code/modules/language/language_holder.dm
@@ -134,7 +134,7 @@
/datum/language_holder/synthetic
languages = list(/datum/language/common)
- shadow_languages = list(/datum/language/common, /datum/language/machine, /datum/language/draconic)
+ shadow_languages = list(/datum/language/common, /datum/language/machine, /datum/language/draconic, /datum/language/slime)
/datum/language_holder/empty
languages = list()
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index 356c4913b9..10b33cd473 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -67,11 +67,18 @@
new /obj/effect/particle_effect/smoke(get_turf(src))
qdel(src)
+//Non-default pods
+
/obj/item/survivalcapsule/luxury
name = "luxury bluespace shelter capsule"
desc = "An exorbitantly expensive luxury suite stored within a pocket of bluespace."
template_id = "shelter_beta"
+/obj/item/survivalcapsule/luxuryelite
+ name = "luxury elite bar capsule"
+ desc = "A luxury bar in a capsule. Bartender required and not included."
+ template_id = "shelter_charlie"
+
//Pod objects
//Window
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index a8e867cef0..e5cab4438a 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -54,6 +54,7 @@
new /datum/data/mining_equipment("Super Resonator", /obj/item/resonator/upgraded, 2500),
new /datum/data/mining_equipment("Jump Boots", /obj/item/clothing/shoes/bhop, 2500),
new /datum/data/mining_equipment("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3000),
+ new /datum/data/mining_equipment("Luxury Bar Capsule", /obj/item/survivalcapsule/luxuryelite, 10000),
new /datum/data/mining_equipment("Nanotrasen Minebot", /mob/living/simple_animal/hostile/mining_drone, 800),
new /datum/data/mining_equipment("Minebot Melee Upgrade", /obj/item/mine_bot_upgrade, 400),
new /datum/data/mining_equipment("Minebot Armor Upgrade", /obj/item/mine_bot_upgrade/health, 400),
diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters.dm
index a8b4eab8d2..3e0968eebb 100644
--- a/code/modules/mining/shelters.dm
+++ b/code/modules/mining/shelters.dm
@@ -58,3 +58,18 @@
. = ..()
whitelisted_turfs = typecacheof(/turf/closed/mineral)
banned_objects = typecacheof(/obj/structure/stone_tile)
+
+/datum/map_template/shelter/charlie
+ name = "Shelter Charlie"
+ shelter_id = "shelter_charlie"
+ description = "A luxury elite bar which holds an entire bar \
+ along with two vending machines, tables, and a restroom that \
+ also has a sink. This isn't a survival capsule and so you can \
+ expect that this won't save you if you're bleeding out to \
+ death."
+ mappath = "_maps/templates/shelter_3.dmm"
+
+/datum/map_template/shelter/charlie/New()
+ . = ..()
+ whitelisted_turfs = typecacheof(/turf/closed/mineral)
+ banned_objects = typecacheof(/obj/structure/stone_tile)
\ No newline at end of file
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm b/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm
index 156cc304a6..a5437aaf39 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm
@@ -275,6 +275,18 @@
name = "Snow"
icon_state = "snow"
+/datum/sprite_accessory/insect_fluff/oakworm
+ name = "Oak Worm"
+ icon_state = "oakworm"
+
+/datum/sprite_accessory/insect_fluff/jungle
+ name = "Jungle"
+ icon_state = "jungle"
+
+/datum/sprite_accessory/insect_fluff/witchwing
+ name = "Witch Wing"
+ icon_state = "witchwing"
+
/datum/sprite_accessory/insect_fluff/colored
name = "Colored (Hair)"
icon_state = "snow"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/wings.dm b/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
index 46a123c6bb..9c1eb6a3fa 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
@@ -213,4 +213,81 @@
/datum/sprite_accessory/insect_wings/whitefly
name = "White Fly"
- icon_state = "whitefly"
\ No newline at end of file
+ icon_state = "whitefly"
+
+/datum/sprite_accessory/insect_wings/oakworm
+ name = "Oak Worm"
+ icon_state = "oakworm"
+
+/datum/sprite_accessory/insect_wings/jungle
+ name = "Jungle"
+ icon_state = "jungle"
+
+/datum/sprite_accessory/insect_wings/witchwing
+ name = "Witch Wing"
+ icon_state = "witchwing"
+
+//insect markings
+/datum/sprite_accessory/insect_markings // Extra markings for insects ported from tg.
+ icon = 'icons/mob/insect_markings.dmi'
+ color_src = null
+
+/datum/sprite_accessory/insect_markings/none
+ name = "None"
+ icon_state = "none"
+
+/datum/sprite_accessory/insect_markings/reddish
+ name = "Reddish"
+ icon_state = "reddish"
+
+/datum/sprite_accessory/insect_markings/royal
+ name = "Royal"
+ icon_state = "royal"
+
+/datum/sprite_accessory/insect_markings/gothic
+ name = "Gothic"
+ icon_state = "gothic"
+
+/datum/sprite_accessory/insect_markings/whitefly
+ name = "White Fly"
+ icon_state = "whitefly"
+
+/datum/sprite_accessory/insect_markings/lovers
+ name = "Lovers"
+ icon_state = "lovers"
+
+/datum/sprite_accessory/insect_markings/punished
+ name = "Punished"
+ icon_state = "punished"
+
+/datum/sprite_accessory/insect_markings/firewatch
+ name = "Firewatch"
+ icon_state = "firewatch"
+
+/datum/sprite_accessory/insect_markings/deathhead
+ name = "Deathshead"
+ icon_state = "deathhead"
+
+/datum/sprite_accessory/insect_markings/poison
+ name = "Poison"
+ icon_state = "poison"
+
+/datum/sprite_accessory/insect_markings/ragged
+ name = "Ragged"
+ icon_state = "ragged"
+
+/datum/sprite_accessory/insect_markings/moonfly
+ name = "Moon Fly"
+ icon_state = "moonfly"
+
+/datum/sprite_accessory/insect_markings/oakworm
+ name = "Oak Worm"
+ icon_state = "oakworm"
+
+/datum/sprite_accessory/insect_markings/jungle
+ name = "Jungle"
+ icon_state = "jungle"
+
+/datum/sprite_accessory/insect_markings/witchwing
+ name = "Witch Wing"
+ icon_state = "witchwing"
\ No newline at end of file
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 5bdfd174b5..2b9b01dc18 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -178,7 +178,8 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
* Hair will always update its dir, so if your sprite has no dirs the haircut will go all over the place.
* |- Ricotez
*/
-/mob/dead/observer/proc/update_icon(new_form)
+/mob/dead/observer/update_icon(new_form)
+ . = ..()
if(client) //We update our preferences in case they changed right before update_icon was called.
ghost_accs = client.prefs.ghost_accs
ghost_others = client.prefs.ghost_others
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 6ecedba3be..52cf82a06a 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -977,3 +977,14 @@
if(combatmode)
toggle_combat_mode(TRUE, TRUE)
return ..()
+
+/mob/living/carbon/can_see_reagents()
+ . = ..()
+ if(.) //No need to run through all of this if it's already true.
+ return
+ if(isclothing(head))
+ var/obj/item/clothing/H = head
+ if(H.clothing_flags & SCAN_REAGENTS)
+ return TRUE
+ if(isclothing(wear_mask) && (wear_mask.clothing_flags & SCAN_REAGENTS))
+ return TRUE
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index f0d81e0a4d..06575aa802 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -50,6 +50,9 @@
/mob/living/carbon/proc/can_catch_item(skip_throw_mode_check)
. = FALSE
+ if(mind)
+ if(mind.martial_art && mind.martial_art.dodge_chance == 100)
+ return TRUE
if(!skip_throw_mode_check && !in_throw_mode)
return
if(get_active_held_item())
@@ -63,6 +66,13 @@
if(can_catch_item())
if(istype(AM, /obj/item))
var/obj/item/I = AM
+ if (mind)
+ if (mind.martial_art && mind.martial_art.dodge_chance == 100) //autocatch for rising bass
+ if (get_active_held_item())
+ visible_message("[I] falls to the ground as [src] chops it out of the air!")
+ return 1
+ if(!in_throw_mode)
+ throw_mode_on()
if(isturf(I.loc))
I.attack_hand(src)
if(get_active_held_item() == I) //if our attack_hand() picks up the item...
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 45211f7f44..0007233975 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -803,10 +803,8 @@
else
hud_used.healthdoll.icon_state = "healthdoll_DEAD"
- if(hud_used.staminas)
- hud_used.staminas.icon_state = staminahudamount()
- if(hud_used.staminabuffer)
- hud_used.staminabuffer.icon_state = staminabufferhudamount()
+ hud_used.staminas?.update_icon_state()
+ hud_used.staminabuffer?.update_icon_state()
/mob/living/carbon/human/fully_heal(admin_revive = 0)
if(admin_revive)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 042b4af4fe..93f33c3a3d 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -46,6 +46,12 @@
return spec_return
if(mind)
+ if (mind.martial_art && mind.martial_art.dodge_chance)
+ if(!lying && dna && !dna.check_mutation(HULK))
+ if(prob(mind.martial_art.dodge_chance))
+ var/dodgemessage = pick("dodges under the projectile!","dodges to the right of the projectile!","jumps over the projectile!")
+ visible_message("[src] [dodgemessage]", "You dodge the projectile!")
+ return -1
if(mind.martial_art && !incapacitated(FALSE, TRUE) && mind.martial_art.can_use(src) && mind.martial_art.deflection_chance) //Some martial arts users can deflect projectiles!
if(prob(mind.martial_art.deflection_chance))
if(!lying && dna && !dna.check_mutation(HULK)) //But only if they're not lying down, and hulks can't do it
@@ -145,7 +151,7 @@
skipcatch = TRUE
blocked = TRUE
else if(I)
- if(I.throw_speed >= EMBED_THROWSPEED_THRESHOLD)
+ if(I.throw_speed >= EMBED_THROWSPEED_THRESHOLD && !(mind.martial_art && mind.martial_art.dodge_chance == 100))
if(can_embed(I))
if(prob(I.embedding.embed_chance) && !HAS_TRAIT(src, TRAIT_PIERCEIMMUNE))
throw_alert("embeddedobject", /obj/screen/alert/embeddedobject)
@@ -158,7 +164,9 @@
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "embedded", /datum/mood_event/embedded)
hitpush = FALSE
skipcatch = TRUE //can't catch the now embedded item
-
+ if (mind)
+ if (mind.martial_art && mind.martial_art.dodge_chance == 100)
+ skipcatch = FALSE
return ..()
/mob/living/carbon/human/grabbedby(mob/living/carbon/user, supress_message = 0)
diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm
index 63d02af31a..e5e546fdf8 100644
--- a/code/modules/mob/living/carbon/human/human_helpers.dm
+++ b/code/modules/mob/living/carbon/human/human_helpers.dm
@@ -117,7 +117,8 @@
/mob/living/carbon/human/can_use_guns(obj/item/G)
. = ..()
-
+ if(!.)
+ return
if(G.trigger_guard == TRIGGER_GUARD_NORMAL)
if(HAS_TRAIT(src, TRAIT_CHUNKYFINGERS))
to_chat(src, "Your meaty finger is much too large for the trigger guard!")
@@ -126,7 +127,13 @@
to_chat(src, "Your fingers don't fit in the trigger guard!")
return FALSE
- return .
+/mob/living/carbon/human/can_see_reagents()
+ . = ..()
+ if(.) //No need to run through all of this if it's already true.
+ return
+ if(isclothing(glasses) && (glasses.clothing_flags & SCAN_REAGENTS))
+ return TRUE
+
/*
/mob/living/carbon/human/transfer_blood_dna(list/blood_dna)
..()
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 67d7cb585e..8bf6b4ad3a 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -781,6 +781,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
S = GLOB.insect_wings_list[H.dna.features["insect_wings"]]
if("insect_fluff")
S = GLOB.insect_fluffs_list[H.dna.features["insect_fluff"]]
+ if("insect_markings")
+ S = GLOB.insect_markings_list[H.dna.features["insect_markings"]]
if("caps")
S = GLOB.caps_list[H.dna.features["caps"]]
if("ipc_screen")
diff --git a/code/modules/mob/living/carbon/human/species_types/bugmen.dm b/code/modules/mob/living/carbon/human/species_types/bugmen.dm
index 02163eaaed..718599c550 100644
--- a/code/modules/mob/living/carbon/human/species_types/bugmen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/bugmen.dm
@@ -4,9 +4,9 @@
default_color = "00FF00"
species_traits = list(LIPS,EYECOLOR,HAIR,FACEHAIR,MUTCOLORS,HORNCOLOR,WINGCOLOR)
inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID, MOB_BUG)
- mutant_bodyparts = list("mam_ears", "mam_snout", "mam_tail", "taur", "insect_wings", "mam_snouts", "insect_fluff","horns")
+ mutant_bodyparts = list("mam_ears","mam_tail", "taur", "insect_wings","mam_snout", "mam_snouts", "insect_fluff","insect_markings")
default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None",
- "insect_wings" = "None", "insect_fluff" = "None", "mam_snouts" = "None", "taur" = "None","horns" = "None")
+ "insect_wings" = "None", "insect_fluff" = "None", "mam_snouts" = "None", "taur" = "None", "insect_markings" = "None")
attack_verb = "slash"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm
index dda8ddfebd..dfc718f1ab 100644
--- a/code/modules/mob/living/silicon/pai/pai_defense.dm
+++ b/code/modules/mob/living/silicon/pai/pai_defense.dm
@@ -63,7 +63,8 @@
emitterhealth = CLAMP((emitterhealth - amount), -50, emittermaxhealth)
if(emitterhealth < 0)
fold_in(force = TRUE)
- to_chat(src, "The impact degrades your holochassis!")
+ if(amount > 0)
+ to_chat(src, "The impact degrades your holochassis!")
return amount
/mob/living/silicon/pai/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE)
diff --git a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm
index f2ab3e56ed..03afecc66f 100644
--- a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm
+++ b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm
@@ -51,7 +51,7 @@
weapon.attack(C, src)
playsound(src, 'sound/weapons/blade1.ogg', 50, TRUE, -1)
if(C.stat == DEAD)
- addtimer(CALLBACK(src, .proc/update_icon), 2)
+ addtimer(CALLBACK(src, /atom/.proc/update_icon), 2)
back_to_idle()
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 7a653f4aa4..3397d9f4b6 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -840,7 +840,7 @@ Pass a positive integer as an argument to override a bot's default speed.
ejectpai(usr)
update_controls()
-/mob/living/simple_animal/bot/proc/update_icon()
+/mob/living/simple_animal/bot/update_icon_state()
icon_state = "[initial(icon_state)][on]"
// Machinery to simplify topic and access calls
diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm
index 724abea214..2de4ca39fd 100644
--- a/code/modules/mob/living/simple_animal/bot/honkbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm
@@ -50,7 +50,7 @@
/mob/living/simple_animal/bot/honkbot/proc/sensor_blink()
icon_state = "honkbot-c"
- addtimer(CALLBACK(src, .proc/update_icon), 5, TIMER_OVERRIDE|TIMER_UNIQUE)
+ addtimer(CALLBACK(src, /atom/.proc/update_icon), 5, TIMER_OVERRIDE|TIMER_UNIQUE)
//honkbots react with sounds.
/mob/living/simple_animal/bot/honkbot/proc/react_ping()
@@ -177,7 +177,7 @@ Maintenance panel panel is [open ? "opened" : "closed"]"},
playsound(src, "honkbot_e", 50, 0)
spam_flag = TRUE // prevent spam
icon_state = "honkbot-e"
- addtimer(CALLBACK(src, .proc/update_icon), 30, TIMER_OVERRIDE|TIMER_UNIQUE)
+ addtimer(CALLBACK(src, /atom/.proc/update_icon), 30, TIMER_OVERRIDE|TIMER_UNIQUE)
addtimer(CALLBACK(src, .proc/spam_flag_false), cooldowntimehorn)
/mob/living/simple_animal/bot/honkbot/proc/honk_attack(mob/living/carbon/C) // horn attack
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index c0a9a2082f..ee770fc2ca 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -250,7 +250,7 @@ Auto Patrol: []"},
var/judgement_criteria = judgement_criteria()
playsound(src, 'sound/weapons/egloves.ogg', 50, TRUE, -1)
icon_state = "secbot-c"
- addtimer(CALLBACK(src, .proc/update_icon), 2)
+ addtimer(CALLBACK(src, /atom/.proc/update_icon), 2)
var/threat = 5
if(ishuman(C))
C.stuttering = 5
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
index 463b29772c..28fb1f5a42 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
@@ -275,6 +275,15 @@
/mob/living/simple_animal/drone/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, tesla_shock = 0, illusion = 0, stun = TRUE)
return 0 //So they don't die trying to fix wiring
+/mob/living/simple_animal/drone/can_see_reagents()
+ . = ..()
+ if(.)
+ return
+ if(isclothing(head))
+ var/obj/item/clothing/H = head
+ if(H.clothing_flags & SCAN_REAGENTS)
+ return TRUE
+
/mob/living/simple_animal/drone/generate_mob_holder()
var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, "[visualAppearence]_hat", null, null, null, TRUE)
return holder
diff --git a/code/modules/mob/living/simple_animal/hostile/goose.dm b/code/modules/mob/living/simple_animal/hostile/goose.dm
index b67770fb4b..3bc8715c5c 100644
--- a/code/modules/mob/living/simple_animal/hostile/goose.dm
+++ b/code/modules/mob/living/simple_animal/hostile/goose.dm
@@ -9,7 +9,7 @@
mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
speak_chance = 0
turns_per_move = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 2)
+ butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index 397d40925b..7cfae9310a 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -594,12 +594,15 @@ Difficulty: Normal
var/list/hit_things = list() //we hit these already, ignore them
var/friendly_fire_check = FALSE
var/bursting = FALSE //if we're bursting and need to hit anyone crossing us
+ var/list/nohurt
-/obj/effect/temp_visual/hierophant/blast/Initialize(mapload, new_caster, friendly_fire, list/only_hit_once)
+/obj/effect/temp_visual/hierophant/blast/Initialize(mapload, new_caster, friendly_fire, list/only_hit_once, list/donthurt = null)
. = ..()
if(only_hit_once)
hit_things = only_hit_once
friendly_fire_check = friendly_fire
+ if(donthurt)
+ hit_things += donthurt
if(new_caster)
hit_things += new_caster
if(ismineralturf(loc)) //drill mineral turfs
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
index 04a1b4a468..0a8320788e 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
@@ -24,7 +24,8 @@
var/list/attack_action_types = list()
var/can_talk = FALSE
var/obj/loot_drop = null
-
+ var/owner
+
//Gives player-controlled variants the ability to swap attacks
/mob/living/simple_animal/hostile/asteroid/elite/Initialize(mapload)
. = ..()
@@ -53,14 +54,14 @@
if(ismineralturf(target))
var/turf/closed/mineral/M = target
M.gets_drilled()
-
+
//Elites can't talk (normally)!
/mob/living/simple_animal/hostile/asteroid/elite/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
if(can_talk)
. = ..()
return TRUE
return FALSE
-
+
/*Basic setup for elite attacks, based on Whoneedspace's megafauna attack setup.
While using this makes the system rely on OnFire, it still gives options for timers not tied to OnFire, and it makes using attacks consistent accross the board for player-controlled elites.*/
@@ -82,11 +83,11 @@ While using this makes the system rely on OnFire, it still gives options for tim
/datum/action/innate/elite_attack/Activate()
M.chosen_attack = chosen_attack_num
to_chat(M, chosen_message)
-
+
/mob/living/simple_animal/hostile/asteroid/elite/updatehealth()
. = ..()
update_health_hud()
-
+
/mob/living/simple_animal/hostile/asteroid/elite/update_health_hud()
if(hud_used)
var/severity = 0
@@ -144,7 +145,7 @@ While using this makes the system rely on OnFire, it still gives options for tim
gpstag = "Menacing Signal"
desc = "You're not quite sure how a signal can be menacing."
invisibility = 100
-
+
/obj/structure/elite_tumor/attack_hand(mob/user)
. = ..()
if(ishuman(user))
@@ -179,7 +180,7 @@ While using this makes the system rely on OnFire, it still gives options for tim
activity = TUMOR_INACTIVE
activator = null
-
+
obj/structure/elite_tumor/proc/spawn_elite(var/mob/dead/observer/elitemind)
var/selectedspawn = pick(potentialspawns)
mychild = new selectedspawn(loc)
@@ -199,18 +200,18 @@ obj/structure/elite_tumor/proc/return_elite()
if(boosted)
mychild.maxHealth = mychild.maxHealth * 2
mychild.health = mychild.maxHealth
-
+
/obj/structure/elite_tumor/Initialize(mapload)
. = ..()
internal = new/obj/item/gps/internal/elite(src)
START_PROCESSING(SSobj, src)
-
+
/obj/structure/elite_tumor/Destroy()
STOP_PROCESSING(SSobj, src)
mychild = null
activator = null
return ..()
-
+
/obj/structure/elite_tumor/process()
if(isturf(loc))
for(var/mob/living/simple_animal/hostile/asteroid/elite/elitehere in loc)
@@ -218,7 +219,7 @@ obj/structure/elite_tumor/proc/return_elite()
mychild.adjustHealth(-mychild.maxHealth*0.05)
var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(mychild))
H.color = "#FF0000"
-
+
/obj/structure/elite_tumor/attackby(obj/item/I, mob/user, params)
. = ..()
if(istype(I, /obj/item/organ/regenerative_core) && activity == TUMOR_INACTIVE && !boosted)
@@ -232,7 +233,7 @@ obj/structure/elite_tumor/proc/return_elite()
desc = "[desc] This one seems to glow with a strong intensity."
qdel(core)
return TRUE
-
+
/obj/structure/elite_tumor/proc/arena_checks()
if(activity != TUMOR_ACTIVE || QDELETED(src))
return
@@ -240,13 +241,13 @@ obj/structure/elite_tumor/proc/return_elite()
INVOKE_ASYNC(src, .proc/arena_trap) //Gets another arena trap queued up for when this one runs out.
INVOKE_ASYNC(src, .proc/border_check) //Checks to see if our fighters got out of the arena somehow.
addtimer(CALLBACK(src, .proc/arena_checks), 50)
-
+
/obj/structure/elite_tumor/proc/fighters_check()
if(activator != null && activator.stat == DEAD || activity == TUMOR_ACTIVE && QDELETED(activator))
onEliteWon()
if(mychild != null && mychild.stat == DEAD || activity == TUMOR_ACTIVE && QDELETED(mychild))
onEliteLoss()
-
+
/obj/structure/elite_tumor/proc/arena_trap()
var/turf/T = get_turf(src)
if(loc == null)
@@ -257,7 +258,7 @@ obj/structure/elite_tumor/proc/return_elite()
newwall = new /obj/effect/temp_visual/elite_tumor_wall(t, src)
newwall.activator = src.activator
newwall.ourelite = src.mychild
-
+
/obj/structure/elite_tumor/proc/border_check()
if(activator != null && get_dist(src, activator) >= 12)
activator.forceMove(loc)
@@ -267,7 +268,7 @@ obj/structure/elite_tumor/proc/return_elite()
mychild.forceMove(loc)
visible_message("[mychild] suddenly reappears above [src]!")
playsound(loc,'sound/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE)
-
+
obj/structure/elite_tumor/proc/onEliteLoss()
playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, 0, 50, TRUE, TRUE)
visible_message("[src] begins to convulse violently before beginning to dissipate.")
@@ -286,7 +287,7 @@ obj/structure/elite_tumor/proc/onEliteLoss()
mychild = null
activator = null
qdel(src)
-
+
obj/structure/elite_tumor/proc/onEliteWon()
activity = TUMOR_PASSIVE
activator = null
@@ -300,7 +301,7 @@ obj/structure/elite_tumor/proc/onEliteWon()
to_chat(mychild, "As the life in the activator's eyes fade, the forcefield around you dies out and you feel your power subside.\nDespite this inferno being your home, you feel as if you aren't welcome here anymore.\nWithout any guidance, your purpose is now for you to decide.")
to_chat(mychild, "Your max health has been halved, but can now heal by standing on your tumor. Note, it's your only way to heal.\nBear in mind, if anyone interacts with your tumor, you'll be resummoned here to carry out another fight. In such a case, you will regain your full max health.\nAlso, be weary of your fellow inhabitants, they likely won't be happy to see you!")
to_chat(mychild, "Note that you are a lavaland monster, and thus not allied to the station. You should not cooperate or act friendly with any station crew unless under extreme circumstances!")
-
+
/obj/item/tumor_shard
name = "tumor shard"
desc = "A strange, sharp, crystal shard from an odd tumor on Lavaland. Stabbing the corpse of a lavaland elite with this will revive them, assuming their soul still lingers. Revived lavaland elites only have half their max health, but are completely loyal to their reviver."
@@ -313,7 +314,7 @@ obj/structure/elite_tumor/proc/onEliteWon()
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 5
-
+
/obj/item/tumor_shard/afterattack(atom/target, mob/user, proximity_flag)
. = ..()
if(istype(target, /mob/living/simple_animal/hostile/asteroid/elite) && proximity_flag)
@@ -331,10 +332,11 @@ obj/structure/elite_tumor/proc/onEliteWon()
E.health = E.maxHealth
E.desc = "[E.desc] However, this one appears appears less wild in nature, and calmer around people."
E.sentience_type = SENTIENCE_ORGANIC
+ E.owner = user
qdel(src)
else
to_chat(user, "[src] only works on the corpse of a sentient lavaland elite.")
-
+
/obj/effect/temp_visual/elite_tumor_wall
name = "magic wall"
icon = 'icons/turf/walls/hierophant_wall_temp.dmi'
@@ -347,7 +349,7 @@ obj/structure/elite_tumor/proc/onEliteWon()
color = rgb(255,0,0)
light_range = MINIMUM_USEFUL_LIGHT_RANGE
light_color = LIGHT_COLOR_RED
-
+
/obj/effect/temp_visual/elite_tumor_wall/Initialize(mapload, new_caster)
. = ..()
queue_smooth_neighbors(src)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm
index 540470d505..e65c4f5b20 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm
@@ -44,34 +44,34 @@
/datum/action/innate/elite_attack/magic_box,
/datum/action/innate/elite_attack/pandora_teleport,
/datum/action/innate/elite_attack/aoe_squares)
-
+
var/sing_shot_length = 8
var/cooldown_time = 20
-
+
/datum/action/innate/elite_attack/singular_shot
name = "Singular Shot"
button_icon_state = "singular_shot"
chosen_message = "You are now creating a single linear magic square."
chosen_attack_num = SINGULAR_SHOT
-
+
/datum/action/innate/elite_attack/magic_box
name = "Magic Box"
button_icon_state = "magic_box"
chosen_message = "You are now attacking with a box of magic squares."
chosen_attack_num = MAGIC_BOX
-
+
/datum/action/innate/elite_attack/pandora_teleport
name = "Line Teleport"
button_icon_state = "pandora_teleport"
chosen_message = "You will now teleport to your target."
chosen_attack_num = PANDORA_TELEPORT
-
+
/datum/action/innate/elite_attack/aoe_squares
name = "AOE Blast"
button_icon_state = "aoe_squares"
chosen_message = "Your attacks will spawn an AOE blast at your target location."
chosen_attack_num = AOE_SQUARES
-
+
/mob/living/simple_animal/hostile/asteroid/elite/pandora/OpenFire()
if(client)
switch(chosen_attack)
@@ -94,7 +94,7 @@
pandora_teleport(target)
if(AOE_SQUARES)
aoe_squares(target)
-
+
/mob/living/simple_animal/hostile/asteroid/elite/pandora/Life()
. = ..()
if(health >= maxHealth * 0.5)
@@ -105,28 +105,28 @@
return
else
cooldown_time = 10
-
-/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/singular_shot(target)
+
+/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/singular_shot(target)
ranged_cooldown = world.time + (cooldown_time * 0.5)
var/dir_to_target = get_dir(get_turf(src), get_turf(target))
var/turf/T = get_step(get_turf(src), dir_to_target)
singular_shot_line(sing_shot_length, dir_to_target, T)
-
+
/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/singular_shot_line(var/procsleft, var/angleused, var/turf/T)
if(procsleft <= 0)
return
- new /obj/effect/temp_visual/hierophant/blast/pandora(T, src)
+ new /obj/effect/temp_visual/hierophant/blast/pandora(T, src, null, null, list(owner))
T = get_step(T, angleused)
procsleft = procsleft - 1
addtimer(CALLBACK(src, .proc/singular_shot_line, procsleft, angleused, T), 2)
-
+
/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/magic_box(target)
ranged_cooldown = world.time + cooldown_time
var/turf/T = get_turf(target)
for(var/t in spiral_range_turfs(3, T))
if(get_dist(t, T) > 1)
- new /obj/effect/temp_visual/hierophant/blast/pandora(t, src)
-
+ new /obj/effect/temp_visual/hierophant/blast/pandora(t, src, null, null, list(owner))
+
/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/pandora_teleport(target)
ranged_cooldown = world.time + cooldown_time
var/turf/T = get_turf(target)
@@ -135,45 +135,45 @@
new /obj/effect/temp_visual/hierophant/telegraph(source, src)
playsound(source,'sound/machines/airlockopen.ogg', 200, 1)
addtimer(CALLBACK(src, .proc/pandora_teleport_2, T, source), 2)
-
+
/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/pandora_teleport_2(var/turf/T, var/turf/source)
new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, src)
new /obj/effect/temp_visual/hierophant/telegraph/teleport(source, src)
for(var/t in RANGE_TURFS(1, T))
- new /obj/effect/temp_visual/hierophant/blast/pandora(t, src)
+ new /obj/effect/temp_visual/hierophant/blast/pandora(t, src, null, null, list(owner))
for(var/t in RANGE_TURFS(1, source))
- new /obj/effect/temp_visual/hierophant/blast/pandora(t, src)
+ new /obj/effect/temp_visual/hierophant/blast/pandora(t, src, null, null, list(owner))
animate(src, alpha = 0, time = 2, easing = EASE_OUT) //fade out
visible_message("[src] fades out!")
density = FALSE
addtimer(CALLBACK(src, .proc/pandora_teleport_3, T), 2)
-
+
/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/pandora_teleport_3(var/turf/T)
forceMove(T)
animate(src, alpha = 255, time = 2, easing = EASE_IN) //fade IN
density = TRUE
visible_message("[src] fades in!")
-
+
/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/aoe_squares(target)
ranged_cooldown = world.time + cooldown_time
var/turf/T = get_turf(target)
- new /obj/effect/temp_visual/hierophant/blast/pandora(T, src)
+ new /obj/effect/temp_visual/hierophant/blast/pandora(T, src, null, null, list(owner))
var/max_size = 2
addtimer(CALLBACK(src, .proc/aoe_squares_2, T, 0, max_size), 2)
-
+
/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/aoe_squares_2(var/turf/T, var/ring, var/max_size)
if(ring > max_size)
return
for(var/t in spiral_range_turfs(ring, T))
if(get_dist(t, T) == ring)
- new /obj/effect/temp_visual/hierophant/blast/pandora(t, src)
+ new /obj/effect/temp_visual/hierophant/blast/pandora(t, src, null, null, list(owner))
addtimer(CALLBACK(src, .proc/aoe_squares_2, T, (ring + 1), max_size), 2)
-
+
//The specific version of hiero's squares pandora uses
/obj/effect/temp_visual/hierophant/blast/pandora
damage = 20
monster_damage_boost = FALSE
-
+
//Pandora's loot: Hope
/obj/item/clothing/accessory/pandora_hope
name = "Hope"
@@ -181,7 +181,7 @@
icon = 'icons/obj/lavaland/elite_trophies.dmi'
icon_state = "hope"
resistance_flags = FIRE_PROOF
-
+
/obj/item/clothing/accessory/pandora_hope/on_uniform_equip(obj/item/clothing/under/U, user)
var/mob/living/L = user
if(L && L.mind)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index ee99c7e7b6..1a3f2fca3b 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -380,14 +380,10 @@ mob/visible_message(message, self_message, blind_message, vision_distance = DEFA
spintime -= speed
/mob/proc/update_pull_hud_icon()
- if(hud_used)
- if(hud_used.pull_icon)
- hud_used.pull_icon.update_icon(src)
+ hud_used?.pull_icon?.update_icon()
/mob/proc/update_rest_hud_icon()
- if(hud_used)
- if(hud_used.rest_icon)
- hud_used.rest_icon.update_icon(src)
+ hud_used?.rest_icon?.update_icon()
/mob/verb/mode()
set name = "Activate Held Object"
@@ -811,26 +807,6 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
/mob/proc/can_interact_with(atom/A)
return IsAdminGhost(src) || Adjacent(A)
-//Can the mob see reagents inside of containers?
-/mob/proc/can_see_reagents()
- if(stat == DEAD) //Ghosts and such can always see reagents
- return 1
- if(has_unlimited_silicon_privilege) //Silicons can automatically view reagents
- return 1
- if(ishuman(src))
- var/mob/living/carbon/human/H = src
- if(H.head && istype(H.head, /obj/item/clothing))
- var/obj/item/clothing/CL = H.head
- if(CL.scan_reagents)
- return 1
- if(H.wear_mask && H.wear_mask.scan_reagents)
- return 1
- if(H.glasses && istype(H.glasses, /obj/item/clothing))
- var/obj/item/clothing/CL = H.glasses
- if(CL.scan_reagents)
- return 1
- return 0
-
//Can the mob use Topic to interact with machines
/mob/proc/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE, no_tk=FALSE)
return
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index a9f4c94397..c7365210ab 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -22,7 +22,7 @@
I'll make some notes on where certain variable defines should probably go.
Changing this around would probably require a good look-over the pre-existing code.
*/
- var/zone_selected = null
+ var/zone_selected = BODY_ZONE_CHEST
var/computer_id = null
var/list/logging = list()
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index c18fc36e9a..18fc2bfb42 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -532,3 +532,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
if(!held_item)
return
return held_item.GetID()
+
+//Can the mob see reagents inside of containers?
+/mob/proc/can_see_reagents()
+ return stat == DEAD || has_unlimited_silicon_privilege //Dead guys and silicons can always see reagents
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 1a836c06cf..04d47da56e 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -372,7 +372,7 @@
m_intent = MOVE_INTENT_RUN
if(hud_used && hud_used.static_inventory)
for(var/obj/screen/mov_intent/selector in hud_used.static_inventory)
- selector.update_icon(src)
+ selector.update_icon()
/mob/verb/up()
set name = "Move Upwards"
diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index 4446b5c561..e956fcac36 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -13,6 +13,7 @@
/datum/reagent/drug/space_drugs
name = "Space drugs"
id = "space_drugs"
+ value = 6
description = "An illegal chemical compound used as drug."
color = "#60A584" // rgb: 96, 165, 132
overdose_threshold = 30
@@ -40,6 +41,7 @@
/datum/reagent/drug/nicotine
name = "Nicotine"
id = "nicotine"
+ value = 0
description = "Slightly reduces stun times. If overdosed it will deal toxin and oxygen damage."
reagent_state = LIQUID
color = "#60A584" // rgb: 96, 165, 132
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 23eb24ed15..64e693a326 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -622,7 +622,7 @@
M.adjustBruteLoss(-1*REM, 0)
M.adjustFireLoss(-1*REM, 0)
M.adjustOxyLoss(-1*REM, 0)
- M.adjustToxLoss(-1*REM, 0)
+ M.adjustToxLoss(-1*REM, 0, TRUE) //heals TOXINLOVERs
..()
/datum/reagent/consumable/honey/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 05eeb564e5..6877ba71f6 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -1095,13 +1095,13 @@
continue
boost_item_paths |= UI.item //allows deconning to unlock.
-/datum/techweb_node/advanced_illegl_ballistics
+/datum/techweb_node/advanced_illegal_ballistics
id = "advanced_illegal_ballistics"
- display_name = "Advanced Illegal Ballistics"
- description = "Advanced Ballistic for Illegal weaponds."
- design_ids = list("10mm","10mmap","10mminc","10mmhp","pistolm9mm","m45","bolt_clip")
+ display_name = "Advanced Non-Standard Ballistics"
+ description = "Ballistic ammunition for non-standard firearms. Usually the ones you don't have nor want to be involved with."
+ design_ids = list("10mm","10mmap","10mminc","10mmhp","sl357","pistolm9mm","m45","bolt_clip")
prereq_ids = list("ballistic_weapons","syndicate_basic","explosive_weapons")
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 25000) //This gives sec lethal mags/clips for guns form traitors or space.
+ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 25000) //This gives sec lethal mags/clips for guns from traitors, space, or anything in between.
export_price = 7000
//Helpers for debugging/balancing the techweb in its entirety!
diff --git a/code/modules/security_levels/security_levels.dm b/code/modules/security_levels/security_levels.dm
index 70b06e6438..13d1543c92 100644
--- a/code/modules/security_levels/security_levels.dm
+++ b/code/modules/security_levels/security_levels.dm
@@ -49,7 +49,7 @@ GLOBAL_VAR_INIT(security_level, SEC_LEVEL_GREEN)
else
SSshuttle.emergency.modTimer(1.5)
GLOB.security_level = SEC_LEVEL_BLUE
- sound_to_playing_players('sound/misc/voybluealert.ogg') // Citadel change - Makes alerts play a sound
+ sound_to_playing_players('sound/misc/voybluealert.ogg', volume = 50) // Citadel change - Makes alerts play a sound
for(var/obj/machinery/firealarm/FA in GLOB.machines)
if(is_station_level(FA.z))
FA.update_icon()
@@ -66,7 +66,7 @@ GLOBAL_VAR_INIT(security_level, SEC_LEVEL_GREEN)
if(SSshuttle.emergency.mode == SHUTTLE_CALL || SSshuttle.emergency.mode == SHUTTLE_RECALL)
SSshuttle.emergency.modTimer(1.6)
GLOB.security_level = SEC_LEVEL_AMBER
- sound_to_playing_players('sound/effects/alert.ogg') // Citadel change - Makes alerts play a sound
+ sound_to_playing_players('sound/effects/alert.ogg', volume = 50) // Citadel change - Makes alerts play a sound
for(var/obj/machinery/firealarm/FA in GLOB.machines)
if(is_station_level(FA.z))
FA.update_icon()
@@ -83,7 +83,7 @@ GLOBAL_VAR_INIT(security_level, SEC_LEVEL_GREEN)
else
minor_announce(CONFIG_GET(string/alert_red_downto), "Attention! Code red!")
GLOB.security_level = SEC_LEVEL_RED
- sound_to_playing_players('sound/misc/voyalert.ogg') // Citadel change - Makes alerts play a sound
+ sound_to_playing_players('sound/misc/voyalert.ogg', volume = 50) // Citadel change - Makes alerts play a sound
for(var/obj/machinery/firealarm/FA in GLOB.machines)
if(is_station_level(FA.z))
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index 2de04cf0df..97fa6041a9 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -357,9 +357,9 @@
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
/datum/uplink_item/dangerous/revolver
- name = "Syndicate Revolver"
- desc = "A brutally simple syndicate revolver that fires .357 Magnum rounds and has 7 chambers."
- item = /obj/item/gun/ballistic/revolver
+ name = "Syndicate Revolver Kit"
+ desc = "A sleek box containing a brutally simple Syndicate revolver that fires .357 Magnum rounds and has 7 chambers, and an extra speedloader."
+ item = /obj/item/storage/box/syndie_kit/revolver
cost = 13
surplus = 50
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
@@ -641,7 +641,7 @@
cost = 2
/datum/uplink_item/stealthy_weapons/martialarts
- name = "Martial Arts Scroll"
+ name = "Sleeping Carp Scroll"
desc = "This scroll contains the secrets of an ancient martial arts technique. You will master unarmed combat, \
deflecting all ranged weapon fire, but you also refuse to use dishonorable ranged weaponry."
item = /obj/item/book/granter/martial/carp
@@ -649,6 +649,15 @@
surplus = 0
exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+/datum/uplink_item/stealthy_weapons/martialartstwo
+ name = "Rising Bass Scroll"
+ desc = "This scroll contains the secrets of an ancient martial arts technique. You will become proficient in fleeing situations, \
+ and dodging all ranged weapon fire, but you will refuse to use dishonorable ranged weaponry."
+ item = /obj/item/book/granter/martial/bass
+ cost = 18
+ surplus = 0
+ exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
/datum/uplink_item/stealthy_weapons/crossbow
name = "Miniature Energy Crossbow"
desc = "A short bow mounted across a tiller in miniature. Small enough to \
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index d65a507f96..894aecc600 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -135,7 +135,6 @@
/obj/item/clothing/gloves/fingerless = 3,
/obj/item/clothing/head/soft/black = 3,
/obj/item/clothing/mask/bandana/skull = 2)
- premium = list(/obj/item/radio/headset/headset_rob = 2) //Cit change
contraband = list(/obj/item/clothing/suit/hooded/techpriest = 2)
refill_canister = /obj/item/vending_refill/wardrobe/robo_wardrobe
diff --git a/config/dynamic_config.txt b/config/dynamic_config.txt
index 18c0d7827d..2ddebdf37a 100644
--- a/config/dynamic_config.txt
+++ b/config/dynamic_config.txt
@@ -40,6 +40,7 @@ DYNAMIC_WEIGHT WIZARD 1
DYNAMIC_WEIGHT CULT 3
DYNAMIC_WEIGHT NUCLEAR 3
DYNAMIC_WEIGHT REVOLUTION 2
+DYNAMIC_WEIGHT BLOODSUCKER 4
# All below are impossible-by-default
DYNAMIC_WEIGHT EXTENDED 3
DYNAMIC_WEIGHT CLOCKWORK_CULT 3
@@ -49,18 +50,20 @@ DYNAMIC_WEIGHT MONKEY 3
DYNAMIC_WEIGHT METEOR 3
## Midround antags
-DYNAMIC_WEIGHT MIDROUND_TRAITOR 7
-DYNAMIC_WEIGHT MIDROUND_MALF_AI 8
-DYNAMIC_WEIGHT MIDROUND_WIZARD 9
-DYNAMIC_WEIGHT MIDROUND_NUCLEAR 9
-DYNAMIC_WEIGHT BLOB 8
-DYNAMIC_WEIGHT XENOS 8
-DYNAMIC_WEIGHT NIGHTMARE 8
-DYNAMIC_WEIGHT SENTIENT_DISEASE 6
-DYNAMIC_WEIGHT REVENANT 6
-DYNAMIC_WEIGHT SLAUGHTER_DEMON 4
-DYNAMIC_WEIGHT ABDUCTORS 8
-DYNAMIC_WEIGHT SPACE_NINJA 8
+DYNAMIC_WEIGHT MIDROUND_TRAITOR 9
+DYNAMIC_WEIGHT MIDROUND_MALF_AI 5
+DYNAMIC_WEIGHT MIDROUND_WIZARD 4
+DYNAMIC_WEIGHT MIDROUND_NUCLEAR 2
+DYNAMIC_WEIGHT BLOB 2
+DYNAMIC_WEIGHT XENOS 2
+DYNAMIC_WEIGHT NIGHTMARE 3
+DYNAMIC_WEIGHT SENTIENT_DISEASE 4
+DYNAMIC_WEIGHT REVENANT 2
+DYNAMIC_WEIGHT SLAUGHTER_DEMON 1
+DYNAMIC_WEIGHT ABDUCTORS 3
+DYNAMIC_WEIGHT SPACE_NINJA 3
+
+## Events
DYNAMIC_WEIGHT SPIDERS 5
DYNAMIC_WEIGHT VENTCLOG_NORMAL 3
DYNAMIC_WEIGHT VENTCLOG_THREATENING 3
@@ -88,6 +91,7 @@ DYNAMIC_WEIGHT RADIATION_STORM 1
## Latejoin antags
DYNAMIC_WEIGHT LATEJOIN_TRAITOR 7
DYNAMIC_WEIGHT LATEJOIN_REVOLUTION 2
+DYNAMIC_WEIGHT LATEJOIN_BLOODSUCKER 4
## Threat cost. This is decreased from the mode's threat when the rule is executed.
DYNAMIC_COST TRAITOR 10
@@ -98,7 +102,7 @@ DYNAMIC_COST WIZARD 30
DYNAMIC_COST CULT 35
DYNAMIC_COST NUCLEAR 45
DYNAMIC_COST REVOLUTION 40
-# All below are impossible-by-default
+DYNAMIC_cOST BLOODSUCKER 15
DYNAMIC_COST EXTENDED 0
DYNAMIC_COST CLOCKWORK_CULT 35
DYNAMIC_COST CLOWNOPS 40
@@ -112,13 +116,15 @@ DYNAMIC_COST MIDROUND_MALF_AI 35
DYNAMIC_COST MIDROUND_WIZARD 20
DYNAMIC_COST MIDROUND_NUCLEAR 35
DYNAMIC_COST BLOB 10
-DYNAMIC_COST XENOS 10
+DYNAMIC_COST XENOS 20
DYNAMIC_COST NIGHTMARE 10
DYNAMIC_COST SENTIENT_DISEASE 5
DYNAMIC_COST REVENANT 5
DYNAMIC_COST SLAUGHTER_DEMON 15
DYNAMIC_COST ABDUCTORS 10
DYNAMIC_COST SPACE_NINJA 15
+
+## Events
DYNAMIC_COST SPIDERS 10
DYNAMIC_COST VENTCLOG_NORMAL 2
DYNAMIC_COST VENTCLOG_THREATENING 5
@@ -146,6 +152,7 @@ DYNAMIC_COST RADIATION_STORM 3
## Latejoin antags
DYNAMIC_COST LATEJOIN_TRAITOR 5
DYNAMIC_COST LATEJOIN_REVOLUTION 20
+DYNAMIC_COST LATEJOIN_BLOODSUCKER 10
## Rule will not be generated with threat levels below requirement at a pop value. Pop values are determined by dynamic's pop-per-requirement.
## By default it's 0-8, 9-17, 18-26, 27-35, 36-44, 45-53, 54-60, 61-69, 70-78, 79+.
@@ -153,13 +160,12 @@ DYNAMIC_COST LATEJOIN_REVOLUTION 20
DYNAMIC_REQUIREMENTS TRAITOR 50 50 50 50 50 50 50 50 50 50
DYNAMIC_REQUIREMENTS TRAITORBRO 101 101 101 101 101 101 101 101 101 101
DYNAMIC_REQUIREMENTS CHANGELING 101 101 101 101 101 101 101 101 101 101
-DYNAMIC_REQUIREMENTS WIZARD 101 101 101 60 50 50 50 50 50 50
+DYNAMIC_REQUIREMENTS WIZARD 101 101 60 60 50 50 50 50 50 50
DYNAMIC_REQUIREMENTS CULT 101 101 101 60 50 50 50 50 50 50
DYNAMIC_REQUIREMENTS NUCLEAR 101 101 101 60 50 50 50 50 50 50
DYNAMIC_REQUIREMENTS REVOLUTION 101 101 101 60 50 50 50 50 50 50
-# All below are impossible-by-default
DYNAMIC_REQUIREMENTS EXTENDED 101 101 101 101 101 101 101 101 101 101
-DYNAMIC_REQUIREMENTS CLOCKWORK_CULT 101 101 101 80 70 60 50 50 50 50
+DYNAMIC_REQUIREMENTS CLOCKWORK_CULT 101 101 101 70 60 60 50 50 50 50
DYNAMIC_REQUIREMENTS CLOWNOPS 101 101 101 101 101 101 101 101 101 101
DYNAMIC_REQUIREMENTS DEVIL 101 101 101 101 101 101 101 101 101 101
DYNAMIC_REQUIREMENTS MONKEY 101 101 101 101 101 101 101 101 101 101
@@ -168,24 +174,22 @@ DYNAMIC_REQUIREMENTS METEOR 101 101 101 101 101 101 101 101 101 101
## Midround antags
DYNAMIC_REQUIREMENTS MIDROUND_TRAITOR 30 25 20 15 15 15 15 15 15 15
DYNAMIC_REQUIREMENTS MIDROUND_MALF_AI 101 101 70 50 50 50 40 30 30 30
-DYNAMIC_REQUIREMENTS MIDROUND_WIZARD 90 90 70 50 50 50 50 40 30 30
+DYNAMIC_REQUIREMENTS MIDROUND_WIZARD 90 90 60 40 30 30 30 30 30 30
DYNAMIC_REQUIREMENTS MIDROUND_NUCLEAR 90 90 90 80 70 60 50 40 40 40
DYNAMIC_REQUIREMENTS BLOB 101 101 101 80 60 50 50 50 50 50
DYNAMIC_REQUIREMENTS XENOS 101 101 101 70 50 50 50 50 50 50
DYNAMIC_REQUIREMENTS NIGHTMARE 101 101 101 70 50 40 20 15 15 15
DYNAMIC_REQUIREMENTS SENTIENT_DISEASE 30 30 20 20 15 10 10 10 10 5
DYNAMIC_REQUIREMENTS REVENANT 30 30 30 30 20 15 15 15 15 15
-DYNAMIC_REQUIREMENTS SLAUGHTER_DEMON 101 101 101 90 80 70 60 50 40 30
+DYNAMIC_REQUIREMENTS SLAUGHTER_DEMON 101 101 101 90 80 70 60 50 50 50
DYNAMIC_REQUIREMENTS ABDUCTORS 80 80 70 50 40 30 30 20 15 15
DYNAMIC_REQUIREMENTS SPACE_NINJA 101 101 101 90 80 70 60 50 40 30
+
+## Events
DYNAMIC_REQUIREMENTS SPIDERS 70 60 50 50 40 40 40 30 20 15
-DYNAMIC_REQUIREMENTS VENTCLOG_NORMAL 5 5 5 5 5 5 5 5 5 5
-DYNAMIC_REQUIREMENTS VENTCLOG_THREATENING 15 15 15 15 15 15 15 15 15 15
-DYNAMIC_REQUIREMENTS VENTCLOG_CATASTROPHIC 30 30 30 30 30 30 30 30 30 30
+DYNAMIC_REQUIREMENTS VENTCLOG 5 5 5 5 5 5 5 5 5 5
DYNAMIC_REQUIREMENTS ION_STORM 5 5 5 5 5 5 5 5 5 5
-DYNAMIC_REQUIREMENTS METEOR_WAVE_NORMAL 60 50 40 30 30 30 30 30 30 30
-DYNAMIC_REQUIREMENTS METEOR_WAVE_THREATENING 80 70 60 50 40 40 40 40 40 40
-DYNAMIC_REQUIREMENTS METEOR_WAVE_CATASTROPHIC 101 100 90 80 70 60 50 50 50 50
+DYNAMIC_REQUIREMENTS METEOR_WAVE 60 50 40 30 30 30 30 30 30 30
DYNAMIC_REQUIREMENTS PIRATES 70 60 50 50 40 40 40 30 20 15
DYNAMIC_REQUIREMENTS ANOMALY_BLUESPACE 5 5 5 5 5 5 5 5 5 5
DYNAMIC_REQUIREMENTS ANOMALY_FLUX 5 5 5 5 5 5 5 5 5 5
@@ -205,6 +209,7 @@ DYNAMIC_REQUIREMENTS RADIATION_STORM 5 5 5 5 5 5 5 5 5 5
## Latejoin antags
DYNAMIC_REQUIREMENTS LATEJOIN_TRAITOR 40 30 20 15 15 15 15 15 15 15
DYNAMIC_REQUIREMENTS LATEJOIN_REVOLUTION 101 101 70 40 40 40 40 40 40 40
+DYNAMIC_REQUIREMENTS LATEJOIN_BLOODSUCKER 40 30 20 15 15 15 15 15 15 15
## An alternative, static requirement used instead when pop is over mode's high_pop_limit.
DYNAMIC_HIGH_POPULATION_REQUIREMENT TRAITOR 50
@@ -236,14 +241,12 @@ DYNAMIC_HIGH_POPULATION_REQUIREMENT REVENANT 15
DYNAMIC_HIGH_POPULATION_REQUIREMENT SLAUGHTER_DEMON 30
DYNAMIC_HIGH_POPULATION_REQUIREMENT ABDUCTORS 15
DYNAMIC_HIGH_POPULATION_REQUIREMENT SPACE_NINJA 30
+
+## Events
DYNAMIC_HIGH_POPULATION_REQUIREMENT SPIDERS 15
-DYNAMIC_HIGH_POPULATION_REQUIREMENT VENTCLOG_NORMAL 5
-DYNAMIC_HIGH_POPULATION_REQUIREMENT VENTCLOG_THREATENING 15
-DYNAMIC_HIGH_POPULATION_REQUIREMENT VENTCLOG_CATASTROPHIC 30
+DYNAMIC_HIGH_POPULATION_REQUIREMENT VENTCLOG 5
DYNAMIC_HIGH_POPULATION_REQUIREMENT ION_STORM 5
-DYNAMIC_HIGH_POPULATION_REQUIREMENT METEOR_WAVE_NORMAL 30
-DYNAMIC_HIGH_POPULATION_REQUIREMENT METEOR_WAVE_THREATENING 40
-DYNAMIC_HIGH_POPULATION_REQUIREMENT METEOR_WAVE_CATASTROPHIC 50
+DYNAMIC_HIGH_POPULATION_REQUIREMENT METEOR_WAVE 30
DYNAMIC_HIGH_POPULATION_REQUIREMENT PIRATES 15
DYNAMIC_HIGH_POPULATION_REQUIREMENT ANOMALY_BLUESPACE 5
DYNAMIC_HIGH_POPULATION_REQUIREMENT ANOMALY_FLUX 5
@@ -263,6 +266,7 @@ DYNAMIC_HIGH_POPULATION_REQUIREMENT RADIATION_STORM 5
## Latejoin antags
DYNAMIC_HIGH_POPULATION_REQUIREMENT LATEJOIN_TRAITOR 15
DYNAMIC_HIGH_POPULATION_REQUIREMENT LATEJOIN_REVOLUTION 50
+DYNAMIC_HIGH_POPULATION_REQUIREMENT LATEJOIN_BLOODSUCKER 15
## Dynamic traitor stuff
diff --git a/html/changelogs/AutoChangeLog-pr-10091.yml b/html/changelogs/AutoChangeLog-pr-10091.yml
new file mode 100644
index 0000000000..8787d9bdba
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10091.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - soundadd: "Blue, Amber and Red security alert sounds should be half as loud now."
diff --git a/html/changelogs/AutoChangeLog-pr-10128.yml b/html/changelogs/AutoChangeLog-pr-10128.yml
new file mode 100644
index 0000000000..89bca26a76
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10128.yml
@@ -0,0 +1,4 @@
+author: "Seris02"
+delete-after: True
+changes:
+ - rscadd: "the clowns headset"
diff --git a/html/changelogs/AutoChangeLog-pr-10217.yml b/html/changelogs/AutoChangeLog-pr-10217.yml
new file mode 100644
index 0000000000..19ddaf33ce
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10217.yml
@@ -0,0 +1,4 @@
+author: "Putnam"
+delete-after: True
+changes:
+ - balance: "Contamination is no longer an infinitely spreading deadly contagion causing mass panic"
diff --git a/html/changelogs/AutoChangeLog-pr-10237.yml b/html/changelogs/AutoChangeLog-pr-10237.yml
new file mode 100644
index 0000000000..0a3b481d8c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10237.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Stops humanoids whose skin_tone variable is set to \"albino\" from showing up as pale when examined should their species not use skintones anyway."
diff --git a/html/changelogs/AutoChangeLog-pr-10242.yml b/html/changelogs/AutoChangeLog-pr-10242.yml
new file mode 100644
index 0000000000..017c3f99bd
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10242.yml
@@ -0,0 +1,4 @@
+author: "nemvar"
+delete-after: True
+changes:
+ - code_imp: "Refactored the visibility of reagents for mobs."
diff --git a/html/changelogs/AutoChangeLog-pr-10250.yml b/html/changelogs/AutoChangeLog-pr-10250.yml
new file mode 100644
index 0000000000..8e32083f09
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10250.yml
@@ -0,0 +1,4 @@
+author: "Toriate"
+delete-after: True
+changes:
+ - rscadd: "Polychromic shorts now have a digitigrade state"
diff --git a/html/changelogs/AutoChangeLog-pr-10264.yml b/html/changelogs/AutoChangeLog-pr-10264.yml
new file mode 100644
index 0000000000..71497e423b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10264.yml
@@ -0,0 +1,5 @@
+author: "Seris02"
+delete-after: True
+changes:
+ - rscadd: "added the runed and brass winter coats (cosmetic ratvarian/narsian)"
+ - tweak: "how the narsian/ratvarian coats can be made"
diff --git a/html/changelogs/AutoChangeLog-pr-10265.yml b/html/changelogs/AutoChangeLog-pr-10265.yml
new file mode 100644
index 0000000000..f42e97388d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10265.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - rscadd: "Blaster shotguns back into armory"
diff --git a/html/changelogs/AutoChangeLog-pr-10266.yml b/html/changelogs/AutoChangeLog-pr-10266.yml
new file mode 100644
index 0000000000..7fc7f11682
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10266.yml
@@ -0,0 +1,5 @@
+author: "shellspeed1"
+delete-after: True
+changes:
+ - rscadd: "Adds Insect markings"
+ - rscadd: "Adds three new moth wings."
diff --git a/html/changelogs/AutoChangeLog-pr-10268.yml b/html/changelogs/AutoChangeLog-pr-10268.yml
new file mode 100644
index 0000000000..f4f4991202
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10268.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - rscdel: "Removed the old (almost) unused roboticist encryption key and headset."
diff --git a/html/changelogs/AutoChangeLog-pr-10269.yml b/html/changelogs/AutoChangeLog-pr-10269.yml
new file mode 100644
index 0000000000..f38bb346e3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10269.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed goose meat."
diff --git a/html/changelogs/AutoChangeLog-pr-10281.yml b/html/changelogs/AutoChangeLog-pr-10281.yml
new file mode 100644
index 0000000000..0d6c353703
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10281.yml
@@ -0,0 +1,5 @@
+author: "Hatterhat"
+delete-after: True
+changes:
+ - rscadd: ".357 speedloaders can now be printed with the Advanced Illegal Ballistics node on the tech tree!"
+ - balance: "okay so i may have given the .357 an extra speedloader at the same cost but it comes in a box now"
diff --git a/html/changelogs/AutoChangeLog-pr-10282.yml b/html/changelogs/AutoChangeLog-pr-10282.yml
new file mode 100644
index 0000000000..bf4f74c84a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10282.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - config: "Buncha dynamic config tweaks"
diff --git a/html/changelogs/AutoChangeLog-pr-10283.yml b/html/changelogs/AutoChangeLog-pr-10283.yml
new file mode 100644
index 0000000000..435a0c7ca9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10283.yml
@@ -0,0 +1,4 @@
+author: "Detective-Google"
+delete-after: True
+changes:
+ - bugfix: "short hair 80's is no longer jank"
diff --git a/html/changelogs/AutoChangeLog-pr-10289.yml b/html/changelogs/AutoChangeLog-pr-10289.yml
new file mode 100644
index 0000000000..4907620fdc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10289.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed a little door assembly glass dupe exploit"
diff --git a/html/changelogs/AutoChangeLog-pr-10296.yml b/html/changelogs/AutoChangeLog-pr-10296.yml
new file mode 100644
index 0000000000..22aa8cca14
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10296.yml
@@ -0,0 +1,5 @@
+author: "Useroth"
+delete-after: True
+changes:
+ - rscadd: "Ghost cafe spawner. For letting people spawn as their own character in the ninja holding facility. It bypasses the usual check, so people who have suicided/ghosted/cryod may use it."
+ - rscadd: "Dorms in the ninja holding facility."
diff --git a/html/changelogs/AutoChangeLog-pr-10297.yml b/html/changelogs/AutoChangeLog-pr-10297.yml
new file mode 100644
index 0000000000..6eccde6be7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10297.yml
@@ -0,0 +1,4 @@
+author: "Narcissisko (ported by Hatterhat)"
+delete-after: True
+changes:
+ - rscadd: "Luxury Bar Capsule, at 10,000 points. Comes with no medical supplies, a bar, and a bunch of cigars. Ported from tgstation/tgstation#45547."
diff --git a/html/changelogs/AutoChangeLog-pr-10298.yml b/html/changelogs/AutoChangeLog-pr-10298.yml
new file mode 100644
index 0000000000..981e1f5314
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10298.yml
@@ -0,0 +1,4 @@
+author: "kappa-sama"
+delete-after: True
+changes:
+ - balance: "you can no longer get 100k credits by spending 4k roundstart"
diff --git a/html/changelogs/AutoChangeLog-pr-10299.yml b/html/changelogs/AutoChangeLog-pr-10299.yml
new file mode 100644
index 0000000000..ee3f0bf96b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10299.yml
@@ -0,0 +1,4 @@
+author: "kappa-sama"
+delete-after: True
+changes:
+ - balance: "cooking oil in sunflowers instead of corn oil"
diff --git a/html/changelogs/AutoChangeLog-pr-10315.yml b/html/changelogs/AutoChangeLog-pr-10315.yml
new file mode 100644
index 0000000000..8db0d90e90
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10315.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - rscdel: "Removed Lighters in thunderdomes"
diff --git a/html/changelogs/AutoChangeLog-pr-10318.yml b/html/changelogs/AutoChangeLog-pr-10318.yml
new file mode 100644
index 0000000000..8dc58b9922
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10318.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - rscadd: "Silicons now know what a slime is saying!"
diff --git a/html/changelogs/AutoChangeLog-pr-10322.yml b/html/changelogs/AutoChangeLog-pr-10322.yml
new file mode 100644
index 0000000000..c03fd96a5e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10322.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - bugfix: "sprint/stamina huds now work again"
diff --git a/html/changelogs/AutoChangeLog-pr-10323.yml b/html/changelogs/AutoChangeLog-pr-10323.yml
new file mode 100644
index 0000000000..50385665d6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10323.yml
@@ -0,0 +1,4 @@
+author: "Seris02"
+delete-after: True
+changes:
+ - bugfix: "pandoras attacking their owners"
diff --git a/html/changelogs/AutoChangeLog-pr-10324.yml b/html/changelogs/AutoChangeLog-pr-10324.yml
new file mode 100644
index 0000000000..f012bc272b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10324.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - balance: "honey now will not kill slimes. Honey slimepeople can be a thing now, go sci."
diff --git a/html/changelogs/AutoChangeLog-pr-10328.yml b/html/changelogs/AutoChangeLog-pr-10328.yml
new file mode 100644
index 0000000000..740a07ddce
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10328.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - bugfix: "Ghost cafe spawns are actual ghost roles by the game's reckoning now"
diff --git a/html/changelogs/AutoChangeLog-pr-9751.yml b/html/changelogs/AutoChangeLog-pr-9751.yml
new file mode 100644
index 0000000000..a2c22468c3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9751.yml
@@ -0,0 +1,5 @@
+author: "Seris02"
+delete-after: True
+changes:
+ - rscadd: "Added Rising Bass and the shifting scroll."
+ - tweak: "Changes the martial arts scroll in the uplink to \"Sleeping Carp Scroll\""
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index 9540599364..772a263358 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/insect_markings.dmi b/icons/mob/insect_markings.dmi
new file mode 100644
index 0000000000..6aea140271
Binary files /dev/null and b/icons/mob/insect_markings.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 0f962591a5..c5981b06a3 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/mob/uniform_digi.dmi b/icons/mob/uniform_digi.dmi
index 94d9f07e10..b4f3e6130b 100644
Binary files a/icons/mob/uniform_digi.dmi and b/icons/mob/uniform_digi.dmi differ
diff --git a/icons/mob/wings.dmi b/icons/mob/wings.dmi
index 7d95805dc5..ace37b1f17 100644
Binary files a/icons/mob/wings.dmi and b/icons/mob/wings.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 43162f2b7e..60753839d2 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/custom.dmi b/icons/obj/custom.dmi
index 7f42c7e250..d0be1113ee 100644
Binary files a/icons/obj/custom.dmi and b/icons/obj/custom.dmi differ
diff --git a/modular_citadel/code/_onclick/hud/screen_objects.dm b/modular_citadel/code/_onclick/hud/screen_objects.dm
index 3a0eb364cb..6ad0603c49 100644
--- a/modular_citadel/code/_onclick/hud/screen_objects.dm
+++ b/modular_citadel/code/_onclick/hud/screen_objects.dm
@@ -18,10 +18,11 @@
var/mob/living/carbon/C = usr
C.toggle_combat_mode()
-/obj/screen/combattoggle/proc/rebasetointerbay(mob/living/carbon/C)
- if(!C)
+/obj/screen/combattoggle/update_icon_state()
+ var/mob/living/carbon/user = hud?.mymob
+ if(!istype(user))
return
- if(C.combatmode)
+ if(user.combatmode)
icon_state = "combat"
else
icon_state = "combat_off"
@@ -36,10 +37,11 @@
var/mob/living/carbon/C = usr
C.toggle_vore_mode()
-/obj/screen/voretoggle/proc/rebaseintomygut(mob/living/carbon/C)
- if(!C)
+/obj/screen/voretoggle/update_icon_state()
+ var/mob/living/carbon/user = hud?.mymob
+ if(!istype(user))
return
- if(C.voremode && !C.combatmode)
+ if(user.voremode && !user.combatmode)
icon_state = "nom"
else
icon_state = "nom_off"
diff --git a/modular_citadel/code/_onclick/hud/sprint.dm b/modular_citadel/code/_onclick/hud/sprint.dm
index 290fcd368e..c1c81b6d5b 100644
--- a/modular_citadel/code/_onclick/hud/sprint.dm
+++ b/modular_citadel/code/_onclick/hud/sprint.dm
@@ -12,10 +12,11 @@
var/mob/living/carbon/human/H = usr
H.togglesprint()
-/obj/screen/sprintbutton/proc/insert_witty_toggle_joke_here(mob/living/carbon/human/H)
- if(!H)
+/obj/screen/sprintbutton/update_icon_state()
+ var/mob/living/user = hud?.mymob
+ if(!istype(user))
return
- if(H.sprinting)
+ if(user.sprinting)
icon_state = "act_sprint_on"
else
icon_state = "act_sprint"
diff --git a/modular_citadel/code/_onclick/hud/stamina.dm b/modular_citadel/code/_onclick/hud/stamina.dm
index 781b7cb25f..184e3add24 100644
--- a/modular_citadel/code/_onclick/hud/stamina.dm
+++ b/modular_citadel/code/_onclick/hud/stamina.dm
@@ -13,31 +13,16 @@
var/mob/living/L = usr
to_chat(L, "You have [L.getStaminaLoss()] stamina loss.
Your stamina buffer can take [L.stambuffer] stamina loss, and will use 50% of that stamina loss when recharging.
Your stamina buffer is [(L.stambuffer*(100/L.stambuffer))-(L.bufferedstam*(100/L.stambuffer))]% full.")
-/mob/living/carbon/human/proc/staminahudamount()
- if(stat == DEAD || recoveringstam)
- return "staminacrit"
+/obj/screen/staminas/update_icon_state()
+ var/mob/living/carbon/user = hud?.mymob
+ if(!user)
+ return
+ if(user.stat == DEAD || user.recoveringstam || (user.hal_screwyhud in 1 to 2))
+ icon_state = "staminacrit"
+ else if(user.hal_screwyhud == 5)
+ icon_state = "stamina0"
else
- switch(hal_screwyhud)
- if(1 to 2)
- return "staminacrit"
- if(5)
- return "stamina0"
- else
- switch(100 - getStaminaLoss())
- if(100 to INFINITY)
- return "stamina0"
- if(80 to 100)
- return "stamina1"
- if(60 to 80)
- return "stamina2"
- if(40 to 60)
- return "stamina3"
- if(20 to 40)
- return "stamina4"
- if(0 to 20)
- return "stamina5"
- else
- return "stamina6"
+ icon_state = "stamina[CLAMP(FLOOR(user.getStaminaLoss() /20, 1), 0, 6)]"
//stam buffer
/obj/screen/staminabuffer
@@ -48,31 +33,29 @@
layer = ABOVE_HUD_LAYER + 0.1
mouse_opacity = 0
-/mob/living/carbon/human/proc/staminabufferhudamount()
- if(stat == DEAD || recoveringstam)
- return "stambuffer7"
+/obj/screen/staminabuffer/update_icon_state()
+ var/mob/living/carbon/user = hud?.mymob
+ if(!user)
+ return
+ if(user.stat == DEAD || user.recoveringstam || (user.hal_screwyhud in 1 to 2))
+ icon_state = "stambuffer7"
+ else if(user.hal_screwyhud == 5)
+ icon_state = "stambuffer0"
else
- switch(hal_screwyhud)
- if(1 to 2)
- return "stambuffer7"
- if(5)
- return "stambuffer0"
+ switch(user.bufferedstam / user.stambuffer)
+ if(0.95 to INFINITY)
+ icon_state = "stambuffer7"
+ if(0.9 to 0.95)
+ icon_state = "stambuffer6"
+ if(0.8 to 0.9)
+ icon_state = "stambuffer5"
+ if(0.6 to 0.8)
+ icon_state = "stambuffer4"
+ if(0.4 to 0.6)
+ icon_state = "stambuffer3"
+ if(0.2 to 0.4)
+ icon_state = "stambuffer2"
+ if(0.05 to 0.2)
+ icon_state = "stambuffer1"
else
- var/percentmult = 100/stambuffer
- switch(stambuffer*percentmult - bufferedstam*percentmult)
- if(95 to INFINITY)
- return "stambuffer0"
- if(90 to 95)
- return "stambuffer1"
- if(80 to 90)
- return "stambuffer2"
- if(60 to 80)
- return "stambuffer3"
- if(40 to 60)
- return "stambuffer4"
- if(20 to 40)
- return "stambuffer5"
- if(5 to 20)
- return "stambuffer6"
- else
- return "stambuffer7"
+ icon_state = "stambuffer0"
diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm
index b8f3bd1cc1..d5f2e3cbd1 100644
--- a/modular_citadel/code/modules/client/loadout/suit.dm
+++ b/modular_citadel/code/modules/client/loadout/suit.dm
@@ -69,6 +69,16 @@
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/hooded/wintercoat/aformal
+/datum/gear/coat/runed
+ name = "Runed winter coat"
+ category = SLOT_WEAR_SUIT
+ path = /obj/item/clothing/suit/hooded/wintercoat/narsie/fake
+
+/datum/gear/coat/brass
+ name = "Brass winter coat"
+ category = SLOT_WEAR_SUIT
+ path = /obj/item/clothing/suit/hooded/wintercoat/ratvar/fake
+
/* Commented out until it is "balanced"
/datum/gear/coat/sec
name = "Security winter coat"
diff --git a/modular_citadel/code/modules/clothing/clothing.dm b/modular_citadel/code/modules/clothing/clothing.dm
deleted file mode 100644
index 843b7a84c9..0000000000
--- a/modular_citadel/code/modules/clothing/clothing.dm
+++ /dev/null
@@ -1,91 +0,0 @@
-/* //
-// GLOBALIZED POLYCHROME FOR ALL CLOTHING //
-// //
-// NOTICE: POLYCHROME STUFF MUST USE ALTERNATE_WORN_ICON AND PLACE THEIR OVERLAYS IN BOTH THE ICON AND ALTERNATE_WORN_ICON //
-// //
-*/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// COPYPASTE THE FOLLOWING PROC TO WHATEVER CATERGORY OF CLOTHING YOU WANT TO POLYCHROME
-
-// THIS IS REQUIRED DUE TO EACH CLOTHING CATEGORY HAVING A SNOWFLAKE WORN_OVERLAYS() THING
-
-// Don't forget to append the appropriate typepath! Also, refer to polychromic_clothes.dm for example implementations
-
-/*
-/obj/item/clothing/worn_overlays(isinhands, icon_file) //this is where the main magic happens. Also mandates that ALL polychromic stuff MUST USE alternate_worn_icon
- . = ..()
- if(hasprimary | hassecondary | hastertiary)
- if(!isinhands) //prevents the worn sprites from showing up if you're just holding them
- if(hasprimary) //checks if overlays are enabled
- var/mutable_appearance/primary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-primary") //automagical sprite selection
- primary_worn.color = primary_color //colors the overlay
- . += primary_worn //adds the overlay onto the buffer list to draw on the mob sprite.
- if(hassecondary)
- var/mutable_appearance/secondary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-secondary")
- secondary_worn.color = secondary_color
- . += secondary_worn
- if(hastertiary)
- var/mutable_appearance/tertiary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-tertiary")
- tertiary_worn.color = tertiary_color
- . += tertiary_worn
-*/
-
-/obj/item/clothing/
- var/hasprimary = FALSE //These vars allow you to choose which overlays a clothing has
- var/hassecondary = FALSE
- var/hastertiary = FALSE
- var/primary_color = "#FFFFFF" //RGB in hexcode
- var/secondary_color = "#FFFFFF"
- var/tertiary_color = "#808080"
-
- var/force_alternate_icon = FALSE
-
-/obj/item/clothing/update_icon() // picks the colored overlays from the ICON file
- ..()
- if(hasprimary) //Checks if the overlay is enabled
- var/mutable_appearance/primary_overlay = mutable_appearance(icon, "[item_color]-primary") //Automagically picks overlays
- primary_overlay.color = primary_color //Colors the greyscaled overlay
- add_overlay(primary_overlay) //Applies the coloured overlay onto the item sprite. but NOT the mob sprite.
- if(hassecondary)
- var/mutable_appearance/secondary_overlay = mutable_appearance(icon, "[item_color]-secondary")
- secondary_overlay.color = secondary_color
- add_overlay(secondary_overlay)
- if(hastertiary)
- var/mutable_appearance/tertiary_overlay = mutable_appearance(icon, "[item_color]-tertiary")
- tertiary_overlay.color = tertiary_color
- add_overlay(tertiary_overlay)
-
-/obj/item/clothing/AltClick(mob/living/user)
- . = ..()
- if(hasprimary | hassecondary | hastertiary)
- var/choice = input(user,"polychromic thread options", "Clothing Recolor") as null|anything in list("[hasprimary ? "Primary Color" : ""]", "[hassecondary ? "Secondary Color" : ""]", "[hastertiary ? "Tertiary Color" : ""]") //generates a list depending on the enabled overlays
- switch(choice) //Lets the list's options actually lead to something
- if("Primary Color")
- var/primary_color_input = input(usr,"","Choose Primary Color",primary_color) as color|null //color input menu, the "|null" adds a cancel button to it.
- if(primary_color_input) //Checks if the color selected is NULL, rejects it if it is NULL.
- primary_color = sanitize_hexcolor(primary_color_input, desired_format=6, include_crunch=1) //formats the selected color properly
- update_icon() //updates the item icon
- user.regenerate_icons() //updates the worn icon. Probably a bad idea, but it works.
- if("Secondary Color")
- var/secondary_color_input = input(usr,"","Choose Secondary Color",secondary_color) as color|null
- if(secondary_color_input)
- secondary_color = sanitize_hexcolor(secondary_color_input, desired_format=6, include_crunch=1)
- update_icon()
- user.regenerate_icons()
- if("Tertiary Color")
- var/tertiary_color_input = input(usr,"","Choose Tertiary Color",tertiary_color) as color|null
- if(tertiary_color_input)
- tertiary_color = sanitize_hexcolor(tertiary_color_input, desired_format=6, include_crunch=1)
- update_icon()
- user.regenerate_icons()
- return TRUE
-
-/obj/item/clothing/examine(mob/user)
- . = ..()
- if(hasprimary | hassecondary | hastertiary)
- . += "Alt-click to recolor it."
-
-/obj/item/clothing/Initialize()
- ..()
- if(hasprimary | hassecondary | hastertiary)
- update_icon() //Applies the overlays and default colors onto the clothes on spawn.
\ No newline at end of file
diff --git a/modular_citadel/code/modules/mob/living/carbon/carbon.dm b/modular_citadel/code/modules/mob/living/carbon/carbon.dm
index 1c6b957d9f..34ea0e789f 100644
--- a/modular_citadel/code/modules/mob/living/carbon/carbon.dm
+++ b/modular_citadel/code/modules/mob/living/carbon/carbon.dm
@@ -41,18 +41,16 @@
playsound_local(src, 'sound/misc/ui_toggleoff.ogg', 50, FALSE, pressure_affected = FALSE) //Slightly modified version of the above!
if(client)
client.show_popup_menus = !combatmode // So we can right-click for alternate actions and all that other good shit. Also moves examine to shift+rightclick to make it possible to attack while sprinting
- if(hud_used && hud_used.static_inventory)
- for(var/obj/screen/combattoggle/selector in hud_used.static_inventory)
- selector.rebasetointerbay(src)
+ var/obj/screen/combattoggle/T = locate() in hud_used?.static_inventory
+ T?.update_icon_state()
combatmessagecooldown = 10 SECONDS + world.time //This is set 100% of the time to make sure squeezing regen out of process cycles doesn't result in the combat mode message getting spammed
SEND_SIGNAL(src, COMSIG_COMBAT_TOGGLED, src, combatmode)
return TRUE
mob/living/carbon/proc/toggle_vore_mode()
voremode = !voremode
- if(hud_used && hud_used.static_inventory)
- for(var/obj/screen/voretoggle/selector in hud_used.static_inventory)
- selector.rebaseintomygut(src)
+ var/obj/screen/voretoggle/T = locate() in hud_used?.static_inventory
+ T?.update_icon_state()
if(combatmode)
return FALSE //let's not override the main draw of the game these days
SEND_SIGNAL(src, COMSIG_VORE_TOGGLED, src, voremode)
diff --git a/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm b/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm
index 15e08907d5..0b6903c9fe 100644
--- a/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm
@@ -1,6 +1,3 @@
-/mob/living/carbon/human
- var/sprinting = FALSE
-
/mob/living/carbon/human/Move(NewLoc, direct)
var/oldpseudoheight = pseudo_z_axis
. = ..()
@@ -28,9 +25,8 @@
playsound_local(src, 'sound/misc/sprintactivate.ogg', 50, FALSE, pressure_affected = FALSE)
else
playsound_local(src, 'sound/misc/sprintdeactivate.ogg', 50, FALSE, pressure_affected = FALSE)
- if(hud_used && hud_used.static_inventory)
- for(var/obj/screen/sprintbutton/selector in hud_used.static_inventory)
- selector.insert_witty_toggle_joke_here(src)
+ var/obj/screen/sprintbutton/S = locate() in hud_used?.static_inventory
+ S?.update_icon_state()
return TRUE
/mob/living/carbon/human/proc/sprint_hotkey(targetstatus)
diff --git a/modular_citadel/code/modules/mob/living/living.dm b/modular_citadel/code/modules/mob/living/living.dm
index 16bf776171..513a80cae0 100644
--- a/modular_citadel/code/modules/mob/living/living.dm
+++ b/modular_citadel/code/modules/mob/living/living.dm
@@ -1,4 +1,5 @@
/mob/living
+ var/sprinting = FALSE
var/recoveringstam = FALSE
var/incomingstammult = 1
var/bufferedstam = 0
diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm b/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm
index 59630186d1..3f88513372 100644
--- a/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm
+++ b/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm
@@ -1,6 +1,3 @@
-/mob/living/silicon/robot
- var/sprinting = FALSE
-
/mob/living/silicon/robot/Move(NewLoc, direct)
. = ..()
if(. && sprinting && !(movement_type & FLYING) && canmove && !resting)
@@ -24,9 +21,8 @@
if(shutdown)
playsound_local(src, 'sound/effects/light_flicker.ogg', 50, FALSE, pressure_affected = FALSE)
playsound_local(src, 'sound/misc/sprintdeactivate.ogg', 50, FALSE, pressure_affected = FALSE)
- if(hud_used && hud_used.static_inventory)
- for(var/obj/screen/sprintbutton/selector in hud_used.static_inventory)
- selector.insert_witty_toggle_joke_here(src)
+ var/obj/screen/sprintbutton/S = locate() in hud_used?.static_inventory
+ S?.update_icon_state()
return TRUE
/mob/living/silicon/robot/proc/sprint_hotkey(targetstatus)
diff --git a/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm b/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm
index b039eb9b42..8cb56803b1 100644
--- a/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm
+++ b/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm
@@ -50,7 +50,7 @@
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-/datum/design/m45 //Kinda NT in throey
+/datum/design/m45 //Kinda NT in theory
name = "handgun magazine (.45)"
id = "m45"
build_type = PROTOLATHE
@@ -68,3 +68,13 @@
build_path = /obj/item/ammo_box/magazine/pistolm9mm
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+/datum/design/sl357
+ name = "revolver speedloader (.357)"
+ desc = "A revolver speedloader."
+ id = "sl357"
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 30000)
+ build_path = /obj/item/ammo_box/a357
+ category = list("Ammo")
+ departmental_flags = DEPARTMENTAL_FLAG_SECURITY
diff --git a/modular_citadel/icons/polyclothes/item/uniform.dmi b/modular_citadel/icons/polyclothes/item/uniform.dmi
deleted file mode 100644
index 87c3479a6a..0000000000
Binary files a/modular_citadel/icons/polyclothes/item/uniform.dmi and /dev/null differ
diff --git a/modular_citadel/icons/polyclothes/mob/uniform.dmi b/modular_citadel/icons/polyclothes/mob/uniform.dmi
deleted file mode 100644
index 15b5262bab..0000000000
Binary files a/modular_citadel/icons/polyclothes/mob/uniform.dmi and /dev/null differ
diff --git a/tgstation.dme b/tgstation.dme
index 20cbea540c..5526e5eaf0 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -199,7 +199,6 @@
#include "code\_onclick\hud\ghost.dm"
#include "code\_onclick\hud\guardian.dm"
#include "code\_onclick\hud\hud.dm"
-#include "code\_onclick\hud\hud_cit.dm"
#include "code\_onclick\hud\human.dm"
#include "code\_onclick\hud\lavaland_elite.dm"
#include "code\_onclick\hud\monkey.dm"
@@ -483,6 +482,7 @@
#include "code\datums\martial\mushpunch.dm"
#include "code\datums\martial\plasma_fist.dm"
#include "code\datums\martial\psychotic_brawl.dm"
+#include "code\datums\martial\rising_bass.dm"
#include "code\datums\martial\sleeping_carp.dm"
#include "code\datums\martial\wrestling.dm"
#include "code\datums\mood_events\beauty_events.dm"
@@ -1663,6 +1663,7 @@
#include "code\modules\clothing\under\color.dm"
#include "code\modules\clothing\under\miscellaneous.dm"
#include "code\modules\clothing\under\pants.dm"
+#include "code\modules\clothing\under\polychromic_clothes.dm"
#include "code\modules\clothing\under\shorts.dm"
#include "code\modules\clothing\under\syndicate.dm"
#include "code\modules\clothing\under\trek.dm"
@@ -3110,12 +3111,10 @@
#include "modular_citadel\code\modules\client\loadout\suit.dm"
#include "modular_citadel\code\modules\client\loadout\uniform.dm"
#include "modular_citadel\code\modules\client\verbs\who.dm"
-#include "modular_citadel\code\modules\clothing\clothing.dm"
#include "modular_citadel\code\modules\clothing\neck.dm"
#include "modular_citadel\code\modules\clothing\spacesuits\flightsuit.dm"
#include "modular_citadel\code\modules\clothing\suits\polychromic_cloaks.dm"
#include "modular_citadel\code\modules\clothing\suits\suits.dm"
-#include "modular_citadel\code\modules\clothing\under\polychromic_clothes.dm"
#include "modular_citadel\code\modules\clothing\under\trek_under.dm"
#include "modular_citadel\code\modules\clothing\under\turtlenecks.dm"
#include "modular_citadel\code\modules\clothing\under\under.dm"