diff --git a/_maps/configs/inteq_colossus.json b/_maps/configs/inteq_colossus.json
index 29337cb015a2..718ecb9f1295 100644
--- a/_maps/configs/inteq_colossus.json
+++ b/_maps/configs/inteq_colossus.json
@@ -18,7 +18,7 @@
"limit": 1,
"job_slots": {
"Vanguard": {
- "outfit": "/datum/outfit/job/inteq/captain",
+ "outfit": "/datum/outfit/job/inteq/captain/empty",
"officer": true,
"slots": 1
},
diff --git a/_maps/configs/inteq_hound.json b/_maps/configs/inteq_hound.json
index cad19884158f..3d3617263f61 100644
--- a/_maps/configs/inteq_hound.json
+++ b/_maps/configs/inteq_hound.json
@@ -17,7 +17,7 @@
"limit": 2,
"job_slots": {
"Vanguard": {
- "outfit": "/datum/outfit/job/inteq/captain",
+ "outfit": "/datum/outfit/job/inteq/captain/empty",
"officer": true,
"slots": 1
},
diff --git a/_maps/configs/inteq_talos.json b/_maps/configs/inteq_talos.json
index 207b29eca77b..54f134964470 100644
--- a/_maps/configs/inteq_talos.json
+++ b/_maps/configs/inteq_talos.json
@@ -18,7 +18,7 @@
"limit": 1,
"job_slots": {
"Vanguard": {
- "outfit": "/datum/outfit/job/inteq/captain",
+ "outfit": "/datum/outfit/job/inteq/captain/empty",
"officer": true,
"slots": 1
},
diff --git a/_maps/configs/inteq_valor.json b/_maps/configs/inteq_valor.json
index 92162ac1a5da..1a3c957cc7b9 100644
--- a/_maps/configs/inteq_valor.json
+++ b/_maps/configs/inteq_valor.json
@@ -23,9 +23,18 @@
"officer": true,
"slots": 1
},
+ "Shuttle Pilot": {
+ "outfit": "/datum/outfit/job/inteq/warden/pilot",
+ "officer": true,
+ "slots": 1
+ },
+ "Shuttle Corpsman": {
+ "outfit": "/datum/outfit/job/inteq/paramedic/empty",
+ "slots": 1
+ },
"Corpsman": {
"outfit": "/datum/outfit/job/inteq/paramedic/empty",
- "slots": 3
+ "slots": 2
},
"Enforcer": {
"outfit": "/datum/outfit/job/inteq/security/empty",
diff --git a/_maps/configs/inteq_vaquero.json b/_maps/configs/inteq_vaquero.json
index e8d790a526dc..459b7353d292 100644
--- a/_maps/configs/inteq_vaquero.json
+++ b/_maps/configs/inteq_vaquero.json
@@ -15,7 +15,7 @@
"limit": 1,
"job_slots": {
"Vanguard": {
- "outfit": "/datum/outfit/job/inteq/captain",
+ "outfit": "/datum/outfit/job/inteq/captain/empty",
"officer": true,
"slots": 1
},
diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm
index b98d0f2f13cd..1d0c4910e49e 100644
--- a/_maps/shuttles/inteq/inteq_valor.dmm
+++ b/_maps/shuttles/inteq/inteq_valor.dmm
@@ -81,27 +81,8 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo)
"aW" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/airlock/grunge{
- name = "Medbay"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/turf_decal/borderfloorblack{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
- dir = 8
- },
-/obj/effect/turf_decal/siding/thinplating/dark/corner,
-/turf/open/floor/plasteel/dark,
-/area/ship/medical)
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
"bh" = (
/obj/structure/railing{
dir = 6
@@ -115,34 +96,15 @@
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"bv" = (
-/obj/effect/turf_decal/box/white/corners,
-/obj/effect/turf_decal/box/white/corners{
- dir = 4
- },
-/obj/effect/turf_decal/siding/thinplating,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/structure/closet/secure_closet{
- icon_state = "med_secure";
- name = "corpsman's locker";
- req_access = list(5)
- },
-/obj/item/clothing/under/syndicate/inteq/corpsman,
-/obj/item/clothing/under/syndicate/inteq/skirt/corpsman,
-/obj/item/clothing/suit/armor/inteq/corpsman,
-/obj/item/clothing/head/soft/inteq/corpsman,
-/obj/item/storage/backpack/messenger/med,
-/obj/item/storage/backpack/medic,
-/obj/item/pinpointer/crew,
-/obj/item/storage/belt/medical/webbing,
-/obj/item/storage/firstaid/regular,
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/machinery/suit_storage_unit/inherit,
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plasteel,
/area/ship/crew/office)
"bx" = (
-/obj/effect/turf_decal/borderfloor{
- dir = 4
- },
-/obj/structure/closet/firecloset/wall/directional/north,
-/turf/open/floor/plasteel/patterned,
+/obj/structure/tank_dispenser/oxygen,
+/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
"bB" = (
/turf/closed/wall/mineral/plastitanium,
@@ -262,14 +224,10 @@
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/maintenance/port)
"cE" = (
-/obj/effect/turf_decal/borderfloor{
- dir = 8
- },
-/obj/structure/extinguisher_cabinet/directional/south,
-/turf/open/floor/plasteel/patterned,
+/obj/machinery/autolathe,
+/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"cI" = (
-/obj/structure/catwalk/over/plated_catwalk,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -279,8 +237,12 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel/tech/grid,
+/obj/machinery/light_switch{
+ pixel_y = 20
+ },
+/turf/open/floor/plasteel/stairs{
+ dir = 8
+ },
/area/ship/cargo)
"cW" = (
/obj/effect/turf_decal/spline/fancy/opaque/black{
@@ -389,6 +351,7 @@
/obj/effect/turf_decal/trimline/opaque/brown/line{
dir = 1
},
+/obj/structure/chair,
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"dG" = (
@@ -457,6 +420,10 @@
/obj/effect/turf_decal/box/corners{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 1
+ },
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"ec" = (
@@ -508,7 +475,6 @@
/area/ship/bridge)
"el" = (
/obj/docking_port/mobile{
- can_move_docking_ports = 1;
dir = 2;
name = "valor docking port";
port_direction = 8;
@@ -532,10 +498,16 @@
/obj/item/storage/box/zipties,
/obj/item/reagent_containers/spray/pepper,
/obj/item/megaphone/sec,
-/obj/item/clothing/suit/armor/vest/alt,
-/obj/item/clothing/suit/armor/vest/alt,
+/obj/item/clothing/suit/armor/vest,
+/obj/item/clothing/suit/armor/vest,
/obj/item/kitchen/knife/combat/survival,
/obj/item/kitchen/knife/combat/survival,
+/obj/machinery/recharger{
+ pixel_x = -16;
+ pixel_y = 5
+ },
+/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
+/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
/turf/open/floor/plasteel/dark,
/area/ship/security)
"ey" = (
@@ -558,21 +530,28 @@
"eU" = (
/obj/structure/table,
/obj/item/storage/backpack/duffelbag/med/surgery{
- pixel_x = -2;
- pixel_y = 7
+ pixel_x = -7;
+ pixel_y = 10
},
/obj/item/reagent_containers/medigel/sterilizine{
- pixel_x = 8;
+ pixel_x = -1;
pixel_y = 3
},
/obj/effect/turf_decal/borderfloorwhite,
+/obj/machinery/button/door{
+ id = "valor_surgery";
+ name = "Privacy Shutters";
+ pixel_y = 8;
+ dir = 1;
+ pixel_x = 8
+ },
/turf/open/floor/plasteel/white,
/area/ship/medical)
"eV" = (
-/obj/structure/closet/firecloset/wall/directional/south,
/obj/structure/cable{
icon_state = "1-4"
},
+/obj/structure/closet/firecloset/wall/directional/south,
/turf/open/floor/plating,
/area/ship/maintenance/port)
"eZ" = (
@@ -600,14 +579,19 @@
/obj/effect/spawner/lootdrop/ration,
/obj/effect/spawner/lootdrop/ration,
/obj/item/storage/ration/crayons,
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"fj" = (
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 1
},
-/obj/structure/closet/secure_closet/medical2,
/obj/machinery/airalarm/directional/north,
+/obj/machinery/vending/medical/syndicate_access{
+ name = "\improper InteqMed Plus"
+ },
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"fE" = (
@@ -630,7 +614,8 @@
/area/ship/cargo)
"fK" = (
/obj/machinery/computer/crew{
- dir = 8
+ dir = 8;
+ icon_state = "computer-middle"
},
/obj/effect/turf_decal/corner/opaque/yellow,
/obj/effect/turf_decal/corner/opaque/brown{
@@ -642,33 +627,43 @@
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"fN" = (
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/inteq,
-/obj/item/clothing/head/helmet/space/inteq,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/siding/thinplating/corner{
+ dir = 4
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
"fO" = (
/obj/structure/closet/secure_closet{
- icon_state = "med_secure";
- name = "corpsman's locker";
- req_access = list(5)
+ icon_state = "prisoner";
+ name = "shuttle pilot locker";
+ req_access = list(3);
+ icon_door = "prisoner"
},
-/obj/item/clothing/under/syndicate/inteq/corpsman,
-/obj/item/clothing/under/syndicate/inteq/skirt/corpsman,
-/obj/item/clothing/suit/armor/inteq/corpsman,
-/obj/item/clothing/head/soft/inteq/corpsman,
-/obj/effect/turf_decal/siding/thinplating,
-/obj/item/storage/backpack/messenger/med,
-/obj/item/storage/backpack/medic,
-/obj/item/pinpointer/crew,
-/obj/item/storage/belt/medical/webbing,
-/obj/item/storage/firstaid/regular,
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/item/clothing/head/beret/sec/inteq,
+/obj/item/clothing/head/soft/inteq,
+/obj/item/clothing/suit/armor/vest/alt,
+/obj/item/radio/headset/inteq,
+/obj/item/clothing/gloves/fingerless,
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
+/obj/item/clothing/head/helmet/swat/inteq,
+/obj/item/clothing/mask/gas/sechailer,
+/turf/open/floor/plasteel,
/area/ship/crew/office)
"gb" = (
/obj/effect/turf_decal/siding/thinplating{
dir = 10
},
+/obj/machinery/light/directional/west,
+/obj/structure/chair/sofa/brown/left{
+ dir = 1
+ },
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/port)
"gh" = (
@@ -678,14 +673,14 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
},
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "2-8"
},
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/port)
@@ -740,14 +735,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"gq" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/machinery/light/small/directional/east,
-/obj/machinery/light_switch{
- dir = 8;
- pixel_x = 20
- },
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
"gt" = (
/obj/effect/decal/cleanable/dirt,
@@ -767,11 +755,12 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/cable{
- icon_state = "1-8"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"gZ" = (
@@ -796,6 +785,9 @@
"hl" = (
/obj/effect/turf_decal/siding/thinplating,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/chair/sofa/brown/right{
+ dir = 1
+ },
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/port)
"hm" = (
@@ -870,7 +862,7 @@
dir = 8;
pixel_x = 12
},
-/turf/open/floor/plasteel/white,
+/turf/open/floor/plasteel/patterned/brushed,
/area/ship/medical)
"id" = (
/obj/structure/cable{
@@ -897,6 +889,7 @@
},
/obj/structure/chair/sofa/brown/left/directional/west,
/obj/structure/closet/firecloset/wall/directional/south,
+/obj/machinery/computer/helm/viewscreen/directional/east,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"ix" = (
@@ -912,13 +905,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
-"iI" = (
-/obj/effect/turf_decal/industrial/traffic{
- dir = 8
- },
-/obj/effect/turf_decal/industrial/traffic/corner,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
"iN" = (
/obj/effect/turf_decal/siding/thinplating{
dir = 5
@@ -971,7 +957,11 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/turf/open/floor/plasteel/patterned/cargo_one,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"jk" = (
/obj/structure/cable{
@@ -1017,15 +1007,9 @@
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"jG" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/industrial/traffic{
- dir = 8
- },
-/obj/effect/turf_decal/industrial/stand_clear{
- dir = 4
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/obj/machinery/rnd/server,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/medical)
"jL" = (
/obj/structure/grille,
/obj/structure/window/plasma/reinforced/plastitanium,
@@ -1036,12 +1020,13 @@
/turf/open/floor/plating,
/area/ship/medical)
"jN" = (
-/obj/structure/chair/office/light,
+/obj/structure/chair/office,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable{
icon_state = "0-4"
},
-/turf/open/floor/plasteel/patterned,
+/obj/effect/turf_decal/corner/transparent/inteqbrown/half,
+/turf/open/floor/plasteel,
/area/ship/crew/office)
"jQ" = (
/obj/structure/catwalk/over/plated_catwalk,
@@ -1068,14 +1053,18 @@
/turf/closed/wall/mineral/plastitanium,
/area/ship/bridge)
"jT" = (
-/obj/structure/sign/poster/contraband/cardinal_port_starboard{
- pixel_y = 32
+/obj/structure/rack,
+/obj/item/roller,
+/obj/item/roller{
+ pixel_x = -1;
+ pixel_y = 8
},
-/obj/effect/turf_decal/techfloor{
- dir = 8
+/obj/item/roller{
+ pixel_x = 1;
+ pixel_y = 16
},
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/medical)
"jU" = (
/obj/effect/turf_decal/siding/thinplating{
dir = 10
@@ -1130,20 +1119,11 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
-"ky" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/plating,
-/area/ship/hallway/port)
"kG" = (
/obj/effect/turf_decal/techfloor{
dir = 8
},
+/obj/structure/closet/crate/bin,
/turf/open/floor/plasteel/tech,
/area/ship/hallway/central)
"kH" = (
@@ -1186,19 +1166,20 @@
"kL" = (
/obj/machinery/light/directional/south,
/obj/structure/rack,
+/obj/item/stack/sheet/metal/fifty,
+/obj/item/stack/sheet/glass/fifty,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"kW" = (
-/obj/effect/turf_decal/techfloor{
- dir = 4
+/obj/effect/turf_decal/siding/thinplating/dark/corner,
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 8
},
-/obj/structure/closet/crate/bin,
-/obj/item/trash/chips,
-/obj/item/trash/energybar,
-/obj/item/trash/cheesie,
-/obj/item/trash/pistachios,
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/obj/machinery/door/airlock/grunge{
+ name = "Medbay"
+ },
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
"lc" = (
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/structure/cable{
@@ -1278,10 +1259,6 @@
/area/ship/crew/canteen)
"lN" = (
/obj/structure/table,
-/obj/machinery/computer/med_data/laptop{
- dir = 1;
- pixel_y = 8
- },
/obj/machinery/door/window/southleft,
/obj/structure/window/reinforced{
dir = 8
@@ -1290,6 +1267,7 @@
/obj/machinery/door/firedoor/border_only{
dir = 1
},
+/obj/effect/turf_decal/corner/transparent/inteqbrown/full,
/turf/open/floor/plasteel/patterned,
/area/ship/crew/office)
"lW" = (
@@ -1361,8 +1339,11 @@
/turf/open/floor/plasteel/tech,
/area/ship/medical)
"mt" = (
-/obj/machinery/autolathe,
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/structure/rack,
+/obj/item/tank/internals/plasmaman/full,
+/obj/item/tank/internals/plasmaman/full,
+/obj/item/tank/internals/plasmaman/full,
+/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
"mw" = (
/obj/effect/turf_decal/trimline/opaque/brown/warning{
@@ -1412,30 +1393,19 @@
/turf/open/floor/plasteel/dark,
/area/ship/crew/dorm)
"mG" = (
-/obj/structure/closet/secure_closet{
- icon_state = "med_secure";
- name = "corpsman's locker";
- req_access = list(5)
- },
-/obj/item/clothing/under/syndicate/inteq/corpsman,
-/obj/item/clothing/under/syndicate/inteq/skirt/corpsman,
-/obj/item/clothing/suit/armor/inteq/corpsman,
-/obj/item/clothing/head/soft/inteq/corpsman,
-/obj/effect/turf_decal/box/white/corners{
+/obj/effect/turf_decal/corner/transparent/inteqbrown/border{
dir = 1
},
-/obj/effect/turf_decal/box/white/corners{
- dir = 8
+/obj/structure/table,
+/obj/item/book/manual/wiki/piloting{
+ pixel_x = 7;
+ pixel_y = 7
},
-/obj/effect/turf_decal/siding/thinplating{
- dir = 10
+/obj/item/flashlight/lamp{
+ pixel_x = -8;
+ pixel_y = 11
},
-/obj/item/storage/backpack/messenger/med,
-/obj/item/storage/backpack/medic,
-/obj/item/pinpointer/crew,
-/obj/item/storage/belt/medical/webbing,
-/obj/item/storage/firstaid/regular,
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel,
/area/ship/crew/office)
"mH" = (
/obj/machinery/power/apc/auto_name/directional/east,
@@ -1537,7 +1507,7 @@
dir = 1
},
/obj/machinery/door/airlock/medical/glass{
- name = "Surgical Bay #2"
+ name = "Surgical Bay"
},
/turf/open/floor/plasteel/white,
/area/ship/medical)
@@ -1601,13 +1571,6 @@
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"oz" = (
-/obj/structure/railing{
- dir = 4;
- layer = 2.9
- },
-/obj/effect/turf_decal/borderfloor/corner{
- dir = 4
- },
/obj/structure/cable{
icon_state = "6-8"
},
@@ -1615,8 +1578,8 @@
/area/ship/cargo)
"oC" = (
/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/inteq,
-/obj/item/clothing/head/helmet/space/inteq,
+/obj/item/clothing/suit/space/orange,
+/obj/item/clothing/head/helmet/space/orange,
/obj/effect/turf_decal/techfloor{
dir = 1
},
@@ -1754,10 +1717,8 @@
/area/ship/crew/cryo)
"pC" = (
/obj/structure/table/optable,
-/obj/machinery/defibrillator_mount/loaded{
- pixel_x = -28
- },
-/turf/open/floor/plasteel/white,
+/obj/structure/curtain,
+/turf/open/floor/plasteel/patterned/brushed,
/area/ship/medical)
"pL" = (
/obj/machinery/power/terminal{
@@ -1801,22 +1762,44 @@
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"qe" = (
-/obj/effect/turf_decal/industrial/traffic,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"qk" = (
-/obj/machinery/light/small/directional/west,
-/obj/effect/turf_decal/techfloor{
+/obj/structure/closet/secure_closet{
+ icon_state = "med_secure";
+ name = "corpsman's locker";
+ req_access = list(5)
+ },
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/belt/medical/webbing,
+/obj/item/pinpointer/crew,
+/obj/item/storage/backpack/medic,
+/obj/item/storage/backpack/messenger/med,
+/obj/item/clothing/head/soft/inteq/corpsman,
+/obj/item/clothing/suit/armor/inteq/corpsman,
+/obj/item/clothing/under/syndicate/inteq/skirt/corpsman,
+/obj/item/clothing/under/syndicate/inteq/corpsman,
+/obj/effect/turf_decal/siding/thinplating{
dir = 4
},
-/obj/structure/closet/emcloset,
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/medical)
+"qk" = (
+/obj/effect/turf_decal/borderfloorblack,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/airlock/hatch,
+/turf/open/floor/plasteel/patterned,
+/area/ship/medical)
"qt" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 1
+ },
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"qA" = (
@@ -1859,6 +1842,9 @@
"qR" = (
/obj/structure/grille,
/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "valor_surgery"
+ },
/turf/open/floor/plating,
/area/ship/medical)
"qW" = (
@@ -1913,11 +1899,10 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/structure/cable{
+ icon_state = "1-8"
},
/turf/open/floor/plasteel/dark,
/area/ship/medical)
@@ -1971,7 +1956,6 @@
"sc" = (
/obj/structure/rack,
/obj/machinery/firealarm/directional/east,
-/obj/item/radio/intercom/directional/south,
/obj/item/defibrillator/loaded{
pixel_x = 3;
pixel_y = 10
@@ -1980,6 +1964,10 @@
pixel_x = -2;
pixel_y = 2
},
+/obj/machinery/smartfridge/bloodbank/preloaded{
+ density = 0;
+ pixel_y = -32
+ },
/turf/open/floor/plasteel/mono/white,
/area/ship/medical)
"se" = (
@@ -2004,27 +1992,24 @@
/obj/effect/turf_decal/borderfloorwhite{
dir = 1
},
-/obj/machinery/door/airlock/medical/glass{
- name = "Surgical Bay #1"
+/obj/machinery/door/airlock/medical{
+ name = "Morgue"
},
/turf/open/floor/plasteel/white,
/area/ship/medical)
"ss" = (
-/obj/effect/turf_decal/borderfloor{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/plasteel/patterned,
+/obj/structure/rack,
+/obj/item/pickaxe/emergency,
+/obj/item/pickaxe/emergency,
+/obj/item/pickaxe/emergency,
+/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
"su" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/opaque/brown/line{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/structure/chair,
-/obj/machinery/airalarm/directional/north,
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"sy" = (
@@ -2059,7 +2044,6 @@
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm,
-/obj/machinery/recharger,
/turf/open/floor/plasteel/dark,
/area/ship/security)
"sz" = (
@@ -2118,10 +2102,6 @@
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"te" = (
-/obj/structure/railing{
- dir = 1;
- layer = 2.9
- },
/obj/effect/turf_decal/borderfloor{
dir = 1
},
@@ -2137,6 +2117,9 @@
/obj/item/target/syndicate{
pixel_y = 5
},
+/obj/effect/turf_decal/box/corners{
+ dir = 1
+ },
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"tf" = (
@@ -2163,20 +2146,8 @@
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"tj" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/light_switch{
- pixel_y = 20
- },
-/turf/open/floor/plasteel/tech/grid,
+/obj/effect/turf_decal/industrial/traffic,
+/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"tk" = (
/obj/structure/reagent_dispensers/watertank,
@@ -2218,25 +2189,17 @@
"tS" = (
/obj/effect/turf_decal/siding/thinplating,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
- },
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/port)
"tZ" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/crew/office)
"ua" = (
-/obj/effect/turf_decal/siding/thinplating/corner,
/obj/effect/turf_decal/siding/thinplating/corner{
dir = 8
},
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/port)
"un" = (
@@ -2261,16 +2224,16 @@
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"ux" = (
-/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+/obj/effect/turf_decal/trimline/opaque/brown/warning{
+ dir = 1
},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo)
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
"uA" = (
/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
dir = 4
@@ -2293,19 +2256,16 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
- },
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/noticeboard{
pixel_y = 28
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/port)
"uS" = (
@@ -2329,12 +2289,10 @@
/turf/open/floor/plating,
/area/ship/cargo)
"vh" = (
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/inteq,
-/obj/item/clothing/head/helmet/space/inteq,
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/turf/open/floor/plating,
+/area/ship/hallway/port)
"vi" = (
/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
dir = 8
@@ -2481,7 +2439,8 @@
dir = 10
},
/obj/machinery/airalarm/directional/east,
-/turf/open/floor/plasteel/patterned,
+/obj/effect/turf_decal/corner/transparent/inteqbrown/half,
+/turf/open/floor/plasteel,
/area/ship/crew/office)
"wS" = (
/obj/machinery/power/terminal{
@@ -2506,18 +2465,12 @@
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
"xg" = (
-/obj/machinery/light/directional/south,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/machinery/door/firedoor/border_only,
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 8
},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
"xj" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/cargo)
@@ -2530,6 +2483,9 @@
dir = 1;
pixel_y = -20
},
+/obj/structure/chair{
+ dir = 8
+ },
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/port)
"xp" = (
@@ -2554,24 +2510,16 @@
"xr" = (
/obj/structure/table,
/obj/item/paper_bin,
-/obj/item/folder/white{
- pixel_x = -15;
- pixel_y = -1
- },
/obj/item/pen,
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/toy/figure/paramedic{
- name = "Corpsman action figure";
- pixel_x = -13;
- pixel_y = 14
- },
/obj/machinery/door/firedoor/border_only,
/obj/machinery/door/firedoor/border_only{
dir = 1
},
+/obj/effect/turf_decal/corner/transparent/inteqbrown/full,
/turf/open/floor/plasteel/patterned,
/area/ship/crew/office)
"xs" = (
@@ -2672,19 +2620,15 @@
dir = 4
},
/obj/structure/rack,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/stack/sheet/metal/fifty,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"yK" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/effect/turf_decal/industrial/traffic{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plating,
-/area/ship/medical)
+/obj/effect/turf_decal/industrial/traffic/corner,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
"yN" = (
/obj/structure/chair/office/dark,
/obj/effect/turf_decal/corner/opaque/brown{
@@ -2717,7 +2661,8 @@
/area/ship/maintenance/port)
"zi" = (
/obj/machinery/computer/helm{
- dir = 8
+ dir = 8;
+ icon_state = "computer-middle"
},
/obj/effect/turf_decal/corner/opaque/yellow,
/obj/effect/turf_decal/corner/opaque/brown{
@@ -2741,15 +2686,17 @@
},
/obj/machinery/airalarm/directional/south,
/obj/machinery/fax/inteq{
- pixel_y = 3
+ pixel_y = 6
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"zs" = (
-/obj/effect/turf_decal/siding/thinplating,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
+/obj/effect/turf_decal/siding/thinplating/corner,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/port)
"zA" = (
@@ -2767,23 +2714,18 @@
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"zC" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 1
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 4
},
-/obj/machinery/smartfridge/bloodbank/preloaded{
- density = 0;
- pixel_y = 32
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+ dir = 1
},
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/turf/open/floor/plasteel/mono/dark,
+/turf/open/floor/plasteel/dark,
/area/ship/medical)
"zD" = (
-/obj/machinery/computer/operating{
- dir = 4
- },
-/obj/effect/turf_decal/borderfloorwhite,
-/turf/open/floor/plasteel/white,
+/obj/effect/turf_decal/borderfloorblack,
+/obj/structure/bodycontainer/morgue,
+/turf/open/floor/plasteel/patterned/brushed,
/area/ship/medical)
"zE" = (
/obj/effect/turf_decal/siding/thinplating/dark{
@@ -2823,34 +2765,20 @@
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"zI" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/airlock/grunge{
- name = "Cargo Bay"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/turf_decal/borderfloorblack,
+/obj/machinery/door/airlock/hatch,
/turf/open/floor/plasteel/patterned,
/area/ship/medical)
"zK" = (
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/airlock/public/glass{
- name = "Supply Storage"
- },
-/obj/effect/turf_decal/corner_techfloor_grid{
- dir = 5
+/obj/docking_port/stationary{
+ dir = 4;
+ dwidth = 15;
+ height = 15;
+ name = "valor airlock dock";
+ width = 15
},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/turf/template_noop,
+/area/template_noop)
"zL" = (
/obj/structure/chair{
dir = 1
@@ -2868,22 +2796,10 @@
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"zS" = (
-/obj/structure/table,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 9
},
-/obj/item/storage/box/masks{
- pixel_x = -7;
- pixel_y = 10
- },
-/obj/item/storage/box/gloves{
- pixel_x = 8;
- pixel_y = 10
- },
-/obj/structure/sign/poster/official/walk{
- pixel_y = 32
- },
-/turf/open/floor/plasteel/mono/dark,
+/turf/open/floor/plasteel/dark,
/area/ship/medical)
"zT" = (
/obj/structure/railing,
@@ -2932,24 +2848,19 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
},
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/port)
"Au" = (
-/obj/structure/rack,
-/obj/item/roller,
-/obj/item/roller{
- pixel_x = -1;
- pixel_y = 8
- },
-/obj/item/roller{
- pixel_x = 1;
- pixel_y = 16
- },
+/obj/structure/closet/crate/freezer,
+/obj/item/reagent_containers/blood/universal,
+/obj/item/reagent_containers/blood/universal,
+/obj/item/reagent_containers/blood/universal,
+/obj/machinery/iv_drip,
/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/area/ship/medical)
"Av" = (
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
@@ -2958,17 +2869,25 @@
/area/ship/maintenance/starboard)
"AE" = (
/obj/structure/table,
+/obj/machinery/airalarm/directional/east,
+/obj/item/storage/box/gloves{
+ pixel_x = -6;
+ pixel_y = 4
+ },
/obj/item/storage/backpack/duffelbag/med/surgery{
- pixel_x = -2;
- pixel_y = 7
+ pixel_x = 4;
+ pixel_y = 14
},
-/obj/item/reagent_containers/medigel/sterilizine{
- pixel_x = 8;
- pixel_y = 3
+/obj/effect/turf_decal/borderfloorblack,
+/obj/item/reagent_containers/glass/bottle/formaldehyde{
+ pixel_x = 9;
+ pixel_y = 4
},
-/obj/machinery/airalarm/directional/east,
-/obj/effect/turf_decal/borderfloorwhite,
-/turf/open/floor/plasteel/white,
+/obj/item/reagent_containers/syringe{
+ pixel_y = -4;
+ pixel_x = -7
+ },
+/turf/open/floor/plasteel/patterned/brushed,
/area/ship/medical)
"AG" = (
/obj/structure/bed,
@@ -3069,7 +2988,10 @@
/obj/structure/sign/poster/official/help_others{
pixel_y = 32
},
-/turf/open/floor/plasteel/patterned,
+/obj/effect/turf_decal/corner/transparent/inteqbrown/border{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
/area/ship/crew/office)
"BL" = (
/obj/effect/turf_decal/corner/opaque/brown{
@@ -3090,14 +3012,11 @@
/turf/open/floor/plasteel/dark,
/area/ship/security)
"BV" = (
-/obj/structure/grille,
-/obj/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/door/poddoor/shutters{
- dir = 4;
- id = "valor_external"
+/obj/effect/turf_decal/techfloor{
+ dir = 8
},
-/obj/structure/closet/crate/bin,
-/turf/open/floor/plating,
+/obj/structure/closet/emcloset,
+/turf/open/floor/plasteel/tech,
/area/ship/hallway/central)
"Cb" = (
/obj/effect/turf_decal/industrial/traffic{
@@ -3134,14 +3053,28 @@
/turf/open/floor/plating/airless,
/area/ship/external/dark)
"CC" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/structure/closet/secure_closet{
+ icon_state = "med_secure";
+ name = "corpsman's locker";
+ req_access = list(5)
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plating,
-/area/ship/hallway/port)
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/belt/medical/webbing,
+/obj/item/pinpointer/crew,
+/obj/item/storage/backpack/medic,
+/obj/item/storage/backpack/messenger/med,
+/obj/item/clothing/head/soft/inteq/corpsman,
+/obj/item/clothing/suit/armor/inteq/corpsman,
+/obj/item/clothing/under/syndicate/inteq/skirt/corpsman,
+/obj/item/clothing/under/syndicate/inteq/corpsman,
+/obj/effect/turf_decal/box/white/corners{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 5
+ },
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/medical)
"CF" = (
/obj/structure/table/optable,
/obj/machinery/defibrillator_mount/loaded{
@@ -3309,22 +3242,15 @@
/turf/open/floor/plasteel/dark,
/area/ship/security)
"DR" = (
-/obj/machinery/door/airlock/hatch{
- name = "Cargo Bay"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/door/firedoor/border_only,
/obj/machinery/door/firedoor/border_only{
dir = 1
},
-/obj/effect/turf_decal/borderfloorblack{
- dir = 1
+/obj/effect/turf_decal/borderfloorblack,
+/obj/machinery/door/airlock/hatch{
+ name = "Port Hallway"
},
-/turf/open/floor/plasteel/tech/grid,
+/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/port)
"DT" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
@@ -3393,18 +3319,16 @@
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
"EE" = (
-/obj/effect/turf_decal/trimline/opaque/brown/line{
- dir = 5
- },
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 5
- },
-/obj/structure/chair,
-/obj/structure/extinguisher_cabinet/directional/north,
/obj/machinery/light_switch{
dir = 8;
pixel_x = 20
},
+/obj/effect/turf_decal/siding/thinplating/dark{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+ dir = 5
+ },
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"EJ" = (
@@ -3467,6 +3391,10 @@
/obj/effect/turf_decal/box/corners{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 1
+ },
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"Ff" = (
@@ -3490,18 +3418,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/medical)
-"Ft" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
"FF" = (
/obj/structure/bed,
/obj/item/bedsheet/brown,
@@ -3545,9 +3461,8 @@
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
"FY" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/stairs,
-/area/ship/cargo)
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/medical)
"FZ" = (
/obj/effect/turf_decal/siding/thinplating{
dir = 1
@@ -3571,7 +3486,8 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/patterned,
+/obj/effect/turf_decal/corner/transparent/inteqbrown/half,
+/turf/open/floor/plasteel,
/area/ship/crew/office)
"Go" = (
/obj/effect/turf_decal/corner/opaque/brown{
@@ -3625,8 +3541,11 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
},
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/port)
@@ -3640,18 +3559,14 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo)
"Hw" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/turf_decal/borderfloorblack{
dir = 1
},
-/obj/machinery/door/airlock/public/glass{
- name = "EVA Storage"
- },
-/obj/effect/turf_decal/corner_techfloor_grid{
- dir = 10
+/obj/machinery/door/airlock/hatch{
+ name = "Port Hallway"
},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo)
"HA" = (
/obj/effect/decal/cleanable/dirt/dust,
@@ -3759,10 +3674,8 @@
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"Io" = (
-/obj/machinery/rnd/server,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/turf/open/floor/plasteel/patterned,
+/area/ship/medical)
"IA" = (
/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 1
@@ -3791,15 +3704,12 @@
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"IL" = (
-/obj/effect/turf_decal/borderfloor{
- dir = 4
- },
-/obj/machinery/light_switch{
- dir = 1;
- pixel_y = -20
+/obj/effect/turf_decal/techfloor{
+ dir = 8
},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/obj/structure/closet/firecloset,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/central)
"IM" = (
/obj/effect/turf_decal/corner/opaque/brown{
dir = 4
@@ -3851,6 +3761,15 @@
"Jn" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
+/obj/structure/table,
+/obj/item/storage/box/masks{
+ pixel_x = -7;
+ pixel_y = 4
+ },
+/obj/item/storage/box/gloves{
+ pixel_x = 8;
+ pixel_y = 4
+ },
/turf/open/floor/plasteel/tech,
/area/ship/medical)
"Jt" = (
@@ -3875,19 +3794,11 @@
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"JS" = (
-/obj/structure/railing{
- dir = 9;
- layer = 2.9
- },
-/obj/effect/turf_decal/borderfloor{
- dir = 1
- },
-/obj/effect/turf_decal/box/corners{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 1
},
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/open/floor/plasteel/patterned/cargo_one,
+/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"JT" = (
/obj/docking_port/stationary{
@@ -3937,6 +3848,10 @@
/area/ship/crew/canteen)
"Kn" = (
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 1
+ },
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"Ko" = (
@@ -3962,6 +3877,10 @@
/obj/structure/cable{
icon_state = "1-4"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 1
+ },
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"Kz" = (
@@ -3999,18 +3918,9 @@
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
"KU" = (
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
/obj/structure/cable{
icon_state = "1-4"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"KV" = (
@@ -4096,12 +4006,14 @@
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Ls" = (
-/obj/effect/turf_decal/techfloor{
+/obj/effect/turf_decal/industrial/traffic{
+ dir = 8
+ },
+/obj/effect/turf_decal/industrial/stand_clear{
dir = 4
},
-/obj/structure/closet/crate/bin,
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
"LH" = (
/obj/machinery/light/floor,
/obj/structure/cable{
@@ -4121,20 +4033,38 @@
},
/obj/machinery/airalarm/directional/east,
/obj/effect/turf_decal/borderfloorwhite,
+/obj/machinery/button/door{
+ id = "valor_surgery";
+ name = "Privacy Shutters";
+ pixel_y = -23;
+ dir = 1;
+ pixel_x = -7
+ },
/turf/open/floor/plasteel/white,
/area/ship/medical)
"LL" = (
-/obj/structure/rack,
-/obj/item/pickaxe/emergency,
-/obj/item/pickaxe/emergency,
-/obj/item/pickaxe/emergency,
-/obj/machinery/airalarm/directional/east,
-/obj/machinery/light_switch{
- dir = 1;
- pixel_y = -20
+/obj/structure/closet/secure_closet{
+ icon_state = "med_secure";
+ name = "corpsman's locker";
+ req_access = list(5)
+ },
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/belt/medical/webbing,
+/obj/item/pinpointer/crew,
+/obj/item/storage/backpack/medic,
+/obj/item/storage/backpack/messenger/med,
+/obj/item/clothing/head/soft/inteq/corpsman,
+/obj/item/clothing/suit/armor/inteq/corpsman,
+/obj/item/clothing/under/syndicate/inteq/skirt/corpsman,
+/obj/item/clothing/under/syndicate/inteq/corpsman,
+/obj/effect/turf_decal/box/white/corners{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 6
},
/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/area/ship/medical)
"LR" = (
/obj/effect/turf_decal/corner/opaque/brown{
dir = 8
@@ -4189,9 +4119,6 @@
/turf/open/floor/plating/airless,
/area/ship/external/dark)
"ME" = (
-/obj/machinery/door/airlock/medical/glass{
- name = "Medical Office"
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/door/firedoor/border_only{
@@ -4201,6 +4128,9 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/door/airlock/grunge{
+ req_access = list(3)
+ },
/turf/open/floor/plasteel/patterned,
/area/ship/crew/office)
"MK" = (
@@ -4213,13 +4143,16 @@
/turf/open/floor/plating/airless,
/area/ship/external/dark)
"MR" = (
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/inteq,
-/obj/item/clothing/head/helmet/space/inteq,
-/obj/structure/sign/poster/official/safety_internals{
- pixel_y = 32
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"Nh" = (
/turf/closed/wall/mineral/plastitanium,
@@ -4369,11 +4302,13 @@
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
"Oj" = (
-/obj/effect/turf_decal/borderfloor{
- dir = 8
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
+/obj/effect/turf_decal/techfloor{
+ dir = 4
},
-/obj/structure/closet/emcloset/wall/directional/north,
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo)
"Ok" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -4412,40 +4347,40 @@
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
"OK" = (
-/obj/machinery/iv_drip/saline,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/obj/effect/turf_decal/borderfloorblack,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/medical)
"OM" = (
/turf/open/floor/pod,
/area/ship/cargo)
"OR" = (
-/obj/structure/tank_dispenser/oxygen,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
"OT" = (
-/obj/structure/catwalk/over/plated_catwalk,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-4"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
},
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/plasteel/tech/grid,
+/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"OV" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/light/directional/west,
+/obj/effect/turf_decal/siding/thinplating/corner{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/light/small/directional/east,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plating,
-/area/ship/medical)
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/port)
"Pb" = (
/obj/machinery/power/terminal{
dir = 8
@@ -4505,7 +4440,8 @@
dir = 1;
pixel_y = -20
},
-/turf/open/floor/plasteel/patterned,
+/obj/effect/turf_decal/corner/transparent/inteqbrown/half,
+/turf/open/floor/plasteel,
/area/ship/crew/office)
"PL" = (
/obj/effect/turf_decal/siding/thinplating/dark{
@@ -4539,19 +4475,6 @@
},
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/port)
-"Qd" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 5
- },
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo)
"Qk" = (
/obj/structure/table,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -4583,7 +4506,8 @@
dir = 4
},
/obj/item/radio/intercom/directional/south,
-/turf/open/floor/plasteel/patterned,
+/obj/effect/turf_decal/corner/transparent/inteqbrown/half,
+/turf/open/floor/plasteel,
/area/ship/crew/office)
"Qw" = (
/obj/effect/turf_decal/siding/thinplating{
@@ -4605,6 +4529,12 @@
/obj/structure/sign/warning/vacuum{
pixel_x = 32
},
+/obj/structure/table/glass,
+/obj/machinery/computer/med_data/laptop{
+ dir = 8;
+ pixel_y = 7;
+ pixel_x = 3
+ },
/turf/open/floor/plasteel/tech,
/area/ship/medical)
"QG" = (
@@ -4648,20 +4578,11 @@
dir = 10
},
/obj/structure/extinguisher_cabinet/directional/east,
-/obj/structure/sign/warning/incident{
- pixel_y = 32
- },
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo)
"Re" = (
-/obj/structure/closet/crate/freezer,
-/obj/machinery/iv_drip,
-/obj/item/reagent_containers/blood/universal,
-/obj/item/reagent_containers/blood/universal,
-/obj/item/reagent_containers/blood/universal,
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
"Rh" = (
/turf/closed/wall/mineral/plastitanium,
/area/ship/security)
@@ -4721,6 +4642,9 @@
"Sd" = (
/obj/effect/turf_decal/siding/thinplating,
/obj/machinery/light/directional/south,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/port)
"Sf" = (
@@ -4736,12 +4660,15 @@
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/port)
"Sh" = (
-/obj/effect/turf_decal/borderfloor{
- dir = 4
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/plating,
+/area/ship/hallway/central)
"Sl" = (
/obj/structure/table/wood,
/obj/item/paper_bin,
@@ -4870,17 +4797,9 @@
/obj/effect/turf_decal/siding/thinplating/dark/corner{
dir = 1
},
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
- dir = 4
- },
/obj/effect/turf_decal/trimline/opaque/brown/warning{
dir = 1
},
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"Uj" = (
@@ -4939,7 +4858,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
-/obj/machinery/light/directional/south,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/port)
"UO" = (
@@ -4955,6 +4873,8 @@
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"Ve" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
/turf/open/floor/plasteel/tech,
/area/ship/medical)
"Vp" = (
@@ -4985,8 +4905,7 @@
/obj/effect/turf_decal/techfloor{
dir = 4
},
-/obj/structure/closet/firecloset,
-/turf/open/floor/plasteel/tech,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/hallway/central)
"VB" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -5121,6 +5040,7 @@
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/machinery/firealarm/directional/west,
+/obj/structure/chair,
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"WQ" = (
@@ -5148,11 +5068,9 @@
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 1
},
-/obj/machinery/vending/medical/syndicate_access{
- name = "\improper InteqMed Plus"
- },
/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel/mono/dark,
+/obj/structure/closet/secure_closet/medical2,
+/turf/open/floor/plasteel/dark,
/area/ship/medical)
"Xi" = (
/obj/structure/chair{
@@ -5177,8 +5095,8 @@
/area/ship/crew/dorm)
"Xu" = (
/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/inteq,
-/obj/item/clothing/head/helmet/space/inteq,
+/obj/item/clothing/suit/space/orange,
+/obj/item/clothing/head/helmet/space/orange,
/obj/effect/turf_decal/techfloor{
dir = 1
},
@@ -5200,9 +5118,23 @@
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"Xx" = (
-/obj/structure/closet/secure_closet/medical1,
/obj/machinery/light/small/directional/north,
-/turf/open/floor/plasteel/patterned,
+/obj/effect/turf_decal/corner/transparent/inteqbrown/border{
+ dir = 1
+ },
+/obj/structure/table,
+/obj/item/storage/toolbox/emergency/shuttle{
+ pixel_y = 9;
+ pixel_x = -1
+ },
+/obj/item/gps{
+ pixel_x = 6;
+ pixel_y = 3
+ },
+/obj/item/gps{
+ pixel_x = 2
+ },
+/turf/open/floor/plasteel,
/area/ship/crew/office)
"XD" = (
/obj/effect/turf_decal/siding/thinplating/dark/corner{
@@ -5254,12 +5186,6 @@
},
/turf/open/floor/plasteel/patterned/grid,
/area/ship/crew/canteen)
-"XU" = (
-/obj/effect/turf_decal/borderfloor{
- dir = 8
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
"Yd" = (
/obj/effect/turf_decal/siding/thinplating{
dir = 4
@@ -5297,11 +5223,9 @@
/turf/open/floor/plasteel/patterned/brushed,
/area/ship/crew/canteen)
"Yt" = (
-/obj/effect/turf_decal/borderfloor{
- dir = 4
- },
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/obj/machinery/rnd/production/techfab/department/medical,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/medical)
"Yu" = (
/obj/effect/turf_decal/techfloor,
/obj/structure/closet/firecloset,
@@ -5314,9 +5238,11 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/medical)
"Yx" = (
-/obj/machinery/rnd/production/techfab/department/medical,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/obj/structure/noticeboard{
+ pixel_y = 28
+ },
+/turf/open/floor/plasteel/patterned,
+/area/ship/medical)
"YF" = (
/obj/machinery/power/terminal{
dir = 8
@@ -5329,14 +5255,14 @@
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"YL" = (
-/obj/structure/grille,
-/obj/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/door/poddoor/shutters{
- dir = 4;
- id = "valor_external"
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/turf/open/floor/plating,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
"YM" = (
/obj/effect/turf_decal/corner/opaque/yellow{
dir = 1
@@ -5403,12 +5329,8 @@
/turf/open/floor/plating,
/area/ship/maintenance/port)
"Zf" = (
-/obj/structure/railing{
- dir = 4;
- layer = 2.9
- },
-/obj/effect/turf_decal/borderfloor{
- dir = 4
+/obj/structure/sign/warning/incident{
+ pixel_y = 32
},
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
@@ -5556,7 +5478,7 @@ Td
Nh
xj
qG
-iI
+yK
Cb
Cb
Cb
@@ -5589,7 +5511,7 @@ Td
xj
og
FI
-qe
+tj
OM
OM
OM
@@ -5622,7 +5544,7 @@ Td
xj
rL
uS
-qe
+tj
OM
OM
OM
@@ -5655,7 +5577,7 @@ Td
xj
sZ
uS
-qe
+tj
OM
OM
OM
@@ -5669,7 +5591,7 @@ Td
bB
LI
ns
-qR
+LI
pC
zD
LI
@@ -5688,13 +5610,13 @@ Td
xj
GF
uS
-qe
+tj
OM
OM
OM
OM
Kz
-rL
+cE
xj
Td
Td
@@ -5702,9 +5624,9 @@ Td
WC
WO
gp
-qR
-Yi
-bI
+LI
+FY
+OK
LI
"}
(9,1,1) = {"
@@ -5721,7 +5643,7 @@ Td
xj
Ch
FI
-qe
+tj
OM
OM
OM
@@ -5754,7 +5676,7 @@ DU
HC
Zf
oz
-qe
+tj
OM
OM
OM
@@ -5780,25 +5702,25 @@ Rh
Zu
uB
ua
-Wp
-CC
-ky
-CC
+OV
+aW
+aW
+aW
DR
-Qd
-FY
+ZF
+ZF
kH
Mn
Ea
-jG
+Ls
Mn
de
KU
zI
-yK
-OV
-yK
-aW
+Re
+Re
+xg
+Re
Ui
gU
nK
@@ -5813,11 +5735,11 @@ jN
lN
gh
zs
-HC
-HC
-HC
-HC
-HC
+fN
+OR
+OR
+OR
+Wp
OT
JS
jj
@@ -5826,13 +5748,13 @@ Kp
Kn
dQ
Fa
-Ft
-LI
-LI
-LI
-LI
-LI
+MR
+qk
su
+su
+YL
+su
+ux
rO
qR
Yi
@@ -5847,11 +5769,11 @@ xr
Hg
tS
HC
-MR
vh
-fN
-xj
-tj
+vh
+vh
+HC
+cI
te
fe
Ok
@@ -5859,11 +5781,11 @@ Xf
as
HL
ec
-xg
-xj
-Au
-Re
-OK
+Md
+LI
+LI
+LI
+LI
LI
EE
oy
@@ -5880,11 +5802,11 @@ tZ
An
Sd
HC
-Oj
-XU
-XU
+ss
+bx
+mt
xj
-cI
+nX
Jd
qA
UQ
@@ -5892,11 +5814,11 @@ hm
Cc
JJ
zT
-Md
-xj
-XU
-XU
-cE
+nX
+LI
+jG
+Io
+Au
LI
LI
dN
@@ -5913,11 +5835,11 @@ tZ
Qc
AP
HC
-bx
-ss
-Sh
+gq
+gq
+gq
Hw
-ux
+nX
ct
TB
AM
@@ -5926,10 +5848,10 @@ dO
yy
bh
nX
-zK
-Yt
+LI
Yt
-IL
+Io
+jT
LI
zS
pt
@@ -5946,10 +5868,10 @@ ME
iN
xl
HC
-OR
gq
-LL
-Nh
+gq
+gq
+xj
Rc
bF
Hi
@@ -5959,11 +5881,11 @@ tH
Ff
jQ
qX
-xj
+LI
Yx
Io
-mt
-LI
+Io
+kW
zC
Ye
mw
@@ -5979,9 +5901,9 @@ tZ
VD
Um
DT
-DT
-DT
-DT
+Oj
+Oj
+Oj
DT
DT
DT
@@ -5990,13 +5912,13 @@ NE
DT
nz
DT
-Tw
-Tw
-DT
-DT
-DT
DT
DT
+LI
+CC
+qe
+LL
+LI
Xg
Uj
dl
@@ -6013,8 +5935,8 @@ ty
dp
DT
Vy
-qk
-Ls
+Vy
+Vy
DT
fE
sJ
@@ -6026,8 +5948,8 @@ zG
Qw
jU
DT
-kW
-qk
+Vy
+Vy
Vy
DT
fj
@@ -6046,7 +5968,7 @@ ma
CH
jk
lc
-lc
+Sh
lc
ht
jw
@@ -6060,7 +5982,7 @@ GR
hj
id
lc
-lc
+Sh
lc
bR
XD
@@ -6078,8 +6000,8 @@ mI
gn
qZ
DT
-kG
-kG
+IL
+BV
kG
Tw
Lb
@@ -6092,9 +6014,9 @@ zO
lE
WX
DT
-jT
-kG
kG
+BV
+IL
DT
zA
mx
@@ -6111,9 +6033,9 @@ uA
Pk
Ei
DT
-YL
-YL
-BV
+DT
+DT
+DT
DT
mZ
Yd
@@ -6125,9 +6047,9 @@ Ik
Od
ie
DT
-YL
-YL
-YL
+DT
+DT
+DT
DT
LI
zE
@@ -6526,7 +6448,7 @@ Td
Td
Td
Td
-Td
+zK
Td
Td
Td
diff --git a/_maps/shuttles/pirate/pirate_tortuga.dmm b/_maps/shuttles/pirate/pirate_tortuga.dmm
index 07bd4710a9b1..4bc354b31b5c 100644
--- a/_maps/shuttles/pirate/pirate_tortuga.dmm
+++ b/_maps/shuttles/pirate/pirate_tortuga.dmm
@@ -55,8 +55,8 @@
/obj/structure/cable/yellow{
icon_state = "0-4"
},
-/obj/machinery/power/shieldwallgen/atmos{
- id = "watchdog_holo"
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ id = "tortuga_holo"
},
/turf/open/floor/plating,
/area/ship/cargo)
@@ -173,6 +173,10 @@
pixel_x = -9;
dir = 8
},
+/obj/item/reagent_containers/food/drinks/beer{
+ pixel_x = -6;
+ pixel_y = -3
+ },
/turf/open/floor/plasteel/mono/dark,
/area/ship/bridge)
"ci" = (
@@ -268,8 +272,9 @@
/turf/open/floor/pod/dark,
/area/ship/maintenance/starboard)
"dE" = (
-/obj/structure/table,
-/obj/item/storage/cans/sixbeer,
+/obj/structure/chair/sofa/brown/old/right{
+ dir = 1
+ },
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/port)
"dF" = (
@@ -393,7 +398,9 @@
pixel_x = -22;
pixel_y = -10
},
-/obj/structure/rack,
+/obj/structure/salvageable/computer{
+ dir = 4
+ },
/turf/open/floor/plasteel/tech,
/area/ship/bridge)
"ff" = (
@@ -406,6 +413,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 10
},
+/obj/structure/sign/poster/official/moth/hardhats{
+ pixel_y = 32
+ },
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/port)
"fj" = (
@@ -755,6 +765,7 @@
icon_state = "0-8"
},
/obj/item/stack/sheet/mineral/plasma/twenty,
+/obj/effect/turf_decal/industrial/hatch,
/turf/open/floor/pod/dark,
/area/ship/maintenance/port)
"iW" = (
@@ -826,6 +837,7 @@
"jt" = (
/obj/machinery/telecomms/relay/preset/frontiersmen,
/obj/machinery/door/window/southleft,
+/obj/structure/catwalk/over/plated_catwalk/dark,
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"jA" = (
@@ -833,7 +845,6 @@
/obj/structure/cable{
icon_state = "2-4"
},
-/obj/structure/reagent_dispensers/fueltank,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 9
},
@@ -1026,6 +1037,9 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/spline/fancy/opaque/black/corner,
+/obj/effect/turf_decal/siding/red{
+ dir = 4
+ },
/turf/open/floor/mineral/titanium,
/area/ship/security/armory)
"ml" = (
@@ -1303,6 +1317,9 @@
/area/ship/cargo)
"oU" = (
/obj/structure/table,
+/obj/item/grown/corncob{
+ pixel_y = 8
+ },
/turf/open/floor/plasteel/grimy,
/area/ship/crew/canteen)
"oV" = (
@@ -1407,6 +1424,7 @@
icon_state = "0-10"
},
/obj/item/stack/sheet/mineral/plasma/twenty,
+/obj/effect/turf_decal/industrial/hatch,
/turf/open/floor/pod/dark,
/area/ship/maintenance/starboard)
"qD" = (
@@ -1493,6 +1511,14 @@
},
/turf/open/floor/pod/dark,
/area/ship/maintenance/starboard)
+"sM" = (
+/obj/structure/table,
+/obj/item/desk_flag/trans{
+ pixel_x = 9;
+ pixel_y = -6
+ },
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew/canteen)
"sQ" = (
/turf/closed/wall,
/area/ship/maintenance/starboard)
@@ -1555,6 +1581,7 @@
},
/obj/structure/curtain/cloth,
/obj/item/bedsheet/dorms,
+/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/carpet,
/area/ship/crew)
"tI" = (
@@ -1704,6 +1731,7 @@
reagent_id = /datum/reagent/fuel/oil;
tank_volume = 3000
},
+/obj/effect/turf_decal/industrial/hatch,
/turf/open/floor/pod/dark,
/area/ship/maintenance/starboard)
"va" = (
@@ -1791,6 +1819,10 @@
"wg" = (
/obj/machinery/blackbox_recorder,
/obj/machinery/door/window/southright,
+/obj/structure/sign/poster/retro/radio{
+ pixel_y = 32
+ },
+/obj/structure/catwalk/over/plated_catwalk/dark,
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"wp" = (
@@ -1818,6 +1850,13 @@
/area/ship/cargo)
"wH" = (
/obj/machinery/light/directional/north,
+/obj/structure/chair/plastic{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/plasma{
+ pixel_x = 18;
+ pixel_y = -5
+ },
/turf/open/floor/pod/dark,
/area/ship/maintenance/starboard)
"wL" = (
@@ -1834,11 +1873,15 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
+/obj/effect/turf_decal/industrial/warning{
+ dir = 1
+ },
/turf/open/floor/pod/dark,
/area/ship/maintenance/port)
"wQ" = (
/obj/effect/turf_decal/box/corners,
/obj/structure/closet/crate/bin,
+/obj/structure/extinguisher_cabinet/directional/east,
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
"wY" = (
@@ -2014,6 +2057,16 @@
/obj/item/bedsheet/dorms,
/turf/open/floor/carpet,
/area/ship/crew)
+"Av" = (
+/obj/effect/turf_decal/siding/wideplating{
+ dir = 4
+ },
+/obj/structure/chair{
+ dir = 8
+ },
+/obj/structure/extinguisher_cabinet/directional/east,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
"Az" = (
/obj/structure/curtain/bounty,
/obj/machinery/light_switch{
@@ -2050,9 +2103,9 @@
/turf/open/floor/plasteel/dark,
/area/ship/maintenance/starboard)
"BF" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/effect/turf_decal/industrial/warning/fulltile,
-/turf/open/floor/plasteel/tech/grid,
+/obj/effect/turf_decal/borderfloor,
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/plasteel/tech/techmaint,
/area/ship/cargo)
"BG" = (
/obj/structure/cable/yellow{
@@ -2170,8 +2223,8 @@
/obj/structure/cable/yellow{
icon_state = "6-8"
},
-/obj/structure/chair/plastic{
- dir = 4
+/obj/structure/chair/sofa/brown/old/left{
+ dir = 1
},
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/port)
@@ -2394,6 +2447,8 @@
/obj/structure/cable/yellow{
icon_state = "5-8"
},
+/obj/structure/closet/secure_closet/engineering_welding,
+/obj/effect/turf_decal/borderfloorblack/full,
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/starboard)
"Gr" = (
@@ -2428,6 +2483,7 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
+/obj/effect/turf_decal/industrial/warning,
/turf/open/floor/pod/dark,
/area/ship/maintenance/starboard)
"GM" = (
@@ -2510,6 +2566,7 @@
/obj/structure/cable/yellow{
icon_state = "0-4"
},
+/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/port)
"HY" = (
@@ -2725,8 +2782,8 @@
/obj/structure/cable/yellow{
icon_state = "0-4"
},
-/obj/machinery/power/shieldwallgen/atmos{
- id = "watchdog_holo";
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ id = "tortuga_holo";
dir = 1
},
/obj/machinery/door/poddoor/shutters{
@@ -2759,6 +2816,9 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/retro/smile{
+ pixel_x = -32
+ },
/turf/open/floor/plasteel,
/area/ship/crew/canteen)
"Lb" = (
@@ -2790,17 +2850,29 @@
icon_state = "plating_rust"
},
/area/ship/maintenance)
+"Lo" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/door_assembly/door_assembly_hatch{
+ dir = 4
+ },
+/turf/open/floor/plating/airless,
+/area/ship/maintenance)
"Lt" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/chair/plastic{
- dir = 8
- },
+/obj/structure/table,
+/obj/item/storage/cans/sixbeer,
+/obj/machinery/cell_charger,
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/port)
"Lz" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
+/obj/effect/turf_decal/siding/red{
+ dir = 4
+ },
/turf/open/floor/mineral/titanium,
/area/ship/security/armory)
"LG" = (
@@ -2830,6 +2902,16 @@
/turf/open/floor/plasteel/elevatorshaft,
/area/ship/cargo)
"Mb" = (
+/obj/structure/chair/plastic{
+ dir = 8
+ },
+/obj/structure/sign/warning/nosmoking{
+ pixel_y = 32
+ },
+/obj/item/cigbutt{
+ pixel_x = -13;
+ pixel_y = -3
+ },
/turf/open/floor/pod/dark,
/area/ship/maintenance/starboard)
"Mk" = (
@@ -2852,6 +2934,19 @@
},
/turf/open/floor/plasteel/showroomfloor,
/area/ship/crew/canteen)
+"Ml" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/industrial/warning{
+ dir = 1
+ },
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/ship/cargo)
"Mn" = (
/obj/structure/catwalk/over/plated_catwalk,
/obj/structure/railing{
@@ -2870,9 +2965,6 @@
/area/ship/cargo)
"Mo" = (
/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/railing/corner{
- dir = 1
- },
/obj/effect/turf_decal/industrial/stand_clear,
/obj/effect/turf_decal/industrial/warning{
dir = 1
@@ -2939,6 +3031,11 @@
/obj/machinery/door/firedoor/border_only{
dir = 1
},
+/obj/item/kirbyplants{
+ icon_state = "plant-25";
+ pixel_x = 8;
+ pixel_y = -5
+ },
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
"MO" = (
@@ -2984,6 +3081,11 @@
icon_state = "computer-right"
},
/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/vomit/old{
+ icon_state = "vomit_4";
+ pixel_x = -9;
+ pixel_y = -6
+ },
/turf/open/floor/plasteel/mono/dark,
/area/ship/bridge)
"Ol" = (
@@ -3060,6 +3162,20 @@
},
/turf/open/floor/plating/airless,
/area/ship/maintenance)
+"OH" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/stand_clear{
+ dir = 1
+ },
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/ship/cargo)
"OI" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
@@ -3073,6 +3189,19 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
+"OP" = (
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/obj/item/clothing/head/hardhat{
+ pixel_x = 8;
+ pixel_y = -7
+ },
+/turf/open/floor/plasteel/tech,
+/area/ship/maintenance/port)
"Pa" = (
/obj/structure/table/glass,
/obj/effect/turf_decal/corner/opaque/blue/full,
@@ -3179,6 +3308,7 @@
/obj/effect/turf_decal/box/corners{
dir = 4
},
+/obj/structure/tank_dispenser/oxygen,
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
"QM" = (
@@ -3215,7 +3345,7 @@
pixel_x = -3
},
/obj/machinery/button/shieldwallgen{
- id = "watchdog_holo";
+ id = "tortuga_holo";
pixel_x = 8;
pixel_y = 23
},
@@ -3251,6 +3381,7 @@
icon_state = "4-8"
},
/obj/structure/closet/secure_closet/engineering_electrical,
+/obj/effect/turf_decal/borderfloorblack/full,
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/starboard)
"RH" = (
@@ -3387,6 +3518,8 @@
},
/obj/machinery/light/directional/south,
/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/industrial/hatch,
+/obj/structure/closet/firecloset,
/turf/open/floor/pod/dark,
/area/ship/maintenance/port)
"SV" = (
@@ -3472,6 +3605,7 @@
/obj/structure/cable/yellow{
icon_state = "0-4"
},
+/obj/structure/closet/emcloset,
/turf/open/floor/pod/dark,
/area/ship/maintenance/port)
"UE" = (
@@ -3498,6 +3632,14 @@
/obj/machinery/door/firedoor/heavy,
/turf/open/floor/plating/airless,
/area/ship/maintenance)
+"Vb" = (
+/obj/machinery/suit_storage_unit/industrial{
+ suit_type = /obj/item/clothing/suit/space/hardsuit/security/independent/frontier
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
"Vd" = (
/obj/structure/curtain/bounty,
/turf/open/floor/plasteel,
@@ -3587,9 +3729,6 @@
/area/ship/cargo)
"VE" = (
/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/railing/corner{
- dir = 8
- },
/obj/effect/turf_decal/industrial/stand_clear{
dir = 1
},
@@ -3694,6 +3833,16 @@
"Wx" = (
/turf/closed/wall/r_wall/rust,
/area/ship/crew/canteen)
+"WA" = (
+/obj/effect/turf_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/ripped{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo)
"WF" = (
/turf/closed/wall/rust,
/area/ship/cargo)
@@ -3726,8 +3875,9 @@
/obj/structure/cable/yellow{
icon_state = "4-9"
},
-/obj/structure/closet/secure_closet/engineering_welding,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/ship_gravity,
+/obj/effect/turf_decal/borderfloorblack/full,
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/starboard)
"Xs" = (
@@ -3986,6 +4136,13 @@
},
/turf/open/floor/plating/airless,
/area/ship/maintenance)
+"ZY" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/red{
+ dir = 4
+ },
+/turf/open/floor/mineral/titanium,
+/area/ship/security/armory)
(1,1,1) = {"
Ek
@@ -4211,15 +4368,15 @@ oH
Ek
tq
lh
-Uo
-EB
+OH
+Rn
DG
DG
DG
DG
DG
-uL
-ld
+Rn
+Ml
Td
WF
Ek
@@ -4240,7 +4397,7 @@ Ek
Ek
Ek
oH
-HX
+OP
HX
oH
CG
@@ -4253,7 +4410,7 @@ DG
DG
DG
DG
-BF
+Rn
Mo
Td
WF
@@ -4288,7 +4445,7 @@ DG
DG
DG
DG
-BF
+Rn
ID
Td
Ko
@@ -4420,7 +4577,7 @@ yl
va
Uw
CG
-VP
+WA
Uo
OF
tT
@@ -4570,7 +4727,7 @@ wF
uh
nc
nc
-Td
+BF
Ko
uQ
GA
@@ -4692,7 +4849,7 @@ QJ
QJ
QJ
QJ
-MI
+Lo
Ab
rU
Xc
@@ -4745,7 +4902,7 @@ Yu
qD
jV
Lz
-dm
+ZY
mg
qD
qD
@@ -4806,7 +4963,7 @@ Vg
Ab
jJ
QT
-oU
+sM
CE
bD
ng
@@ -4852,7 +5009,7 @@ hU
gD
yH
FP
-hz
+Vb
qD
MH
Eb
@@ -4945,7 +5102,7 @@ PV
yd
rU
Lb
-gQ
+Av
gQ
LG
YI
@@ -5166,7 +5323,7 @@ oq
SJ
mB
mw
-MI
+Lo
QJ
QJ
QJ
diff --git a/_maps/shuttles/subshuttles/frontiersmen_brawler.dmm b/_maps/shuttles/subshuttles/frontiersmen_brawler.dmm
index 821918d660f2..d9c361701213 100644
--- a/_maps/shuttles/subshuttles/frontiersmen_brawler.dmm
+++ b/_maps/shuttles/subshuttles/frontiersmen_brawler.dmm
@@ -3,18 +3,15 @@
/obj/structure/cable/yellow{
icon_state = "4-9"
},
-/obj/structure/cable/yellow{
- icon_state = "2-9"
- },
/turf/open/floor/plasteel/patterned/ridged,
/area/ship/bridge)
"c" = (
/obj/machinery/door/poddoor/shutters{
id = "brawler_starboard"
},
-/obj/machinery/power/shieldwallgen/atmos{
- id = "brawler_starboard_holo";
- dir = 8
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ dir = 8;
+ id = "brawler_starboard_holo"
},
/obj/structure/cable/yellow,
/turf/open/floor/engine/hull/interior,
@@ -73,6 +70,55 @@
"k" = (
/turf/template_noop,
/area/template_noop)
+"l" = (
+/obj/machinery/door/poddoor/shutters{
+ id = "brawler_starboard"
+ },
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ dir = 4;
+ id = "brawler_starboard_holo"
+ },
+/obj/structure/cable/yellow,
+/obj/machinery/button/door{
+ dir = 4;
+ pixel_y = 7;
+ pixel_x = -23;
+ id = "brawler_starboard"
+ },
+/obj/machinery/button/shieldwallgen{
+ pixel_y = -7;
+ pixel_x = -23;
+ id = "brawler_starboard_holo";
+ dir = 4
+ },
+/turf/open/floor/engine/hull/interior,
+/area/ship/bridge)
+"m" = (
+/obj/machinery/button/door{
+ pixel_x = -23;
+ pixel_y = -7;
+ id = "brawler_port";
+ dir = 4
+ },
+/obj/machinery/button/shieldwallgen{
+ pixel_y = 7;
+ pixel_x = -23;
+ id = "brawler_port_holo";
+ dir = 4
+ },
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ dir = 4;
+ id = "brawler_port_holo"
+ },
+/obj/machinery/door/poddoor/shutters{
+ dir = 1;
+ id = "brawler_port"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
+/turf/open/floor/engine/hull/interior,
+/area/ship/bridge)
"o" = (
/obj/structure/grille,
/obj/structure/window/reinforced{
@@ -91,7 +137,6 @@
pixel_x = 8
},
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/smes/engineering,
/obj/effect/turf_decal/siding/thinplating/end{
dir = 8
},
@@ -112,10 +157,17 @@
/obj/structure/cable/yellow{
icon_state = "0-5"
},
+/obj/structure/cable/yellow{
+ icon_state = "1-10"
+ },
+/obj/machinery/power/smes/engineering,
+/obj/structure/cable/yellow{
+ icon_state = "2-10"
+ },
/turf/open/floor/plasteel,
/area/ship/bridge)
"r" = (
-/obj/machinery/power/shieldwallgen/atmos{
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
id = "brawler_aft_holo";
dir = 1
},
@@ -151,9 +203,6 @@
/obj/structure/cable/yellow{
icon_state = "4-10"
},
-/obj/structure/cable/yellow{
- icon_state = "1-10"
- },
/turf/open/floor/plasteel/patterned/ridged,
/area/ship/bridge)
"v" = (
@@ -186,9 +235,9 @@
dir = 1;
id = "brawler_port"
},
-/obj/machinery/power/shieldwallgen/atmos{
- id = "brawler_port_holo";
- dir = 8
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+ dir = 8;
+ id = "brawler_port_holo"
},
/obj/structure/cable/yellow{
icon_state = "0-2"
@@ -219,29 +268,9 @@
dir = 1;
id = "brawler_port"
},
-/obj/machinery/power/shieldwallgen/atmos{
- id = "brawler_port_holo";
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "0-2"
- },
-/obj/machinery/button/door{
- pixel_x = -23;
- pixel_y = -7;
- id = "brawler_port";
- dir = 4
- },
-/obj/machinery/button/shieldwallgen{
- pixel_y = 7;
- pixel_x = -23;
- id = "brawler_port_holo";
- dir = 4
- },
/turf/open/floor/engine/hull/interior,
/area/ship/bridge)
"B" = (
-/obj/machinery/light/directional/north,
/obj/effect/decal/cleanable/dirt,
/obj/item/trash/can/food{
pixel_x = 7;
@@ -263,6 +292,9 @@
pixel_y = 2
},
/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/patterned/ridged,
/area/ship/bridge)
"D" = (
@@ -291,7 +323,7 @@
dir = 8;
id = "brawler_aft"
},
-/obj/machinery/power/shieldwallgen/atmos{
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
id = "brawler_aft_holo"
},
/obj/structure/cable/yellow{
@@ -323,6 +355,9 @@
/obj/effect/decal/cleanable/wrapping{
pixel_y = 25
},
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/patterned/ridged,
/area/ship/bridge)
"I" = (
@@ -336,9 +371,7 @@
dir = 1
},
/obj/machinery/power/smes/shuttle/precharged,
-/obj/structure/cable/yellow{
- icon_state = "0-2"
- },
+/obj/structure/cable,
/turf/open/floor/plasteel/tech/grid,
/area/ship/bridge)
"J" = (
@@ -366,6 +399,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
+/obj/machinery/light/floor,
/turf/open/floor/plasteel,
/area/ship/bridge)
"L" = (
@@ -388,23 +422,6 @@
/obj/machinery/door/poddoor/shutters{
id = "brawler_starboard"
},
-/obj/machinery/power/shieldwallgen/atmos{
- id = "brawler_starboard_holo";
- dir = 4
- },
-/obj/structure/cable/yellow,
-/obj/machinery/button/door{
- dir = 4;
- pixel_y = 7;
- pixel_x = -23;
- id = "brawler_starboard"
- },
-/obj/machinery/button/shieldwallgen{
- pixel_y = -7;
- pixel_x = -23;
- id = "brawler_starboard_holo";
- dir = 4
- },
/turf/open/floor/engine/hull/interior,
/area/ship/bridge)
"N" = (
@@ -431,7 +448,6 @@
/turf/open/floor/plasteel,
/area/ship/bridge)
"P" = (
-/obj/machinery/light/directional/south,
/obj/structure/cable/yellow{
icon_state = "5-8"
},
@@ -524,11 +540,11 @@ k
"}
(3,1,1) = {"
k
-W
+m
C
p
G
-W
+l
k
"}
(4,1,1) = {"
diff --git a/_maps/shuttles/subshuttles/inteq_haste.dmm b/_maps/shuttles/subshuttles/inteq_haste.dmm
index 74144c3fe930..25324d952a5e 100644
--- a/_maps/shuttles/subshuttles/inteq_haste.dmm
+++ b/_maps/shuttles/subshuttles/inteq_haste.dmm
@@ -54,16 +54,15 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
-/obj/machinery/light_switch{
- pixel_y = 22;
- pixel_x = 10
- },
/obj/effect/turf_decal/techfloor{
dir = 1
},
/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 8
},
+/obj/structure/chair/handrail{
+ pixel_y = 7
+ },
/turf/open/floor/plasteel/tech,
/area/ship/bridge)
"F" = (
@@ -221,6 +220,10 @@
/obj/structure/cable/yellow{
icon_state = "4-10"
},
+/obj/machinery/light_switch{
+ pixel_y = 22;
+ pixel_x = 10
+ },
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm
index 8b05ccacd1fe..1d08e1ab4868 100644
--- a/code/__DEFINES/DNA.dm
+++ b/code/__DEFINES/DNA.dm
@@ -24,9 +24,6 @@
#define MUT_MUTE /datum/mutation/human/mute
#define STONER /datum/mutation/human/stoner
#define UNINTELLIGIBLE /datum/mutation/human/unintelligible
-#define SWEDISH /datum/mutation/human/swedish
-#define CHAV /datum/mutation/human/chav
-#define ELVIS /datum/mutation/human/elvis
#define RADIOACTIVE /datum/mutation/human/radioactive
#define GLOWY /datum/mutation/human/glow
#define ANTIGLOWY /datum/mutation/human/glow/anti
diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
index 97049254cc10..d0038cf5277e 100644
--- a/code/__DEFINES/dcs/signals.dm
+++ b/code/__DEFINES/dcs/signals.dm
@@ -789,3 +789,6 @@
///called when an elzu should unroot
#define COMSIG_DIGOUT "dig_out"
+
+///sent when the access on an id is changed/updated, ensures wallets get updated once ids generate there access
+#define COSMIG_ACCESS_UPDATED "acces_updated"
diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm
index 5d96dc8af34c..5301f0ec9d3e 100644
--- a/code/__HELPERS/roundend.dm
+++ b/code/__HELPERS/roundend.dm
@@ -280,14 +280,9 @@
//Medals
parts += medal_report()
- //WS Begin
- CHECK_TICK
-
- //Mouse
- parts += mouse_report()
CHECK_TICK
- //WS End
+
//Station Goals
parts += goal_report()
@@ -459,17 +454,7 @@
parts += com
return "[parts.Join("
")]
"
return ""
-//WS Begin
-/datum/controller/subsystem/ticker/proc/mouse_report()
- if(GLOB.mouse_food_eaten)
- var/list/parts = list()
- parts += ""
- parts += "Mouse Born: [GLOB.mouse_spawned]"
- parts += "Mouse Killed: [GLOB.mouse_killed]"
- parts += "Trash Eaten: [GLOB.mouse_food_eaten]"
- return "[parts.Join("
")]
"
- return ""
-//WS End
+
/datum/controller/subsystem/ticker/proc/antag_report()
var/list/result = list()
var/list/all_teams = list()
diff --git a/code/datums/brain_damage/mild.dm b/code/datums/brain_damage/mild.dm
index 069d89f0e7e7..9c10c6f1fd7d 100644
--- a/code/datums/brain_damage/mild.dm
+++ b/code/datums/brain_damage/mild.dm
@@ -50,8 +50,6 @@
owner.derpspeech = min(owner.derpspeech + 5, 25)
if(prob(3))
owner.emote("drool")
- else if(owner.stat == CONSCIOUS && prob(3))
- owner.say(pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage"), forced = "brain damage")
..()
/datum/brain_trauma/mild/dumbness/on_lose()
diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm
index 5545c4efde53..afd4e83cfe34 100644
--- a/code/datums/mutations/speech.dm
+++ b/code/datums/mutations/speech.dm
@@ -68,129 +68,6 @@
return
REMOVE_TRAIT(owner, TRAIT_UNINTELLIGIBLE_SPEECH, GENETIC_MUTATION)
-/datum/mutation/human/swedish
- name = "Swedish"
- desc = "A horrible mutation originating from the distant past. Thought to be eradicated after the incident in 2037."
- quality = MINOR_NEGATIVE
- text_gain_indication = "You feel Swedish, however that works."
- text_lose_indication = "The feeling of Swedishness passes."
-
-/datum/mutation/human/swedish/on_acquiring(mob/living/carbon/human/owner)
- if(..())
- return
- RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
-
-/datum/mutation/human/swedish/on_losing(mob/living/carbon/human/owner)
- if(..())
- return
- UnregisterSignal(owner, COMSIG_MOB_SAY)
-
-/datum/mutation/human/swedish/proc/handle_speech(datum/source, list/speech_args)
- SIGNAL_HANDLER
-
- var/message = speech_args[SPEECH_MESSAGE]
- if(message)
- message = replacetext(message,"w","v")
- message = replacetext(message,"j","y")
- message = replacetext(message,"a",pick("å","ä","æ","a"))
- message = replacetext(message,"bo","bjo")
- message = replacetext(message,"o",pick("ö","ø","o"))
- if(prob(30))
- message += " Bork[pick("",", bork",", bork, bork")]!"
- speech_args[SPEECH_MESSAGE] = trim(message)
-
-/datum/mutation/human/chav
- name = "Chav"
- desc = "Unknown"
- quality = MINOR_NEGATIVE
- text_gain_indication = "Ye feel like a reet prat like, innit?"
- text_lose_indication = "You no longer feel like being rude and sassy."
-
-/datum/mutation/human/chav/on_acquiring(mob/living/carbon/human/owner)
- if(..())
- return
- RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
-
-/datum/mutation/human/chav/on_losing(mob/living/carbon/human/owner)
- if(..())
- return
- UnregisterSignal(owner, COMSIG_MOB_SAY)
-
-/datum/mutation/human/chav/proc/handle_speech(datum/source, list/speech_args)
- var/message = speech_args[SPEECH_MESSAGE]
- if(message)
- message = " [message] "
- message = replacetext(message," looking at "," gawpin' at ")
- message = replacetext(message," great "," bangin' ")
- message = replacetext(message," man "," mate ")
- message = replacetext(message," friend ",pick(" mate "," bruv "," bledrin "))
- message = replacetext(message," what "," wot ")
- message = replacetext(message," drink "," wet ")
- message = replacetext(message," get "," giz ")
- message = replacetext(message," what "," wot ")
- message = replacetext(message," no thanks "," wuddent fukken do one ")
- message = replacetext(message," i don't know "," wot mate ")
- message = replacetext(message," no "," naw ")
- message = replacetext(message," robust "," chin ")
- message = replacetext(message," hi "," how what how ")
- message = replacetext(message," hello "," sup bruv ")
- message = replacetext(message," kill "," bang ")
- message = replacetext(message," murder "," bang ")
- message = replacetext(message," windows "," windies ")
- message = replacetext(message," window "," windy ")
- message = replacetext(message," break "," do ")
- message = replacetext(message," your "," yer ")
- message = replacetext(message," security "," coppers ")
- speech_args[SPEECH_MESSAGE] = trim(message)
-
-
-/datum/mutation/human/elvis
- name = "Elvis"
- desc = "A terrifying mutation named after its 'patient-zero'."
- quality = MINOR_NEGATIVE
- locked = TRUE
- text_gain_indication = "You feel pretty good, honeydoll."
- text_lose_indication = "You feel a little less conversation would be great."
-
-/datum/mutation/human/elvis/on_life()
- switch(pick(1,2))
- if(1)
- if(prob(15))
- var/list/dancetypes = list("swinging", "fancy", "stylish", "20'th century", "jivin'", "rock and roller", "cool", "salacious", "bashing", "smashing")
- var/dancemoves = pick(dancetypes)
- owner.visible_message("[owner] busts out some [dancemoves] moves!")
- if(2)
- if(prob(15))
- owner.visible_message("[owner] [pick("jiggles their hips", "rotates their hips", "gyrates their hips", "taps their foot", "dances to an imaginary song", "jiggles their legs", "snaps their fingers")]!")
-
-/datum/mutation/human/elvis/on_acquiring(mob/living/carbon/human/owner)
- if(..())
- return
- RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
-
-/datum/mutation/human/elvis/on_losing(mob/living/carbon/human/owner)
- if(..())
- return
- UnregisterSignal(owner, COMSIG_MOB_SAY)
-
-/datum/mutation/human/elvis/proc/handle_speech(datum/source, list/speech_args)
- SIGNAL_HANDLER
-
- var/message = speech_args[SPEECH_MESSAGE]
- if(message)
- message = " [message] "
- message = replacetext(message," i'm not "," I aint ")
- message = replacetext(message," girl ",pick(" honey "," baby "," baby doll "))
- message = replacetext(message," man ",pick(" son "," buddy "," brother"," pal "," friendo "))
- message = replacetext(message," out of "," outta ")
- message = replacetext(message," thank you "," thank you, thank you very much ")
- message = replacetext(message," thanks "," thank you, thank you very much ")
- message = replacetext(message," what are you "," whatcha ")
- message = replacetext(message," yes ",pick(" sure", "yea "))
- message = replacetext(message," muh valids "," my kicks ")
- speech_args[SPEECH_MESSAGE] = trim(message)
-
-
/datum/mutation/human/stoner
name = "Stoner"
desc = "A common mutation that severely decreases intelligence."
diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm
index ccfd89363482..4177d8957965 100644
--- a/code/game/objects/effects/contraband.dm
+++ b/code/game/objects/effects/contraband.dm
@@ -875,10 +875,10 @@
desc = "Terra, or Earth as it's called by inhabitants, the third planet in the Sol system. Home to the only life as humans knew it, until contact with the outside universe. This poster in particular is trying to attract tourists to Terra, listing attractions like the Grand Orrery and Neue Waldstätte."
icon_state = "poster-solgov-terra"
-/obj/structure/sign/poster/solgov/ares
- name = "Ares"
- desc = "Ares, fourth planet in the Sol system. While evidence suggests that Aphrodite and Ares may have once had life, Terra was the only one that kept it. This poster in particular is trying to attract tourists to Ares, listing attractions like skiing resorts and ancient robot exhibits."
- icon_state = "poster-solgov-ares"
+/obj/structure/sign/poster/solgov/mars
+ name = "Mars"
+ desc = "Mars, fourth planet in the Sol system. While evidence suggests that Venus and Mars may have once had life, Terra was the only one that kept it. This poster in particular is trying to attract tourists to Mars, listing attractions like skiing resorts and ancient robot exhibits."
+ icon_state = "poster-solgov-mars"
/obj/structure/sign/poster/solgov/luna
name = "Luna"
@@ -892,7 +892,7 @@
/obj/structure/sign/poster/solgov/skiing
name = "Lo-Fly Skiing Advert"
- desc = "An advertisement for some low-gravity skiing resort on Ares. \"Popular with SUNS groups!\""
+ desc = "An advertisement for some low-gravity skiing resort on Mars. \"Popular with SUNS groups!\""
icon_state = "poster-solgov-loskiing"
/obj/structure/sign/poster/solgov/recyle
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index ae7aa27cdc3f..fb79cc447ab9 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -165,6 +165,7 @@
. = ..()
if(mapload && access_txt)
access = text2access(access_txt)
+ SEND_SIGNAL(src, COSMIG_ACCESS_UPDATED)
update_label()
update_appearance()
RegisterSignal(src, COMSIG_ATOM_UPDATED_ICON, PROC_REF(update_in_wallet))
@@ -259,11 +260,13 @@
/obj/item/card/id/proc/add_ship_access(datum/overmap/ship/controlled/ship)
if (ship)
ship_access += ship
+ SEND_SIGNAL(src, COSMIG_ACCESS_UPDATED)
// Removes the referenced ship from the card
/obj/item/card/id/proc/remove_ship_access(datum/overmap/ship/controlled/ship)
if (ship)
ship_access -= ship
+ SEND_SIGNAL(src, COSMIG_ACCESS_UPDATED)
// Finds the referenced ship in the list
/obj/item/card/id/proc/has_ship_access(datum/overmap/ship/controlled/ship)
diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm
index a11539595805..113a72fb8d8d 100644
--- a/code/game/objects/items/dna_injector.dm
+++ b/code/game/objects/items/dna_injector.dm
@@ -247,30 +247,6 @@
name = "\improper DNA injector (Anti-Unintelligible)"
remove_mutations = list(UNINTELLIGIBLE)
-/obj/item/dnainjector/swedishmut
- name = "\improper DNA injector (Swedish)"
- add_mutations = list(SWEDISH)
-
-/obj/item/dnainjector/antiswedish
- name = "\improper DNA injector (Anti-Swedish)"
- remove_mutations = list(SWEDISH)
-
-/obj/item/dnainjector/chavmut
- name = "\improper DNA injector (Chav)"
- add_mutations = list(CHAV)
-
-/obj/item/dnainjector/antichav
- name = "\improper DNA injector (Anti-Chav)"
- remove_mutations = list(CHAV)
-
-/obj/item/dnainjector/elvismut
- name = "\improper DNA injector (Elvis)"
- add_mutations = list(ELVIS)
-
-/obj/item/dnainjector/antielvis
- name = "\improper DNA injector (Anti-Elvis)"
- remove_mutations = list(ELVIS)
-
/obj/item/dnainjector/lasereyesmut
name = "\improper DNA injector (Laser Eyes)"
add_mutations = list(LASEREYES)
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index 88eb493626d2..c68252845c83 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -312,6 +312,18 @@
new /obj/item/clothing/mask/infiltrator(src)
new /obj/item/clothing/shoes/combat/sneakboots(src)
+/obj/item/storage/toolbox/bounty
+ name = "defused explosives case"
+ desc = "Store defused landmines in here."
+ icon_state = "infiltrator_case"
+ item_state = "infiltrator_case"
+
+/obj/item/storage/toolbox/bounty/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_combined_w_class = 8
+ STR.max_items = 4
+
//floorbot assembly
/obj/item/storage/toolbox/attackby(obj/item/stack/tile/plasteel/T, mob/user, params)
var/list/allowed_toolbox = list(/obj/item/storage/toolbox/emergency, //which toolboxes can be made into floorbots
diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm
index c031e998cdcc..002b72633294 100644
--- a/code/game/objects/items/storage/wallets.dm
+++ b/code/game/objects/items/storage/wallets.dm
@@ -42,9 +42,10 @@
/obj/item/storage/wallet/Exited(atom/movable/AM)
. = ..()
- refreshID()
+ UnregisterSignal(AM, COSMIG_ACCESS_UPDATED)
+ refresh_id()
-/obj/item/storage/wallet/proc/refreshID()
+/obj/item/storage/wallet/proc/refresh_id()
LAZYCLEARLIST(combined_access)
if(!(front_id in src))
front_id = null
@@ -61,7 +62,8 @@
/obj/item/storage/wallet/Entered(atom/movable/AM)
. = ..()
- refreshID()
+ RegisterSignal(AM, COSMIG_ACCESS_UPDATED, PROC_REF(refresh_id))
+ refresh_id()
/obj/item/storage/wallet/update_overlays()
. = ..()
diff --git a/code/modules/antagonists/ert/inteq.dm b/code/modules/antagonists/ert/inteq.dm
index 591ad684cc1d..f4636487da5f 100644
--- a/code/modules/antagonists/ert/inteq.dm
+++ b/code/modules/antagonists/ert/inteq.dm
@@ -20,5 +20,5 @@
/datum/antagonist/ert/inteq/leader
name = "Inteq Mercenary Leader"
- outfit = /datum/outfit/job/inteq/captain
+ outfit = /datum/outfit/job/inteq/captain/empty
role = "Vanguard"
diff --git a/code/modules/cargo/packs/food.dm b/code/modules/cargo/packs/food.dm
index 7abc0188f9d9..c7d8b77f46a5 100644
--- a/code/modules/cargo/packs/food.dm
+++ b/code/modules/cargo/packs/food.dm
@@ -25,7 +25,7 @@
/datum/supply_pack/food/pizza
name = "Pizza Crate"
desc = "Best prices on this side of the galaxy. All deliveries are guaranteed to be 99.5% anomaly-free!"
- cost = 6000 // Best prices this side of the galaxy.
+ cost = 3000// Best prices this side of the galaxy.
contains = list(/obj/item/pizzabox/margherita,
/obj/item/pizzabox/mushroom,
/obj/item/pizzabox/meat,
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 0698981207bf..559816007b13 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -259,7 +259,7 @@
desc = "A snazzy looking pair of ballistic goggles with an integrated security hud. The opaque visor provides flash protection."
icon_state = "inteq_goggles"
item_state = "inteq_goggles"
- supports_variations = KEPORI_VARIATION
+ supports_variations = KEPORI_VARIATION | VOX_VARIATION
glass_colour_type = /datum/client_colour/glass_colour/orange
/obj/item/clothing/glasses/hud/health/prescription
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 352349783bae..a6de8769642a 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -501,7 +501,7 @@
icon_state = "inteq_swat"
item_state = "inteq_swat"
flags_inv = HIDEHAIR
- supports_variations = KEPORI_VARIATION
+ supports_variations = KEPORI_VARIATION | VOX_VARIATION
content_overlays = TRUE
/obj/item/clothing/head/helmet/inteq
@@ -510,7 +510,7 @@
icon_state = "inteq_helmet"
icon_state = "inteq_helmet"
can_flashlight = TRUE
- supports_variations = KEPORI_VARIATION
+ supports_variations = KEPORI_VARIATION | VOX_VARIATION
content_overlays = TRUE
/obj/item/clothing/head/solgov
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 725764a10b04..d2b573711051 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -154,13 +154,6 @@
clothing_flags = VOICEBOX_TOGGLABLE
modifies_speech = TRUE
-/obj/item/clothing/mask/frog/handle_speech(datum/source, list/speech_args) //whenever you speak
- if(!(clothing_flags & VOICEBOX_DISABLED))
- if(prob(5)) //sometimes, the angry spirit finds others words to speak.
- speech_args[SPEECH_MESSAGE] = pick("HUUUUU!!","SMOOOOOKIN'!!","Hello my baby, hello my honey, hello my rag-time gal.", "Feels bad, man.", "GIT DIS GUY OFF ME!!" ,"SOMEBODY STOP ME!!", "NORMIES, GET OUT!!")
- else
- speech_args[SPEECH_MESSAGE] = pick("Ree!!", "Reee!!","REEE!!","REEEEE!!") //but its usually just angry gibberish,
-
/obj/item/clothing/mask/frog/cursed
clothing_flags = NONE
diff --git a/code/modules/clothing/outfits/factions/inteq.dm b/code/modules/clothing/outfits/factions/inteq.dm
index ee48b1872854..6ad58203e2e6 100644
--- a/code/modules/clothing/outfits/factions/inteq.dm
+++ b/code/modules/clothing/outfits/factions/inteq.dm
@@ -29,31 +29,40 @@
///captains
/datum/outfit/job/inteq/captain
- name = "IRMG - Vanguard (Naked)"
+ name = "IRMG - Vanguard"
id_assignment = "Vanguard"
jobtype = /datum/job/captain
job_icon = "captain"
+ id = /obj/item/card/id/gold
+ head = /obj/item/clothing/head/beret/sec/hos/inteq
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
+ mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
+ suit = /obj/item/clothing/suit/armor/hos/inteq
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
+ belt = /obj/item/storage/belt/security/webbing/inteq
+ gloves = /obj/item/clothing/gloves/combat
ears = /obj/item/radio/headset/inteq/alt/captain
shoes = /obj/item/clothing/shoes/combat
+
r_pocket = /obj/item/assembly/flash/handheld
l_pocket = /obj/item/restraints/handcuffs
- jobtype = /datum/job/captain
- id = /obj/item/card/id/gold
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
-/datum/outfit/job/inteq/captain/geared
- name = "IRMG - Vanguard"
+/datum/outfit/job/inteq/captain/empty
+ name = "IRMG - Vanguard (Naked)"
- head = /obj/item/clothing/head/beret/sec/hos/inteq
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
- belt = /obj/item/storage/belt/security/webbing/inteq
- suit = /obj/item/clothing/suit/armor/hos/inteq
- dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
- gloves = /obj/item/clothing/gloves/combat
- accessory = null
+ head = null
+ glasses = null
+ mask = null
+ belt = null
+ suit = null
+ dcoat = null
+ gloves = null
+
+ r_pocket = null
+ l_pocket = null
/datum/outfit/job/inteq/captain/honorable
name = "IRMG - Honorable Vanguard"
@@ -140,6 +149,14 @@
satchel = /obj/item/storage/backpack/messenger/inteq
courierbag = /obj/item/storage/backpack/messenger/inteq
+/datum/outfit/job/inteq/security/empty
+ name = "IRMG - Enforcer (Naked)"
+ head = null
+ suit = null
+ belt = null
+ mask = null
+ gloves = null
+
/datum/outfit/job/inteq/security/beluga
name = "IRMG - Enforcer (Beluga)"
@@ -156,14 +173,6 @@
satchel = /obj/item/storage/backpack/messenger/inteq
courierbag = /obj/item/storage/backpack/messenger/inteq
-/datum/outfit/job/inteq/security/empty
- name = "IRMG - Enforcer (Naked)"
- head = null
- suit = null
- belt = null
- mask = null
- gloves = null
-
///engineers
/datum/outfit/job/inteq/engineer
@@ -201,6 +210,17 @@
courierbag = /obj/item/storage/backpack/messenger/inteq
backpack_contents = list(/obj/item/melee/classic_baton=1)
+/datum/outfit/job/inteq/warden/pilot
+ name = "IRMG - Shuttle Pilot"
+ job_icon = "securityofficer"
+ id_assignment = "Shuttle Pilot"
+
+ head = /obj/item/clothing/head/soft/inteq
+ suit = /obj/item/clothing/suit/armor/vest/alt
+ belt = null
+ mask = /obj/item/clothing/mask/breath
+ gloves = /obj/item/clothing/gloves/fingerless
+
// cmo
/datum/outfit/job/inteq/cmo
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 4827186a95c5..02fbb162892b 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -1217,6 +1217,7 @@
item_state = "hardsuit_solgov"
armor = list("melee" = 50, "bullet" = 45, "laser" = 40, "energy" = 30, "bomb" = 60, "bio" = 100, "rad" = 60, "fire" = 90, "acid" = 75) //intentionally the fucking strong, this is master chief-tier armor //is this really what you call the strong?? is this the best solgov has to offer??????
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/solgov
+ allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
slowdown = 0
supports_variations = DIGITIGRADE_VARIATION
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index 3d5adf18e6fd..1eca7970a517 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -112,19 +112,6 @@
. = ..()
AddElement(/datum/element/dunkable, 10)
-/obj/item/reagent_containers/food/snacks/tatortot
- name = "tator tot"
- desc = "A large fried potato nugget that may or may not try to valid you."
- icon_state = "tatortot"
- list_reagents = list(/datum/reagent/consumable/nutriment = 4)
- filling_color = "FFD700"
- tastes = list("potato" = 3, "valids" = 1)
- foodtype = FRIED | VEGETABLES
-
-/obj/item/reagent_containers/food/snacks/tatortot/Initialize()
- . = ..()
- AddElement(/datum/element/dunkable, 10)
-
/obj/item/reagent_containers/food/snacks/soydope
name = "soy dope"
desc = "Dope from a soy."
diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm
index f76bdb462539..c349c7511752 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm
@@ -82,7 +82,6 @@
smoke.start()
if(grilled_item)
grill_time += 1
- grilled_item.reagents.add_reagent(/datum/reagent/consumable/char, 1)
grill_fuel -= 10
grilled_item.AddComponent(/datum/component/sizzle)
diff --git a/code/modules/food_and_drinks/recipes/processor_recipes.dm b/code/modules/food_and_drinks/recipes/processor_recipes.dm
index 55db7cf06b84..98c5fa053c8f 100644
--- a/code/modules/food_and_drinks/recipes/processor_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/processor_recipes.dm
@@ -13,17 +13,13 @@
input = /obj/item/reagent_containers/food/snacks/meat/rawcutlet
output = /obj/item/reagent_containers/food/snacks/meat/rawbacon
-/datum/food_processor_process/potatowedges
- input = /obj/item/reagent_containers/food/snacks/grown/potato/wedges
- output = /obj/item/reagent_containers/food/snacks/fries
-
/datum/food_processor_process/sweetpotato
input = /obj/item/reagent_containers/food/snacks/grown/potato/sweet
output = /obj/item/reagent_containers/food/snacks/yakiimo
/datum/food_processor_process/potato
input = /obj/item/reagent_containers/food/snacks/grown/potato
- output = /obj/item/reagent_containers/food/snacks/tatortot
+ output = /obj/item/reagent_containers/food/snacks/fries
/datum/food_processor_process/carrot
input = /obj/item/reagent_containers/food/snacks/grown/carrot
diff --git a/code/modules/hydroponics/grown/potato.dm b/code/modules/hydroponics/grown/potato.dm
index 703df831552e..44a987dc86ac 100644
--- a/code/modules/hydroponics/grown/potato.dm
+++ b/code/modules/hydroponics/grown/potato.dm
@@ -29,25 +29,6 @@
juice_results = list(/datum/reagent/consumable/potato_juice = 0)
distill_reagent = /datum/reagent/consumable/ethanol/vodka
-/obj/item/reagent_containers/food/snacks/grown/potato/wedges
- name = "potato wedges"
- desc = "Slices of neatly cut potato."
- icon_state = "potato_wedges"
- filling_color = "#E9967A"
- bitesize = 100
-
-
-/obj/item/reagent_containers/food/snacks/grown/potato/attackby(obj/item/W, mob/user, params)
- if(W.get_sharpness())
- to_chat(user, "You cut the potato into wedges with [W].")
- var/obj/item/reagent_containers/food/snacks/grown/potato/wedges/Wedges = new /obj/item/reagent_containers/food/snacks/grown/potato/wedges
- remove_item_from_storage(user)
- qdel(src)
- user.put_in_hands(Wedges)
- else
- return ..()
-
-
// Sweet Potato
/obj/item/seeds/potato/sweet
name = "pack of sweet potato seeds"
diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm
index 550e413f1a59..39eb08749872 100644
--- a/code/modules/jobs/access.dm
+++ b/code/modules/jobs/access.dm
@@ -117,6 +117,8 @@
if (gen_ship_access(ship))
return TRUE
+ if(!item)
+ return FALSE
var/obj/item/card/id/id = item?.GetID()
if (id?.has_ship_access(ship))
return TRUE
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index f850eded96d4..ee953b0fb74d 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -273,6 +273,7 @@
var/obj/item/card/id/C = H.get_idcard(TRUE)
if(istype(C))
C.access = J.get_access()
+ SEND_SIGNAL(C, COSMIG_ACCESS_UPDATED)
shuffle_inplace(C.access) // Shuffle access list to make NTNet passkeys less predictable
C.registered_name = H.real_name
if(H.job)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 6fffc48e76a1..c15c4a1af835 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -68,8 +68,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
add_verb(src, list(
/mob/dead/observer/proc/dead_tele,
/mob/dead/observer/proc/open_spawners_menu,
- /mob/dead/observer/proc/tray_view,
- /mob/dead/observer/proc/possess_mouse_verb))
+ /mob/dead/observer/proc/tray_view))
if(icon_state in GLOB.ghost_forms_with_directions_list)
ghostimage_default = image(src.icon,src,src.icon_state + "_nodir")
@@ -962,70 +961,3 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
client.images += t_ray_images
else
client.images -= stored_t_ray_images
-
-//WS Begin
-/mob/dead/observer/proc/possess_mouse_verb()
- set category = "Ghost"
- set name = "Possess a mouse"
- set desc = "Possess a mouse to haunt the station.... and their food!"
-
- var/list/possessible = list()
-
- for(var/mob/living/simple_animal/mouse/M in GLOB.alive_mob_list)
- if(M.stat != CONSCIOUS)
- continue
- if(M.key)
- continue
- if(M in GLOB.player_list)
- continue
- if(M.mind)
- continue
-
- possessible += M
-
- if(!possessible.len)
- to_chat(src, "There are currently no mice able to be possessed!")
- return FALSE
-
- var/mob/living/simple_animal/mouse/M = pick(possessible)
-
- possess_mouse(M)
-
-
-/mob/dead/observer/proc/possess_mouse(mob/living/simple_animal/mouse/M)
- if(!M)
- return FALSE
-
- if(!SSticker.HasRoundStarted())
- to_chat(usr, "The round hasn't started yet!")
- return FALSE
-
- if(is_banned_from(key, ROLE_SENTIENCE))
- to_chat(src, "You are job banned!")
- return FALSE
-
- if(alert("Are you sure you want to become a mouse? (Warning, you can no longer be cloned!)",,"Yes","No") != "Yes")
- return FALSE
-
- if(M.key || (M.stat != CONSCIOUS) || (M in GLOB.player_list) || M.mind || QDELETED(src) || QDELETED(M))
- to_chat(src, "This mouse is unable to be controlled, please try again!")
- return FALSE
-
- log_game("[key_name(src)] has became a mouse")
-
- M.key = key
- M.faction = list("neutral")
- M.chew_probability = 0 //so they cant pull off a big brain play by ghosting somewhere or idk
- M.layer = BELOW_OPEN_DOOR_LAYER //ENGAGE ADVANCED HIDING BRAIN FUNCTIONS
- M.language_holder = new /datum/language_holder/mouse(M)
- M.pass_flags |= PASSDOORHATCH
- M.sentience_act()
- M.maxHealth = 15
- M.health = M.maxHealth
-
- to_chat(M , "You are now possessing a mouse. \
- You do not remember your previous life. You can eat trash and \
- food on the floor to gain health and help create new mice. Mouse traps will hurt your fragile body \
- and so will any kind of weapons. You can control click food and trash items in order to eat them. Get. That. Cheese.")
- return TRUE
-//WS End
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index dd5b29059085..3ed2b86816ac 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -538,6 +538,7 @@
REMOVE_TRAIT(src, TRAIT_INCAPACITATED, STAMINA)
REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, STAMINA)
REMOVE_TRAIT(src, TRAIT_FLOORED, STAMINA)
+ REMOVE_TRAIT(src, TRAIT_HANDS_BLOCKED, STAMINA)
else
return
update_health_hud()
diff --git a/code/modules/mob/living/carbon/status_procs.dm b/code/modules/mob/living/carbon/status_procs.dm
index cc15c12d836e..5ab2c57be0f4 100644
--- a/code/modules/mob/living/carbon/status_procs.dm
+++ b/code/modules/mob/living/carbon/status_procs.dm
@@ -17,6 +17,7 @@
ADD_TRAIT(src, TRAIT_INCAPACITATED, STAMINA)
ADD_TRAIT(src, TRAIT_IMMOBILIZED, STAMINA)
ADD_TRAIT(src, TRAIT_FLOORED, STAMINA)
+ ADD_TRAIT(src, TRAIT_HANDS_BLOCKED, STAMINA)
if((maxHealth - health + getStaminaLoss()) > 120) // Puts you a little further into the initial stamcrit, makes stamcrit harder to outright counter with chems. //WS Edit - Stamina stacks with health damage
adjustStaminaLoss(30, FALSE)
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index f2fbf6e5b262..7b11d05bcf2c 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -145,9 +145,6 @@ GLOBAL_VAR_INIT(mouse_killed, 0)
else
return ..()
-/mob/living/simple_animal/mouse/attack_ghost(mob/dead/observer/user)
- user.possess_mouse(src)
-
/mob/living/simple_animal/mouse/start_pulling(atom/movable/AM, state, force, supress_message)
return FALSE
diff --git a/code/modules/overmap/missions/acquire_mission.dm b/code/modules/overmap/missions/acquire_mission.dm
index de60174081db..7a389fa1655a 100644
--- a/code/modules/overmap/missions/acquire_mission.dm
+++ b/code/modules/overmap/missions/acquire_mission.dm
@@ -211,6 +211,21 @@ Acquire: Anomaly
weight = 1
objective_type = /mob/living/simple_animal/bot/firebot/rockplanet
+/*
+ Acquire: Landmines
+*/
+
+/datum/mission/acquire/landmine/rusted
+ name = "Defuse rusted landmines"
+ desc = "We've been issued a bounty to make the Frontier a safer place by disarming dated landmines. Mind your fingers."
+ weight = 6
+ value = 2000
+ duration = 80 MINUTES
+ dur_mod_range = 0.4
+ container_type = /obj/item/storage/toolbox/bounty
+ objective_type = /obj/item/mine/pressure/explosive
+ num_wanted = 4
+
/*
Acquire: Fishing
*/
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 0341c04f2c06..07eb9a159897 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -331,7 +331,7 @@
. = ..()
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
if(ammo_type.len > 1)
- . += "You can switch firemodes by pressing the unqiue action key. By default, this is space"
+ . += "You can switch firemodes by pressing the unique action key. By default, this is space"
if(cell)
. += "\The [name]'s cell has [cell.percent()]% charge remaining."
. += "\The [name] has [round(cell.charge/shot.e_cost)] shots remaining on [shot.select_name] mode."
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 0b9bcb8da4f7..66adeb53ac59 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -490,7 +490,7 @@
if(direct_target)
return TRUE
// If target not able to use items, move and stand - or if they're just dead, pass over.
- if(L.stat == DEAD || (!hit_stunned_targets && HAS_TRAIT(L, TRAIT_IMMOBILIZED) && HAS_TRAIT(L, TRAIT_FLOORED) && HAS_TRAIT(L, TRAIT_HANDS_BLOCKED)))
+ if(L.stat || (!hit_stunned_targets && HAS_TRAIT(L, TRAIT_IMMOBILIZED) && HAS_TRAIT(L, TRAIT_FLOORED) && HAS_TRAIT(L, TRAIT_HANDS_BLOCKED)))
return FALSE
return TRUE
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 09812ef20cf3..6a69ef38e6cd 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -770,22 +770,6 @@
taste_description = "caramel"
reagent_state = SOLID
-/datum/reagent/consumable/char
- name = "Char"
- description = "Essence of the grill. Has strange properties when overdosed."
- reagent_state = LIQUID
- nutriment_factor = 5 * REAGENTS_METABOLISM
- color = "#C8C8C8"
- taste_mult = 6
- taste_description = "smoke"
- overdose_threshold = 15
-
-/datum/reagent/consumable/char/overdose_process(mob/living/M)
- if(prob(25))
- M.say(pick_list_replacements(BOOMER_FILE, "boomer"), forced = /datum/reagent/consumable/char)
- ..()
- return
-
/datum/reagent/consumable/bbqsauce
name = "BBQ Sauce"
description = "Sweet, smoky, savory, and gets everywhere. Perfect for grilling."
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 6084311b3507..11a930efda30 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -1310,8 +1310,6 @@
M.adjustStaminaLoss(-3 * REM, 0)
M.jitteriness = min(max(0, M.jitteriness + 3), 30)
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2 * REM, 150)
- if(prob(10))
- M.say(pick("Yeah, well, you know, that's just, like, uh, your opinion, man.", "Am I glad he's frozen in there and that we're out here, and that he's the sheriff and that we're frozen out here, and that we're in there, and I just remembered, we're out here. What I wanna know is: Where's the caveman?", "It ain't me, it ain't me...", "Make love, not war!", "Stop, hey, what's that sound? Everybody look what's going down...", "Do you believe in magic in a young girl's heart?"), forced = /datum/reagent/medicine/earthsblood)
M.druggy = min(max(0, M.druggy + 10), 15) //See above
..()
. = 1
@@ -2073,7 +2071,6 @@
bp.receive_damage(0, 0, 200)
else //SUCH A LUST FOR REVENGE!!!
to_chat(M, "A phantom limb hurts!")
- M.say("Why are we still here, just to suffer?", forced = /datum/reagent/medicine/lavaland_extract)
return ..()
/datum/reagent/medicine/skeletons_boon
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 9b6243358acb..24db5dd524d8 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -410,7 +410,6 @@
description = "A substance applied to the skin to darken the skin."
color = "#FFC080" // rgb: 255, 196, 128 Bright orange
metabolization_rate = 10 * REAGENTS_METABOLISM // very fast, so it can be applied rapidly. But this changes on an overdose
- overdose_threshold = 11 //Slightly more than one un-nozzled spraybottle.
taste_description = "sour oranges"
/datum/reagent/spraytan/expose_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
@@ -470,41 +469,11 @@
N.dna.features["mcolor"] = newcolor
N.regenerate_icons()
-
-
if(method == INGEST)
if(show_message)
to_chat(M, "That tasted horrible.")
..()
-
-/datum/reagent/spraytan/overdose_process(mob/living/M)
- metabolization_rate = 1 * REAGENTS_METABOLISM
-
- if(ishuman(M))
- var/mob/living/carbon/human/N = M
- if(!HAS_TRAIT(N, TRAIT_BALD))
- N.hairstyle = "Spiky"
- N.facial_hairstyle = "Shaved"
- N.facial_hair_color = "000"
- N.hair_color = "000"
- if(!(HAIR in N.dna.species.species_traits)) //No hair? No problem!
- N.dna.species.species_traits += HAIR
- if(N.dna.species.use_skintones)
- N.skin_tone = "orange"
- else if(MUTCOLORS in N.dna.species.species_traits) //Aliens with custom colors simply get turned orange
- N.dna.features["mcolor"] = "f80"
- N.regenerate_icons()
- if(prob(7))
- if(N.w_uniform)
- M.visible_message(pick("[M]'s collar pops up without warning.", "[M] flexes [M.p_their()] arms."))
- else
- M.visible_message("[M] flexes [M.p_their()] arms.")
- if(prob(10))
- M.say(pick("Shit was SO cash.", "You are everything bad in the world.", "What sports do you play, other than 'jack off to naked drawn Japanese people?'", "Don???t be a stranger. Just hit me with your best shot.", "My name is John and I hate every single one of you."), forced = /datum/reagent/spraytan)
- ..()
- return
-
/datum/reagent/mulligan
name = "Mulligan Toxin"
description = "This toxin will rapidly change the DNA of human beings. Commonly used by Syndicate spies and assassins in need of an emergency ID change."
@@ -1538,20 +1507,6 @@
name = "Royal Carpet?"
description = "For those that break the game and need to make an issue report."
-/datum/reagent/carpet/royal/on_mob_life(mob/living/carbon/M)
- . = ..()
- if(!M.mind?.assigned_role)
- return
- switch(M.mind.assigned_role)
- if("Chief Medical Officer", "Captain", "Chief Engineer", "Research Director", "Head of Personnel")
- if(prob(10))
- to_chat(M, "You feel like royalty.")
- if(prob(5))
- M.say(pick("Peasants..","This carpet is worth more than your contracts!","I could fire you at any time..."), forced = "royal carpet")
- if("Quartermaster")
- if(prob(15))
- to_chat(M, "You feel like an impostor...")
-
/datum/reagent/carpet/royal/black
name = "Royal Black Carpet"
description = "For those that feel the need to show off their timewasting skills."
@@ -1865,11 +1820,6 @@
color = "#00ff80"
taste_description = "strange honey"
-/datum/reagent/royal_bee_jelly/on_mob_life(mob/living/carbon/M)
- if(prob(2))
- M.say(pick("Bzzz...","BZZ BZZ","Bzzzzzzzzzzz..."), forced = "royal bee jelly")
- ..()
-
//Misc reagents
/datum/reagent/romerol
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 498017191179..6045779f6030 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -974,18 +974,13 @@
taste_description = "bone hurting"
overdose_threshold = 50
-/datum/reagent/toxin/bonehurtingjuice/on_mob_add(mob/living/carbon/M)
- M.say("oof ouch my bones", forced = /datum/reagent/toxin/bonehurtingjuice)
-
/datum/reagent/toxin/bonehurtingjuice/on_mob_life(mob/living/carbon/M)
M.adjustStaminaLoss(7.5, 0)
if(prob(20))
- switch(rand(1, 3))
+ switch(rand(1, 2))
if(1)
- M.say(pick("oof.", "ouch.", "my bones.", "oof ouch.", "oof ouch my bones."), forced = /datum/reagent/toxin/bonehurtingjuice)
- if(2)
M.manual_emote(pick("oofs silently.", "looks like their bones hurt.", "grimaces, as though their bones hurt."))
- if(3)
+ if(2)
to_chat(M, "Your bones hurt!")
return ..()
@@ -1000,7 +995,6 @@
bp.receive_damage(0, 0, 200)
else //SUCH A LUST FOR REVENGE!!!
to_chat(M, "A phantom limb hurts!")
- M.say("Why are we still here, just to suffer?", forced = /datum/reagent/toxin/bonehurtingjuice)
return ..()
/datum/reagent/toxin/bungotoxin
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index c0313adb2539..6a5a344b177e 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -439,14 +439,6 @@
var/mob/living/L = V
L.emote("flip")
- //SPEAK
- else if((findtext(message, speak_words)))
- cooldown = COOLDOWN_MEME
- for(var/V in listeners)
- var/mob/living/L = V
- addtimer(CALLBACK(L, TYPE_PROC_REF(/atom/movable, say), pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage")), 5 * i)
- i++
-
//GET UP
else if((findtext(message, getup_words)))
cooldown = COOLDOWN_DAMAGE //because stun removal
diff --git a/html/changelogs/AutoChangeLog-pr-3075.yml b/html/changelogs/AutoChangeLog-pr-3075.yml
deleted file mode 100644
index 554ff3998800..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3075.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: SapphicOverload
-changes:
- - {rscadd: Adds an igniter and button to the TEG of every ship that was missing
- one}
- - {rscdel: Removed the welding tool TEG chute some ships had}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3105.yml b/html/changelogs/AutoChangeLog-pr-3105.yml
deleted file mode 100644
index 0e792045f197..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3105.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Apogee-dev
-changes:
- - {bugfix: Cargo pods no longer land in Talos maint}
- - {bugfix: Gas tanks on the Talos have higher security}
- - {bugfix: Talos now has an autolathe in cargo}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3164.yml b/html/changelogs/AutoChangeLog-pr-3164.yml
deleted file mode 100644
index cc98cad67b9c..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3164.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: SomeguyManperson
-changes:
- - {bugfix: loadout boxes will no longer sometimes not spawn}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3165.yml b/html/changelogs/AutoChangeLog-pr-3165.yml
deleted file mode 100644
index 1578155eeb6f..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3165.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Apogee-dev
-changes:
- - {bugfix: N+S Captains no longer spawn with Nanotrasen coats.}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3166.yml b/html/changelogs/AutoChangeLog-pr-3166.yml
deleted file mode 100644
index bff17cd8eacb..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3166.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Apogee-dev
-changes:
- - {balance: reduced default ship spawn limit to 1.}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3168.yml b/html/changelogs/AutoChangeLog-pr-3168.yml
deleted file mode 100644
index 1a82f2fbe1e4..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3168.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Sadhorizon
-changes:
- - {rscadd: Added a plastic flower - a selection of flowers to wear. Added it to
- the loadout too.}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3171.yml b/html/changelogs/AutoChangeLog-pr-3171.yml
deleted file mode 100644
index e0dc11fa2d21..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3171.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: generalthrax
-changes:
- - {rscdel: Removed some irrelevant old tips of the round}
- - {rscadd: Added 80+ new tips more relevant to Shiptest's gameplay loop}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3196.yml b/html/changelogs/AutoChangeLog-pr-3196.yml
new file mode 100644
index 000000000000..aa923171f4dc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3196.yml
@@ -0,0 +1,5 @@
+author: FalloutFalcon
+changes:
+ - {bugfix: pets no longer cause run times trying to open ship doors}
+ - {bugfix: no longer have to reinsert your id into your wallet for access}
+delete-after: true
diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml
index 9f6fd5a203ad..b29e8aedd9e0 100644
--- a/html/changelogs/archive/2024-07.yml
+++ b/html/changelogs/archive/2024-07.yml
@@ -20,3 +20,51 @@
- rscadd: Resprites the E-50 and gives it proper inhands now!
- bugfix: The Syndicate sniper rifle fires at a normal rate of fire and has the
correct recoil now.
+2024-07-09:
+ Apogee-dev:
+ - bugfix: N+S Captains no longer spawn with Nanotrasen coats.
+ - balance: reduced default ship spawn limit to 1.
+ - bugfix: Cargo pods no longer land in Talos maint
+ - bugfix: Gas tanks on the Talos have higher security
+ - bugfix: Talos now has an autolathe in cargo
+ Sadhorizon:
+ - rscadd: Added a plastic flower - a selection of flowers to wear. Added it to the
+ loadout too.
+ SapphicOverload:
+ - rscadd: Adds an igniter and button to the TEG of every ship that was missing one
+ - rscdel: Removed the welding tool TEG chute some ships had
+ SomeguyManperson:
+ - bugfix: loadout boxes will no longer sometimes not spawn
+ - code_imp: People who are stunned are now more reliably passed by bullets not aimed
+ directly at them
+ generalthrax:
+ - rscdel: Removed some irrelevant old tips of the round
+ - rscadd: Added 80+ new tips more relevant to Shiptest's gameplay loop
+2024-07-10:
+ Cloudbreak:
+ - bugfix: A few clothing items now properly display again for Vox.
+ meemofcourse:
+ - rscadd: Minor changes to the Tortuga.
+ - bugfix: The holofields on the Tortuga-class and Brawler-class now work.
+2024-07-11:
+ Cloudbreak:
+ - code_imp: Fixes a singular typo within the code.
+ Martinpachu:
+ - balance: Pizzas have become cheaper. (6000 cr - 3000 cr)
+ PositiveEntropy:
+ - bugfix: Mars and Venus are now referred to by their correct names!
+ - bugfix: You can now store guns, ammunition, and melee weapons on the armor slot
+ when equipping a SolCon/SolGov hardsuit, and its subtypes!
+ generalthrax:
+ - rscdel: Removed tator tots and raw potato wedges
+2024-07-12:
+ generalthrax:
+ - rscdel: Removed mice possession
+ - rscdel: Broad removal of forcesays from most reagents and items
+ - rscdel: Removed char reagent and spraytan overdose
+ - rscdel: Removed gibbering lines
+ - rscdel: Removed Chav, Swedish, Elvis mutations
+ - rscadd: The outpost is now offering bounties to defuse landmines to Frontier vessels.
+ meemofcourse:
+ - balance: Remapped the Valor, with two extra jobs (Shuttle Corpsman, Shuttle Pilot).
+ - code_imp: The Vanguard base outfit starts with gear.
diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi
index b34b3777adac..20fe8abf2d5c 100644
Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ
diff --git a/strings/boomer.json b/strings/boomer.json
deleted file mode 100644
index 4fb2f733f795..000000000000
--- a/strings/boomer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "boomer": [
- "@pick(kids) these days have it too easy!",
- "Do I look like I know what a @pick(file) is!?",
- "Listen here Jack, how do I open @pick(file)?",
- "How do I open a @pick(file) again?",
- "Unlike you snowflakes, I'm not offended so easily.",
- "Back in my day...",
- "When I was your age...",
- "This generation can't take a joke.",
- "Why are @pick(kids) these days so @pick(sad) all the time?",
- "These damn @pick(kids) need to get a @pick(impossible) for once!",
- "It's simply a matter of showing up, looking the manager in the eye, giving him a firm handshake and telling him you want the job.",
- "You'll never get anywhere in life without a degree.",
- "@pick(expense) isn't really that expensive.",
- "When I was a kid I had to walk to school uphill both ways!",
- "I hate my wife.",
- "I just want to grill for God's sake.",
- "I wish I could just go on my lawnmower and cut the grass.",
- "Yep, Quake. That was a good game...",
- "Yeah, my PDA has wi-fi. A wife I hate."
- ],
-
- "expense": ["Healthcare", "College", "A car", "A house", "Food"],
-
- "kids": ["kids", "millenials", "snowflakes"],
-
- "file": ["JPEG", "PDF", "DMI", "JSON"],
-
- "sad": ["sad", "depressed", "sad and depressed"],
-
- "impossible": ["job", "house", "job and a house", "life"]
-}
diff --git a/strings/traumas.json b/strings/traumas.json
index f6bd9b589553..1d1e98581d4f 100644
--- a/strings/traumas.json
+++ b/strings/traumas.json
@@ -1,168 +1,4 @@
{
- "brain_damage": [
- "@pick(semicolon)IM A PONY NEEEEEEIIIIIIIIIGH",
- "without oxigen blob don't evoluate?",
- "@pick(semicolon)CAPTAINS A COMDOM",
- "can u give me @pick(mutations)?",
- "THe saiyans screwed",
- "Bi is THE BEST OF BOTH WORLDS>",
- "@pick(semicolon)I WANNA PET TEH monkeyS",
- "stop grifing me!!!!",
- "SOTP IT#",
- "shiggey diggey!!",
- "@pick(semicolon)A PIRATE APPEAR",
- "FUS RO DAH",
- "stat me",
- ">my face",
- "roll it easy!",
- "lol2cat",
- "dem dwarfs man, dem dwarfs",
- "hwee did eet fhor khayosss",
- "lifelike texture ;_;",
- "luv can bloooom",
- "PACKETS!!!",
- "port ba@pick(y_replacements) med!!!!",
- "youed call her a toeugh bithc",
- "closd for merbegging",
- "@pick(semicolon)pray can u @pick(create_verbs) @pick(create_nouns)???",
- "GEY AWAY FROM ME U GREIFING PRICK!!!!",
- "@pick(semicolon)HELP INTEG MURDERIN MEE!!!",
- "hwat dose tha @pick(random_gibberish) mean?????",
- "@pick(semicolon)DO A BLUP SPEaS JUMP!!!!!",
- "wearnig siNGUARLTY is.... FINE haHAAA",
- "@pick(semicolon)AI laW 22 Open door",
- "@pick(semicolon)this SI mY sHip......",
- "who the HELL do u thenk u r?!!!!",
- "geT THE FUCK OUTTTT",
- "@pick(semicolon)CRASHING THIS SHIMP WITH NIO SURVIVROS",
- "PSHOOOM",
- "REMOVE SINGULARITY",
- "INSTLL TEG",
- "TURBIN IS BEST ENGIENE",
- "SOLIRS CAN POWER THE HOLE FLEEHT ANEWAY @pick(bug)",
- "parasteng was best",
- "@pick(semicolon)I'VE GOT BALLS OF STEEL",
- "NO I'M ONNA KILL YOU MOTHERFUCKER OLD STYLE",
- "i will snatch erry motherfucker birthday",
- "u just did the world a little bit more sad place for someone",
- "@pick(semicolon)N-NYAAAAAA~",
- "@pick(bug)",
- "@pick(semicolon)wtf??????????? @pick(bug)",
- "@pick(semicolon)i ran into the supermattre ten i dsappeard @pick(bug)",
- "DON'T EVER TUCH ME",
- "@pick(semicolon)How do I set up the. SHow do I set u p the Singu. how I the scrungulartiy????",
- "AMOGN US IS FUNNY!!",
- "DID YOU FUCKING.",
- "i DEMAND!!! APOGEE-DEV BE DEOMTED!!!",
- "@pick(semicolon)I don't ndED tEARPAHY.",
- "@pick(semicolon)an,d CIOCK.",
- "TUWN ME INoT A CAT!!",
- "WHY WAES THE PEILL REMOVED???",
- "work on the wiki please",
- "ahelp SPAWN @pick(aspawnships) PLS",
- "Am i allowd to kil l people if thye piss me off",
- "IS THIS LIEK VOIDCREW???",
- "UNiT PANICKING.",
- "HIII!! HI!! <3 <3 <3",
- "I LOOK LKIE BEAN,S,,, CRINGE!!!",
- "SEET TH shIP TO kOS!!!!!",
- "IM SynDCIATe, I ANTag, I CAN KOS......",
- "ahelp ADMIN CAN I BE PIRTA",
- "DOCTOR YUO DO DISCETIONS!!!",
- "RESERCH NANIYES",
- "REVSRSE A NY WALLS!!!",
- "*monch",
- "Amonger",
- "Live mas",
- "top ten goliath funny moments",
- "put me... in a stew... then buryy mee...",
- "@pick(semicolon)GTT AWYA FROM HER YOU BITHC!!",
- "@pick(semicolon)IS TATH A FUCKIGN,, MOTH.",
- "@pick(semicolon)BRAZIL NUMEOR UNO...!!!!",
- "@pick(semicolon)blbue hair??? I'M GOIgN TO KILL THDT FUIKNG COW!",
- "@pick(semicolon)HOW DO I @pick(ghetto)?????",
- "ough",
- "ourgh",
- "ouughghnnnn",
- "hrrnggg",
- "HE IS BALD!!!",
- "I AM NORMAL. I CAN BE TRUSTED WITH INDUSTRIAL CHEMICALS",
- "Welcome to the bathroom",
- "THE AMOUNGS BROKE ALL MY BONES",
- "HOLY SHIT IT'S @pick(john) @pick(factions)!!",
- "BLrobo BLEEBUS.....",
- "drugs are funny because they add new rp elements",
- "ANOTHER SHIP... STERALIZED...",
- "HOpeLes WAsN'T ALwAYS NaMeD HoPelESs BeFORE THe incIDENST...",
- "@pick(semicolon)HopeLSS WAS ACTUAL. Ly a LIVIng WaePON....",
- "@pick(semicolon)WHEN SHIPQUEST????? PANEL NEW??????",
- "WHER.E SHIPQUEST???,???",
- "ei,,ither wAy... It Is WHt ti is",
- "butT ShIPPtSt nEVER was a WrAZnOe liKE thaEt!!",
- "A deEoP-setED dISEuire... fuR pERfECTiOsM...",
- "HUMORER IS A DECLIAT THINGE!!",
- "who's the asshole flying the pill class",
- "IVOR@pick(y_replacements) WHAT THE FOUCKE ARE U DUING!!!??",
- "RESIEST BIG MOETH",
- "WE MUSTE RIASE UOP AGANST BEEG MOTNH",
- "Luckily, I passed high school physics",
- "I WANT NOTHING MORE IN THIS LIFE THAN TO CUDDLE UP WITH A CUTE MOTH WAIFU!!",
- "GO TO HORNY JAIL!!"
- ],
-
- "mutations": [
- "telikesis",
- "halk",
- "eppilapse",
- "kamelien",
- "eksrey",
- "glowey skin",
- "fungal tb",
- "stun gloves"
- ],
-
- "john": ["joehn", "jonn", "jouhn", "jeeoun"],
-
- "factions": ["SYNDICT", "NATOSASEN", "EEMTEQ", "MIENUTMEN", "SOMLGOVM"],
-
- "random_gibberish": ["g", "squid", "r", "carbon dioxide"],
-
- "y_replacements": ["y", "i", "e"],
-
- "create_verbs": ["spawn", "MAke me", "creat", "tc trade me", "gib"],
-
- "create_nouns": [
- "zenomorfs",
- "ayleins",
- "treaitors",
- "sheadow lings",
- "abdoocters",
- "revinent",
- "deval",
- "deth squads",
- "bleb",
- "cock cult",
- "anteg"
- ],
-
- "aspawnships": [
- "BUblBUE",
- "RoUBE",
- "PeEL",
- "TWInkLRE",
- "MAYONEISE",
- "raEDIO",
- "joUPITR",
- "HAELR TROCK",
- "BEYOO",
- "TID"
- ],
-
- "bug": ["", "IS TIS A BUG??", "SI IST A BUGG/", "BUG!!!"],
-
- "semicolon": ["", ";", ".h"],
-
- "ghetto": ["ghetcheom", "ghettoghemc", "gahttochem"],
"god_foe": [
"MORTALS",