diff --git a/_maps/shuttles/shiptest/inteq_colossus.dmm b/_maps/shuttles/shiptest/inteq_colossus.dmm
index 04c52ce9626f..9aec48334728 100644
--- a/_maps/shuttles/shiptest/inteq_colossus.dmm
+++ b/_maps/shuttles/shiptest/inteq_colossus.dmm
@@ -4,6 +4,10 @@
dir = 1
},
/obj/item/trash/raisins,
+/obj/machinery/light_switch{
+ dir = 4;
+ pixel_x = -20
+ },
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"ai" = (
@@ -110,24 +114,26 @@
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/fore)
"bJ" = (
+/obj/structure/table/reinforced,
+/obj/machinery/fax,
+/obj/machinery/light/directional/north,
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
},
/obj/effect/turf_decal/borderfloor{
- dir = 5
+ dir = 4
},
-/obj/item/radio/intercom/directional/north{
- freerange = 1;
- freqlock = 1;
- frequency = 1347;
- name = "IRMG shortwave intercom"
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
},
-/obj/machinery/telecomms/relay/preset/mining{
- autolinkers = list("relay","hub");
- freq_listening = list(1347);
- id = "IRMG Relay";
- name = "IRMG Relay";
- network = "irmg_commnet"
+/obj/machinery/button/door{
+ id = "colossus_windows";
+ name = "Window Lockdown";
+ pixel_x = -4;
+ pixel_y = 21
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
@@ -167,21 +173,12 @@
/obj/machinery/atmospherics/components/unary/shuttle/heater{
dir = 4
},
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 1
- },
/obj/machinery/door/poddoor{
dir = 4;
id = "colossus_thrusters"
},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/engine/hull/reinforced/interior,
/area/ship/maintenance/starboard)
"cd" = (
/obj/item/storage/backpack/messenger/inteq,
@@ -199,7 +196,7 @@
pixel_y = 28
},
/obj/machinery/firealarm/directional/east,
-/turf/open/floor/carpet/black,
+/turf/open/floor/plasteel/grimy,
/area/ship/crew)
"cq" = (
/obj/structure/cable{
@@ -208,7 +205,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/item/radio/intercom/directional/west,
-/turf/open/floor/carpet/black,
+/turf/open/floor/plasteel/grimy,
/area/ship/crew)
"ct" = (
/obj/structure/cable{
@@ -222,11 +219,25 @@
/obj/structure/cable{
icon_state = "1-8"
},
-/obj/effect/turf_decal/borderfloor{
+/obj/structure/table/reinforced,
+/obj/item/gps{
+ pixel_x = 12
+ },
+/obj/item/paper_bin,
+/obj/item/pen/fountain,
+/obj/item/toy/figure/vanguard{
+ pixel_x = -10;
+ pixel_y = 5
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/corner/opaque/yellow{
dir = 1
},
-/obj/structure/table/reinforced,
-/obj/machinery/fax,
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"cM" = (
@@ -379,6 +390,13 @@
/obj/machinery/vending/cigarette,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
+"eC" = (
+/obj/structure/marker_beacon{
+ picked_color = "Lime"
+ },
+/obj/structure/catwalk,
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
"eI" = (
/obj/effect/turf_decal/box/corners,
/obj/structure/cable{
@@ -556,6 +574,10 @@
},
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
+"fU" = (
+/obj/structure/catwalk,
+/turf/open/floor/engine/hull/reinforced,
+/area/ship/external/dark)
"fW" = (
/obj/effect/turf_decal/siding/thinplating/corner,
/obj/effect/turf_decal/siding/thinplating/corner{
@@ -622,15 +644,8 @@
/obj/machinery/modular_computer/console/preset/command{
dir = 8
},
-/obj/machinery/button/door{
- dir = 1;
- id = "colossus_windows";
- name = "Window Lockdown";
- pixel_x = -4;
- pixel_y = -21
- },
/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"gJ" = (
/obj/effect/turf_decal/siding/thinplating/corner{
@@ -707,13 +722,13 @@
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/hallway/port)
"hO" = (
-/obj/machinery/door/airlock/external,
-/obj/effect/turf_decal/borderfloor{
+/obj/effect/turf_decal/techfloor{
dir = 1
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/tech,
+/obj/structure/sign/warning/vacuum/external{
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel/tech/grid,
/area/ship/hallway/port)
"hQ" = (
/obj/machinery/power/shuttle/engine/electric{
@@ -722,7 +737,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
-/turf/open/floor/plating,
+/turf/open/floor/engine/hull/reinforced,
/area/ship/maintenance/port)
"hU" = (
/obj/item/radio/intercom/directional/east,
@@ -737,13 +752,11 @@
/obj/effect/turf_decal/box/corners{
dir = 8
},
-/obj/machinery/status_display/shuttle{
- pixel_x = -32
- },
/obj/structure/sign/poster/official/no_erp{
pixel_y = -32
},
/obj/machinery/light/directional/south,
+/obj/machinery/computer/helm/viewscreen/directional/west,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"ie" = (
@@ -829,6 +842,7 @@
},
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/storage/belt/military/assault,
+/obj/item/reagent_containers/spray/pepper,
/turf/open/floor/plasteel/dark,
/area/ship/security)
"iT" = (
@@ -844,7 +858,17 @@
/obj/machinery/computer/cargo/express{
dir = 1
},
-/turf/open/floor/plasteel/tech,
+/obj/effect/turf_decal/borderfloor,
+/obj/item/radio/intercom/directional/north{
+ dir = 4;
+ freerange = 1;
+ freqlock = 1;
+ frequency = 1347;
+ name = "IRMG shortwave intercom";
+ pixel_x = 31;
+ pixel_y = 0
+ },
+/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"iY" = (
/obj/machinery/power/apc/auto_name/directional/east,
@@ -861,8 +885,8 @@
/obj/item/stack/sheet/mineral/plasma/twenty,
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/machinery/light_switch{
- pixel_x = 20;
dir = 8;
+ pixel_x = 20;
pixel_y = 11
},
/turf/open/floor/plating,
@@ -1128,7 +1152,6 @@
dir = 4
},
/obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
-/obj/item/clothing/head/helmet/space/inteq,
/turf/open/floor/plasteel/tech/grid,
/area/ship/security/armory)
"mY" = (
@@ -1150,32 +1173,37 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/structure/cable{
- icon_state = "2-4"
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/firealarm/directional/west,
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"nm" = (
/obj/machinery/atmospherics/pipe/layer_manifold,
-/obj/effect/turf_decal/techfloor{
- dir = 1
- },
-/obj/structure/sign/warning/vacuum/external{
- pixel_x = 32
- },
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/east,
/turf/open/floor/plasteel/tech/grid,
/area/ship/hallway/port)
"ny" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 6
},
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"ob" = (
@@ -1191,7 +1219,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/open/floor/carpet/black,
+/turf/open/floor/plasteel/grimy,
/area/ship/crew)
"og" = (
/obj/effect/turf_decal/corner/opaque/yellow{
@@ -1230,7 +1258,6 @@
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"on" = (
-/obj/effect/turf_decal/industrial/warning,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/shieldwallgen/atmos{
anchored = 1;
@@ -1241,10 +1268,11 @@
/obj/structure/cable{
icon_state = "0-2"
},
+/obj/effect/turf_decal/industrial/warning/fulltile,
/obj/machinery/door/poddoor{
id = "colossus_port"
},
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced/interior,
/area/ship/cargo)
"oq" = (
/obj/effect/turf_decal/borderfloorblack{
@@ -1261,7 +1289,7 @@
/obj/machinery/power/shuttle/engine/fueled/plasma{
dir = 4
},
-/turf/open/floor/plating,
+/turf/open/floor/engine/hull/reinforced,
/area/ship/maintenance/port)
"oY" = (
/obj/machinery/suit_storage_unit/inherit{
@@ -1277,7 +1305,6 @@
pixel_x = 32
},
/obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
-/obj/item/clothing/head/helmet/space/inteq,
/turf/open/floor/plasteel/tech/grid,
/area/ship/security/armory)
"pa" = (
@@ -1380,13 +1407,11 @@
/turf/open/floor/plating,
/area/ship/maintenance/port)
"pX" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 1
- },
+/obj/effect/turf_decal/industrial/warning/fulltile,
/obj/machinery/door/poddoor{
id = "colossus_starboard"
},
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced/interior,
/area/ship/cargo)
"qu" = (
/obj/machinery/cryopod{
@@ -1435,7 +1460,7 @@
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
/obj/machinery/airalarm/directional/south,
-/turf/open/floor/carpet/black,
+/turf/open/floor/plasteel/grimy,
/area/ship/crew)
"qX" = (
/obj/structure/rack,
@@ -1461,7 +1486,6 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/security/armory)
"rb" = (
-/obj/effect/turf_decal/industrial/warning,
/obj/machinery/power/shieldwallgen/atmos{
anchored = 1;
dir = 8;
@@ -1471,30 +1495,12 @@
/obj/structure/cable{
icon_state = "0-2"
},
+/obj/effect/turf_decal/industrial/warning/fulltile,
/obj/machinery/door/poddoor{
id = "colossus_port"
},
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced/interior,
/area/ship/cargo)
-"re" = (
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/power/smes/shuttle/precharged{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/door/window/eastleft{
- name = "Engine Access"
- },
-/obj/machinery/door/poddoor{
- dir = 4;
- id = "colossus_thrusters"
- },
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
"rh" = (
/turf/closed/wall/mineral/plastitanium,
/area/ship/cargo)
@@ -1556,8 +1562,13 @@
},
/obj/machinery/light/small/directional/north,
/obj/machinery/door/window/brigdoor/eastright{
+ name = "Weapons Lockup";
req_access_txt = "3"
},
+/obj/machinery/light_switch{
+ pixel_x = -12;
+ pixel_y = 23
+ },
/turf/open/floor/plasteel/tech,
/area/ship/security/armory)
"rS" = (
@@ -1606,11 +1617,9 @@
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
-/obj/machinery/status_display/shuttle{
- pixel_x = -32
- },
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/directional/north,
+/obj/machinery/computer/helm/viewscreen/directional/west,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"sc" = (
@@ -1621,25 +1630,6 @@
/obj/item/toy/figure/inteq,
/turf/open/floor/plasteel/dark,
/area/ship/crew/office)
-"sj" = (
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/power/smes/shuttle/precharged{
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/door/window/eastright{
- name = "Engine Access"
- },
-/obj/machinery/door/poddoor{
- dir = 4;
- id = "colossus_thrusters"
- },
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
"sp" = (
/obj/effect/turf_decal/box/corners{
dir = 1
@@ -1659,12 +1649,14 @@
dir = 6
},
/obj/item/radio/intercom/directional/east,
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_x = -5;
+ pixel_y = -19
+ },
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/fore)
"sD" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 1
- },
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/shieldwallgen/atmos{
anchored = 1;
@@ -1673,10 +1665,11 @@
locked = 1
},
/obj/structure/cable,
+/obj/effect/turf_decal/industrial/warning/fulltile,
/obj/machinery/door/poddoor{
id = "colossus_starboard"
},
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced/interior,
/area/ship/cargo)
"sF" = (
/obj/structure/cable{
@@ -1685,17 +1678,12 @@
/obj/machinery/power/smes/shuttle/precharged{
dir = 4
},
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/door/window/eastleft{
- name = "Engine Access"
- },
/obj/machinery/door/poddoor{
dir = 4;
id = "colossus_thrusters"
},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/engine/hull/reinforced/interior,
/area/ship/maintenance/port)
"sP" = (
/obj/structure/chair{
@@ -1752,17 +1740,12 @@
/obj/machinery/power/smes/shuttle/precharged{
dir = 4
},
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/machinery/door/window/eastright{
- name = "Engine Access"
- },
/obj/machinery/door/poddoor{
dir = 4;
id = "colossus_thrusters"
},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/engine/hull/reinforced/interior,
/area/ship/maintenance/starboard)
"tt" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -1802,12 +1785,6 @@
/turf/open/floor/plasteel/tech/grid,
/area/ship/hallway/port)
"tI" = (
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/machinery/holopad/emergency/command,
/turf/open/floor/carpet/orange,
/area/ship/bridge)
@@ -1869,9 +1846,6 @@
dir = 4;
name = "Helm"
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/effect/landmark/start/head_of_security,
/turf/open/floor/carpet/orange,
/area/ship/bridge)
@@ -1914,22 +1888,19 @@
/turf/open/floor/plasteel/tech,
/area/ship/hallway/central)
"uy" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/effect/turf_decal/borderfloor{
dir = 4
},
/obj/machinery/computer/helm{
dir = 8
},
-/turf/open/floor/plasteel/dark,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"uE" = (
/obj/structure/cable{
@@ -1987,8 +1958,10 @@
/turf/open/floor/plasteel/dark,
/area/ship/security)
"va" = (
-/obj/machinery/computer/rdconsole/core{
- dir = 4
+/obj/structure/table/reinforced,
+/obj/item/flashlight/lamp{
+ pixel_x = -5;
+ pixel_y = 13
},
/turf/open/floor/plasteel/dark,
/area/ship/crew/office)
@@ -2059,11 +2032,11 @@
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/cargo)
"vZ" = (
-/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning/fulltile,
/obj/machinery/door/poddoor{
id = "colossus_port"
},
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced/interior,
/area/ship/cargo)
"wb" = (
/obj/structure/table,
@@ -2179,8 +2152,8 @@
},
/obj/effect/turf_decal/steeldecal/steel_decals_central7,
/obj/machinery/light_switch{
- pixel_y = 23;
- pixel_x = 11
+ pixel_x = 11;
+ pixel_y = 23
},
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
@@ -2230,9 +2203,7 @@
/obj/effect/turf_decal/corner/opaque/brown{
dir = 4
},
-/obj/machinery/status_display/shuttle{
- pixel_x = 32
- },
+/obj/machinery/computer/helm/viewscreen/directional/east,
/turf/open/floor/plasteel/dark,
/area/ship/crew/office)
"xO" = (
@@ -2329,7 +2300,7 @@
name = "uniform closet";
pixel_y = 28
},
-/turf/open/floor/carpet/black,
+/turf/open/floor/plasteel/grimy,
/area/ship/crew)
"zW" = (
/obj/structure/cable{
@@ -2373,9 +2344,6 @@
/turf/open/floor/carpet/black,
/area/ship/crew)
"Ae" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
@@ -2446,6 +2414,15 @@
},
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
+"Bn" = (
+/obj/docking_port/stationary{
+ dir = 2;
+ dwidth = 15;
+ height = 15;
+ width = 30
+ },
+/turf/template_noop,
+/area/template_noop)
"Br" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -2469,7 +2446,6 @@
},
/obj/machinery/airalarm/directional/west,
/obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
-/obj/item/clothing/head/helmet/space/inteq,
/turf/open/floor/plasteel/tech/grid,
/area/ship/security/armory)
"BA" = (
@@ -2503,7 +2479,7 @@
pixel_y = -5
},
/obj/machinery/light/small/directional/west,
-/turf/open/floor/carpet/black,
+/turf/open/floor/plasteel/grimy,
/area/ship/crew)
"BK" = (
/obj/effect/turf_decal/box/corners{
@@ -2520,7 +2496,6 @@
},
/obj/structure/closet/cardboard,
/obj/item/radio/intercom/directional/south,
-/obj/item/storage/box/inteqmaid,
/obj/effect/spawner/lootdrop/maintenance/seven,
/obj/effect/turf_decal/corner_techfloor_gray{
dir = 4
@@ -2566,6 +2541,11 @@
/obj/effect/turf_decal/siding/thinplating{
dir = 9
},
+/obj/machinery/light_switch{
+ dir = 4;
+ pixel_x = -20;
+ pixel_y = -5
+ },
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"Ck" = (
@@ -2621,10 +2601,10 @@
/turf/open/floor/plating,
/area/ship/crew/office)
"CA" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable{
- icon_state = "2-8"
+ icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/carpet/orange,
/area/ship/bridge)
"CG" = (
@@ -2639,7 +2619,6 @@
},
/obj/machinery/light/directional/west,
/obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
-/obj/item/clothing/head/helmet/space/inteq,
/turf/open/floor/plasteel/tech/grid,
/area/ship/security/armory)
"Da" = (
@@ -2663,7 +2642,6 @@
/obj/item/clothing/under/syndicate/inteq,
/obj/item/clothing/suit/armor/hos/inteq,
/obj/item/clothing/head/beret/sec/hos/inteq,
-/obj/item/radio/headset/inteq/alt/captain,
/obj/item/areaeditor/shuttle,
/obj/item/shield/riot/tele,
/obj/structure/cable{
@@ -2737,6 +2715,10 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
+/obj/machinery/light_switch{
+ pixel_x = 11;
+ pixel_y = 23
+ },
/turf/open/floor/plasteel/tech,
/area/ship/security/armory)
"DW" = (
@@ -2854,13 +2836,16 @@
/obj/machinery/atmospherics/pipe/simple/orange/hidden/layer1{
dir = 9
},
-/obj/structure/table/rolling,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/mop,
/obj/structure/sign/warning/nosmoking/circle{
pixel_x = 32
},
-/obj/item/pushbroom,
+/obj/machinery/telecomms/relay/preset/mining{
+ autolinkers = list("relay","hub");
+ freq_listening = list(1347);
+ id = "IRMG Relay";
+ name = "IRMG Relay";
+ network = "irmg_commnet"
+ },
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/port)
"FR" = (
@@ -2906,8 +2891,8 @@
/obj/machinery/light/small/directional/east,
/obj/machinery/airalarm/directional/south,
/obj/machinery/light_switch{
- pixel_y = 23;
- pixel_x = 11
+ pixel_x = 11;
+ pixel_y = 23
},
/turf/open/floor/plasteel/showroomfloor,
/area/ship/crew/toilet)
@@ -2995,8 +2980,8 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/trash/sosjerky,
/obj/machinery/light_switch{
- pixel_y = 23;
- pixel_x = -12
+ pixel_x = -12;
+ pixel_y = 23
},
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
@@ -3110,23 +3095,29 @@
/obj/item/clothing/head/helmet/space/inteq,
/obj/machinery/suit_storage_unit/inherit,
/obj/machinery/light_switch{
- pixel_x = 20;
dir = 8;
+ pixel_x = 20;
pixel_y = 11
},
/turf/open/floor/plasteel/tech,
/area/ship/hallway/port)
+"Ii" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/hallway/port)
"Il" = (
-/obj/machinery/power/apc/auto_name/directional/west,
/obj/effect/turf_decal/steeldecal/steel_decals_central7{
dir = 4
},
-/obj/structure/cable{
- icon_state = "0-4"
- },
/obj/machinery/suit_storage_unit/inherit,
/obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
/obj/item/tank/jetpack/oxygen,
+/obj/machinery/light/directional/west,
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
/turf/open/floor/plasteel/dark,
/area/ship/hallway/port)
"It" = (
@@ -3245,8 +3236,8 @@
},
/obj/effect/turf_decal/steeldecal/steel_decals_central7,
/obj/machinery/light_switch{
- pixel_y = 23;
- pixel_x = 11
+ pixel_x = 11;
+ pixel_y = 23
},
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/fore)
@@ -3256,10 +3247,20 @@
name = "vanguard's bedsheet"
},
/obj/structure/curtain/bounty,
-/obj/effect/turf_decal/borderfloor{
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/brown{
dir = 8
},
-/obj/machinery/airalarm/directional/north,
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
+ },
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"KM" = (
@@ -3318,21 +3319,12 @@
/obj/machinery/atmospherics/components/unary/shuttle/heater{
dir = 4
},
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
/obj/machinery/door/poddoor{
dir = 4;
id = "colossus_thrusters"
},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/engine/hull/reinforced/interior,
/area/ship/maintenance/port)
"Lx" = (
/obj/structure/closet/crate,
@@ -3377,7 +3369,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
-/turf/open/floor/plating,
+/turf/open/floor/engine/hull/reinforced,
/area/ship/maintenance/starboard)
"Mg" = (
/obj/effect/turf_decal/corner/opaque/yellow,
@@ -3499,32 +3491,20 @@
/turf/open/floor/plasteel/dark,
/area/ship/crew/office)
"NH" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
},
-/obj/machinery/light/directional/north,
-/obj/item/storage/fancy/cigarettes/cigars/havana,
-/obj/item/lighter{
- pixel_y = 5
+/obj/machinery/turretid/lethal{
+ pixel_y = 22
},
-/obj/item/toy/figure/vanguard{
- pixel_x = -10;
- pixel_y = 5
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/machinery/turretid/lethal{
- pixel_y = 32
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 4
},
-/obj/structure/table/reinforced,
-/obj/item/paper_bin,
-/obj/item/pen/fountain,
-/obj/item/gps{
- pixel_x = 12
+/obj/effect/turf_decal/corner/opaque/yellow{
+ dir = 1
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
@@ -3608,9 +3588,12 @@
/turf/open/floor/carpet/black,
/area/ship/crew)
"Ou" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/external/dark)
+/obj/machinery/door/airlock/external,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/industrial/warning/fulltile,
+/turf/open/floor/plasteel/tech,
+/area/ship/hallway/port)
"Ow" = (
/obj/structure/sign/number/nine{
dir = 1
@@ -3624,13 +3607,13 @@
/obj/machinery/atmospherics/pipe/simple/dark/visible/layer5{
dir = 5
},
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced,
/area/ship/engineering)
"OG" = (
/obj/machinery/power/shuttle/engine/fueled/plasma{
dir = 4
},
-/turf/open/floor/plating,
+/turf/open/floor/engine/hull/reinforced,
/area/ship/maintenance/starboard)
"OV" = (
/obj/structure/cable{
@@ -3641,10 +3624,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/turf_decal/corner/opaque/yellow,
-/obj/effect/turf_decal/corner/opaque/brown{
- dir = 8
- },
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning,
/turf/open/floor/plasteel/dark,
/area/ship/crew/office)
"Pb" = (
@@ -3706,8 +3686,12 @@
/obj/machinery/light_switch{
dir = 1;
pixel_x = 11;
- pixel_y = -17
+ pixel_y = -19
},
+/obj/item/pushbroom,
+/obj/item/mop,
+/obj/item/reagent_containers/glass/bucket,
+/obj/structure/table,
/turf/open/floor/plating,
/area/ship/maintenance/port)
"Pq" = (
@@ -3744,7 +3728,7 @@
/obj/machinery/light_switch{
dir = 1;
pixel_x = 5;
- pixel_y = -20
+ pixel_y = -19
},
/obj/effect/turf_decal/corner/opaque/yellow,
/obj/effect/turf_decal/corner/opaque/brown{
@@ -3798,7 +3782,6 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/effect/turf_decal/borderfloor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -3808,12 +3791,13 @@
dir = 1
},
/obj/machinery/door/firedoor/border_only,
+/obj/effect/turf_decal/industrial/warning/fulltile,
/turf/open/floor/plasteel/tech,
/area/ship/hallway/port)
"QL" = (
/obj/machinery/door/airlock/command/glass{
name = "Bridge";
- req_access_txt = "58"
+ req_access_txt = "20"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -3850,7 +3834,7 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
name = "exhaust injector"
},
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced,
/area/ship/engineering)
"Rq" = (
/obj/structure/cable{
@@ -3884,14 +3868,12 @@
/turf/open/floor/plating,
/area/ship/engineering)
"RH" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 1
- },
/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/industrial/warning/fulltile,
/obj/machinery/door/poddoor{
id = "colossus_starboard"
},
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced/interior,
/area/ship/cargo)
"RI" = (
/obj/effect/turf_decal/siding/thinplating/dark{
@@ -3983,9 +3965,6 @@
/area/ship/cargo)
"Sj" = (
/obj/structure/table/reinforced,
-/obj/structure/cable{
- icon_state = "1-8"
- },
/obj/machinery/light/directional/south,
/obj/item/radio/intercom/directional/south,
/obj/item/storage/lockbox/medal/sec{
@@ -3996,6 +3975,10 @@
/obj/item/spacecash/bundle/c1000,
/obj/item/spacecash/bundle/c1000,
/obj/item/spacecash/bundle/c1000,
+/obj/effect/turf_decal/corner/opaque/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/corner/opaque/yellow,
/turf/open/floor/plasteel/tech,
/area/ship/bridge)
"Sp" = (
@@ -4005,9 +3988,7 @@
/obj/effect/turf_decal/siding/thinplating{
dir = 1
},
-/obj/machinery/status_display/shuttle{
- pixel_y = 32
- },
+/obj/machinery/computer/helm/viewscreen/directional/north,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"Ss" = (
@@ -4094,7 +4075,7 @@
dir = 8
},
/obj/effect/turf_decal/corner/opaque/yellow,
-/obj/machinery/rnd/production/techfab/department/security,
+/obj/machinery/autolathe,
/turf/open/floor/plasteel/dark,
/area/ship/security)
"TF" = (
@@ -4102,7 +4083,7 @@
dir = 1;
name = "environmental siphon"
},
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced,
/area/ship/engineering)
"TZ" = (
/obj/effect/turf_decal/siding/thinplating/dark{
@@ -4221,17 +4202,14 @@
/turf/open/floor/plasteel/dark,
/area/ship/security)
"Wb" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/warning{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating{
- dir = 1
- },
/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/turf_decal/industrial/warning{
+ dir = 1
+ },
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/fore)
"Wl" = (
@@ -4245,8 +4223,8 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light_switch{
- pixel_x = 20;
dir = 8;
+ pixel_x = 20;
pixel_y = 11
},
/turf/open/floor/plasteel/patterned/cargo_one,
@@ -4328,13 +4306,13 @@
/obj/item/storage/belt/security/webbing/inteq/alt,
/obj/item/storage/belt/security/webbing/inteq/alt,
/obj/item/storage/belt/security/webbing/inteq/alt,
+/obj/item/reagent_containers/spray/pepper,
+/obj/item/reagent_containers/spray/pepper,
+/obj/item/reagent_containers/spray/pepper,
/turf/open/floor/plasteel/tech/grid,
/area/ship/security/armory)
"WG" = (
/obj/effect/turf_decal/box/corners,
-/obj/machinery/status_display/shuttle{
- pixel_x = 32
- },
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/storage/firstaid/regular{
pixel_x = 5
@@ -4344,6 +4322,7 @@
},
/obj/structure/table/rolling,
/obj/machinery/light/directional/south,
+/obj/machinery/computer/helm/viewscreen/directional/east,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ship/cargo)
"WS" = (
@@ -4445,9 +4424,6 @@
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"XF" = (
-/obj/effect/turf_decal/industrial/warning{
- dir = 1
- },
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/shieldwallgen/atmos{
anchored = 1;
@@ -4456,10 +4432,11 @@
locked = 1
},
/obj/structure/cable,
+/obj/effect/turf_decal/industrial/warning/fulltile,
/obj/machinery/door/poddoor{
id = "colossus_starboard"
},
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced/interior,
/area/ship/cargo)
"XJ" = (
/turf/template_noop,
@@ -4505,7 +4482,7 @@
/area/ship/security/armory)
"Yx" = (
/obj/machinery/atmospherics/pipe/layer_manifold/visible,
-/turf/open/floor/engine/hull,
+/turf/open/floor/engine/hull/reinforced,
/area/ship/engineering)
"Yy" = (
/obj/docking_port/stationary{
@@ -4655,7 +4632,7 @@ XJ
bo
sF
Ls
-sj
+sF
bo
XJ
XJ
@@ -4665,7 +4642,7 @@ XJ
XJ
XJ
rl
-re
+tp
bS
tp
rl
@@ -4805,7 +4782,7 @@ XJ
"}
(9,1,1) = {"
XJ
-XJ
+Yy
XJ
XJ
rh
@@ -4823,7 +4800,7 @@ vH
rh
XJ
XJ
-XJ
+Bn
"}
(10,1,1) = {"
XJ
@@ -5201,7 +5178,7 @@ XA
"}
(27,1,1) = {"
XJ
-xh
+Ii
hD
hD
hD
@@ -5245,7 +5222,7 @@ XJ
"}
(29,1,1) = {"
XJ
-XJ
+Ll
hD
hD
hD
@@ -5397,3 +5374,91 @@ xT
Hu
XJ
"}
+(36,1,1) = {"
+XJ
+XJ
+XJ
+fU
+XJ
+fU
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+"}
+(37,1,1) = {"
+XJ
+XJ
+XJ
+fU
+XJ
+fU
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+"}
+(38,1,1) = {"
+XJ
+XJ
+XJ
+eC
+XJ
+fU
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+"}
+(39,1,1) = {"
+XJ
+XJ
+XJ
+XJ
+XJ
+eC
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+XJ
+"}
diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm
index 7e0feafb3da3..f2b6a8fd196d 100644
--- a/code/__DEFINES/food.dm
+++ b/code/__DEFINES/food.dm
@@ -14,6 +14,11 @@
#define BREAKFAST (1<<13)
#define CLOTH (1<<14)
#define GRILLED (1<<15)
+/*#define NUTS (1<<16)
+#define SEAFOOD (1<<17)
+#define ORANGES (1<<18)
+#define BUGS (1<<19)*/
+#define GORE (1<<20)
/// IC meaning (more or less) for food flags
#define FOOD_FLAGS_IC list( \
diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm
index dc66649c0aa9..3fd9d90db45e 100644
--- a/code/game/machinery/dance_machine.dm
+++ b/code/game/machinery/dance_machine.dm
@@ -2,7 +2,7 @@
name = "jukebox"
desc = "A classic music player."
icon = 'icons/obj/stationobjs.dmi'
- icon_state = "jukebox"
+ icon_state = "jukebox-"
verb_say = "states"
density = TRUE
var/active = FALSE
@@ -15,14 +15,14 @@
/obj/machinery/jukebox/boombox
name = "boombox"
desc = "A theoretically-portable music player that's much larger and heavier than it really needs to be."
- icon_state = "boombox"
+ icon_state = "boombox-"
density = FALSE
/obj/machinery/jukebox/disco
name = "radiant dance machine mark IV"
desc = "The first three prototypes were discontinued after mass casualty incidents."
- icon_state = "disco"
+ icon_state = "disco-"
anchored = FALSE
var/list/spotlights = list()
var/list/sparkles = list()
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index a94a18bce614..f4c2a5a27f4e 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -128,8 +128,31 @@
/obj/item/clothing/glasses/eyepatch
name = "eyepatch"
desc = "Yarr."
- icon_state = "eyepatch"
- item_state = "eyepatch"
+ icon_state = "eyepatch-0"
+ item_state = "eyepatch-0"
+ var/flipped = FALSE
+
+/obj/item/clothing/glasses/eyepatch/AltClick(mob/user)
+ . = ..()
+ flipped = !flipped
+ to_chat(user, "You shift the eyepatch to cover the [flipped == 0 ? "right" : "left"] eye.")
+ icon_state = "eyepatch-[flipped]"
+ item_state = "eyepatch-[flipped]"
+ update_appearance()
+
+/obj/item/clothing/glasses/eyepatch/examine(mob/user)
+ . = ..()
+ . += "It is currently aligned to the [flipped == 0 ? "right" : "left"] side."
+
+/obj/item/clothing/glasses/eyepatch/attackby(obj/item/I, mob/user, params)
+ . = ..()
+ if(istype(I, /obj/item/clothing/glasses/eyepatch))
+ var/obj/item/clothing/glasses/eyepatch/old_patch = I
+ var/obj/item/clothing/glasses/blindfold/eyepatch/double_patch = new/obj/item/clothing/glasses/blindfold/eyepatch
+ double_patch.forceMove(user.drop_location())
+ to_chat(user, "You combine the eyepatches with a knot.")
+ old_patch.Destroy()
+ Destroy()
/obj/item/clothing/glasses/monocle
name = "monocle"
@@ -348,6 +371,21 @@
M.color = "#[H.eye_color]"
. += M
+/obj/item/clothing/glasses/blindfold/eyepatch
+ name = "double eyepatch"
+ desc = "For those pirates who've been at it a while. May interfere with navigating ability."
+ icon_state = "eyepatchd"
+ item_state = "eyepatchd"
+
+/obj/item/clothing/glasses/blindfold/eyepatch/attack_self(mob/user)
+ . = ..()
+ var/obj/item/clothing/glasses/eyepatch/patch_one = new/obj/item/clothing/glasses/eyepatch
+ var/obj/item/clothing/glasses/eyepatch/patch_two = new/obj/item/clothing/glasses/eyepatch
+ patch_one.forceMove(user.drop_location())
+ patch_two.forceMove(user.drop_location())
+ to_chat(user, "You undo the knot on the eyepatches.")
+ Destroy()
+
/obj/item/clothing/glasses/sunglasses/big
desc = "Strangely ancient technology used to help provide rudimentary eye cover. Larger than average enhanced shielding blocks flashes."
icon_state = "bigsunglasses"
@@ -411,8 +449,21 @@
/obj/item/clothing/glasses/thermal/eyepatch
name = "optical thermal eyepatch"
desc = "An eyepatch with built-in thermal optics."
- icon_state = "eyepatch"
- item_state = "eyepatch"
+ icon_state = "eyepatch-0"
+ item_state = "eyepatch-0"
+ var/flipped = FALSE
+
+/obj/item/clothing/glasses/thermal/eyepatch/AltClick(mob/user)
+ . = ..()
+ flipped = !flipped
+ to_chat(user, "You shift the eyepatch to cover the [flipped == 0 ? "right" : "left"] eye.")
+ icon_state = "eyepatch-[flipped]"
+ item_state = "eyepatch-[flipped]"
+ update_appearance()
+
+/obj/item/clothing/glasses/thermal/eyepatch/examine(mob/user)
+ . = ..()
+ . += "It is currently aligned to the [flipped == 0 ? "right" : "left"] side."
/obj/item/clothing/glasses/cold
name = "cold goggles"
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index bd5cedd2e3d7..fd802cf55ec6 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -128,7 +128,20 @@
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
name = "eyepatch HUD"
desc = "A heads-up display that connects directly to the optical nerve of the user, replacing the need for that useless eyeball."
- icon_state = "hudpatch"
+ icon_state = "hudpatch-0"
+ var/flipped = FALSE
+
+/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch/AltClick(mob/user)
+ . = ..()
+ flipped = !flipped
+ to_chat(user, "You shift the hudpatch to cover the [flipped == 0 ? "right" : "left"] eye.")
+ icon_state = "hudpatch-[flipped]"
+ item_state = "hudpatch-[flipped]"
+ update_appearance()
+
+/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch/examine(mob/user)
+ . = ..()
+ . += "It is currently aligned to the [flipped == 0 ? "right" : "left"] side."
/obj/item/clothing/glasses/hud/security/sunglasses
name = "security HUDSunglasses"
diff --git a/code/modules/food_and_drinks/food/ration.dm b/code/modules/food_and_drinks/food/ration.dm
index 899bff9c9a26..ab6c72d55516 100644
--- a/code/modules/food_and_drinks/food/ration.dm
+++ b/code/modules/food_and_drinks/food/ration.dm
@@ -168,7 +168,7 @@
desc = "A mix of various salted offal, providing a unique and flavorful snack for those with adventurous tastes."
filling_color = "#cc3300"
tastes = list("assorted offal" = 1)
- foodtype = MEAT
+ foodtype = MEAT | GORE //its literally entrails
/obj/item/reagent_containers/food/snacks/ration/entree/maple_pork_sausage_patty
name = "maple pork sausage patty"
diff --git a/code/modules/food_and_drinks/food/snacks/meat.dm b/code/modules/food_and_drinks/food/snacks/meat.dm
index 81f0fc8923ac..86323c2e00bc 100644
--- a/code/modules/food_and_drinks/food/snacks/meat.dm
+++ b/code/modules/food_and_drinks/food/snacks/meat.dm
@@ -39,7 +39,7 @@
cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/plain/human
slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain/human
tastes = list("tender meat" = 1)
- foodtype = MEAT | RAW | GROSS
+ foodtype = MEAT | RAW | GORE
/obj/item/reagent_containers/food/snacks/meat/slab/human/initialize_slice(obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain/human/slice, reagents_per_slice)
..()
@@ -88,7 +88,7 @@
cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/plain/human/lizard
filling_color = "#6B8E23"
tastes = list("meat" = 4, "scales" = 1)
- foodtype = MEAT | RAW
+ foodtype = MEAT | RAW | GORE
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant
icon_state = "plantmeat"
@@ -102,21 +102,21 @@
desc = "Ow, the edge."
filling_color = "#202020"
tastes = list("darkness" = 1, "meat" = 1)
- foodtype = MEAT | RAW
+ foodtype = MEAT | RAW | GORE
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/fly
icon_state = "flymeat"
desc = "Nothing says tasty like maggot filled radioactive mutant flesh."
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/uranium = 3)
tastes = list("maggots" = 1, "the inside of a reactor" = 1)
- foodtype = MEAT | RAW | GROSS
+ foodtype = MEAT | RAW | GROSS | GORE
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/moth
icon_state = "mothmeat"
desc = "Unpleasantly powdery and dry. Kind of pretty, though."
filling_color = "#BF896B"
tastes = list("dust" = 1, "powder" = 1, "meat" = 2)
- foodtype = MEAT | RAW
+ foodtype = MEAT | RAW | GORE
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/squid
name = "calamari"
@@ -131,8 +131,8 @@
desc = "There's a point where this needs to stop, and clearly we have passed it."
filling_color = "#F0F0F0"
tastes = list("bone" = 1)
- slice_path = null //can't slice a bone into cutlets
- foodtype = GROSS
+ slice_path = null //can't slice a bone into cutlets
+ foodtype = GROSS | GORE
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
name = " meat (rotten)"
@@ -140,7 +140,7 @@
desc = "Halfway to becoming fertilizer for your garden."
filling_color = "#6B8E23"
tastes = list("brains" = 1, "meat" = 1)
- foodtype = RAW | MEAT | TOXIC
+ foodtype = RAW | MEAT | TOXIC | GORE | GROSS // who the hell would eat this
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ethereal
name = "crystalline cellulose"
@@ -176,23 +176,23 @@
/obj/item/reagent_containers/food/snacks/meat/slab/mouse
name = "mouse meat"
desc = "A slab of mouse meat. Best not eat it raw."
- foodtype = RAW | MEAT | GROSS
+ foodtype = RAW | MEAT | GORE
/obj/item/reagent_containers/food/snacks/meat/slab/mothroach
name = "mothroach meat"
- desc = "A light slab of meat."
- foodtype = RAW | MEAT | GROSS
+ desc = "A light slab of mothroach meat."
+ foodtype = RAW | MEAT | GORE
/obj/item/reagent_containers/food/snacks/meat/slab/corgi
name = "corgi meat"
desc = "Tastes like... well you know..."
tastes = list("meat" = 4, "a fondness for wearing hats" = 1)
- foodtype = RAW | MEAT | GROSS
+ foodtype = RAW | MEAT | GORE
/obj/item/reagent_containers/food/snacks/meat/slab/pug
name = "pug meat"
desc = "Tastes like... well you know..."
- foodtype = RAW | MEAT | GROSS
+ foodtype = RAW | MEAT | GORE
/obj/item/reagent_containers/food/snacks/meat/slab/killertomato
name = "killer tomato meat"
@@ -358,7 +358,7 @@
/obj/item/reagent_containers/food/snacks/meat/steak/plain/human
tastes = list("tender meat" = 1)
- foodtype = MEAT | GROSS
+ foodtype = MEAT | GORE
/obj/item/reagent_containers/food/snacks/meat/steak/killertomato
name = "killer tomato steak"
@@ -396,7 +396,7 @@
tastes = list("beef" = 1, "cod fish" = 1)
/obj/item/reagent_containers/food/snacks/meat/steak/chicken
- name = "chicken steak" //Can you have chicken steaks? Maybe this should be renamed once it gets new sprites.
+ name = "chicken steak" //Can you have chicken steaks? Maybe this should be renamed once it gets new sprites. //I concur
icon_state = "birdsteak"
tastes = list("chicken" = 1)
@@ -444,7 +444,7 @@
/obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain/human
cooked_type = /obj/item/reagent_containers/food/snacks/meat/cutlet/plain/human
tastes = list("tender meat" = 1)
- foodtype = MEAT | RAW | GROSS
+ foodtype = MEAT | RAW | GORE
/obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain/human/initialize_cooked_food(obj/item/reagent_containers/food/snacks/S, cooking_efficiency)
..()
@@ -506,7 +506,7 @@
/obj/item/reagent_containers/food/snacks/meat/cutlet/plain/human
tastes = list("tender meat" = 1)
- foodtype = MEAT | GROSS
+ foodtype = MEAT | GORE
/obj/item/reagent_containers/food/snacks/meat/cutlet/killertomato
name = "killer tomato cutlet"
diff --git a/code/modules/food_and_drinks/food/snacks_burgers.dm b/code/modules/food_and_drinks/food/snacks_burgers.dm
index 5bff4f8edb27..44ee559641e3 100644
--- a/code/modules/food_and_drinks/food/snacks_burgers.dm
+++ b/code/modules/food_and_drinks/food/snacks_burgers.dm
@@ -33,7 +33,7 @@
desc = "A bloody burger."
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("bun" = 2, "long pig" = 4)
- foodtype = MEAT | GRAIN | GROSS
+ foodtype = MEAT | GRAIN | GORE
/obj/item/reagent_containers/food/snacks/burger/human/CheckParts(list/parts_list)
..()
@@ -52,7 +52,7 @@
name = "corgi burger"
desc = "You monster."
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 5)
- foodtype = GRAIN | MEAT | GROSS
+ foodtype = GRAIN | MEAT | GORE
/obj/item/reagent_containers/food/snacks/burger/appendix
name = "appendix burger"
@@ -60,7 +60,7 @@
bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6)
icon_state = "appendixburger"
tastes = list("bun" = 4, "grass" = 2)
- foodtype = GRAIN | MEAT | GROSS
+ foodtype = GRAIN | MEAT | GORE
/obj/item/reagent_containers/food/snacks/burger/fish
name = "fillet -o- carp sandwich"
@@ -133,7 +133,7 @@
bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/medicine/mannitol = 6, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/medicine/mannitol = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("bun" = 4, "brains" = 2)
- foodtype = GRAIN | MEAT | GROSS
+ foodtype = GRAIN | MEAT | GORE
/obj/item/reagent_containers/food/snacks/burger/ghost
name = "ghost burger"
@@ -305,7 +305,7 @@
desc = "Pretty much what you'd expect..."
icon_state = "ratburger"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
- foodtype = GRAIN | MEAT | GROSS
+ foodtype = GRAIN | MEAT | GORE
/obj/item/reagent_containers/food/snacks/burger/baseball
name = "home run baseball burger"
diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm
index 515ef35bd882..78999078193c 100644
--- a/code/modules/food_and_drinks/food/snacks_meat.dm
+++ b/code/modules/food_and_drinks/food/snacks_meat.dm
@@ -321,7 +321,7 @@
/obj/item/reagent_containers/food/snacks/boiledspiderleg
name = "boiled spider leg"
- desc = "A giant spider's leg that's still twitching after being cooked. Gross!"
+ desc = "A giant spider's leg that's still twitching after being cooked. Yum!" //Its cooked and not GORE, so it shouldnt imply that its gross to eat
icon_state = "spiderlegcooked"
trash = /obj/item/trash/plate
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/capsaicin = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
@@ -414,7 +414,7 @@
desc = "A human meat, on a stick."
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("tender meat" = 3, "metal" = 1)
- foodtype = MEAT | GROSS
+ foodtype = MEAT | GORE
/obj/item/reagent_containers/food/snacks/kebab/monkey
name = "meat-kebab"
@@ -436,7 +436,7 @@
desc = "Severed lizard tail on a stick."
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("meat" = 8, "metal" = 4, "scales" = 1)
- foodtype = MEAT
+ foodtype = MEAT // NOT GORE, tastes delicious!
/obj/item/reagent_containers/food/snacks/kebab/rat
name = "rat-kebab"
@@ -445,7 +445,7 @@
w_class = WEIGHT_CLASS_NORMAL
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("rat meat" = 1, "metal" = 1)
- foodtype = MEAT | GROSS
+ foodtype = MEAT | GORE
/obj/item/reagent_containers/food/snacks/kebab/rat/double
name = "double rat-kebab"
diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm
index 6cedb2a98142..d060dc1c2969 100644
--- a/code/modules/food_and_drinks/food/snacks_pastry.dm
+++ b/code/modules/food_and_drinks/food/snacks_pastry.dm
@@ -76,7 +76,7 @@
bonus_reagents = list(/datum/reagent/consumable/ketchup = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/ketchup = 2)
tastes = list("meat" = 1)
- foodtype = JUNKFOOD | MEAT | GROSS | FRIED | BREAKFAST
+ foodtype = JUNKFOOD | MEAT | GORE | FRIED | BREAKFAST
is_decorated = TRUE
/obj/item/reagent_containers/food/snacks/donut/berry
@@ -377,13 +377,14 @@
/obj/item/reagent_containers/food/snacks/soylentgreen
name = "\improper Soylent Green"
- desc = "Not made of people. Honest." //Totally people.
+ desc = "Not made of people. Honest*." //Totally people.
icon_state = "soylent_green"
trash = /obj/item/trash/waffles
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#9ACD32"
tastes = list("waffles" = 7, "people" = 1)
+ // The wafers are supposed to be flavorful and nutritious in the movie. They shouldn't be gross in a dystopian future where the chef regularly feeds people from the morgue to you.
foodtype = GRAIN | MEAT
/obj/item/reagent_containers/food/snacks/soylenviridians
diff --git a/code/modules/food_and_drinks/food/snacks_soup.dm b/code/modules/food_and_drinks/food/snacks_soup.dm
index 3933ff4b233a..c7bcf963faf2 100644
--- a/code/modules/food_and_drinks/food/snacks_soup.dm
+++ b/code/modules/food_and_drinks/food/snacks_soup.dm
@@ -54,7 +54,7 @@
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 6)
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/blood = 10, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("iron" = 1)
- foodtype = GROSS
+ foodtype = GORE //its literally blood
/obj/item/reagent_containers/food/snacks/soup/wingfangchu
name = "wing fang chu"
@@ -157,7 +157,7 @@
icon_state = "eyeballsoup"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/liquidgibs = 3)
tastes = list("tomato" = 1, "squirming" = 1)
- foodtype = MEAT | GROSS
+ foodtype = MEAT | GORE
/obj/item/reagent_containers/food/snacks/soup/milo
name = "milosoup"
diff --git a/code/modules/mob/living/carbon/human/species_types/flypeople.dm b/code/modules/mob/living/carbon/human/species_types/flypeople.dm
index c7486730d7bb..af19f1316ce2 100644
--- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm
@@ -8,7 +8,7 @@
mutantstomach = /obj/item/organ/stomach/fly
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/fly
disliked_food = null
- liked_food = GROSS
+ liked_food = GORE | RAW // Sure, the raw... the bloody... but I think stuff GROSS, like baseball burgers, are liked
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
species_language_holder = /datum/language_holder/fly
diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm
index dc671c736e69..885be6f5886a 100644
--- a/code/modules/mob/living/carbon/human/species_types/humans.dm
+++ b/code/modules/mob/living/carbon/human/species_types/humans.dm
@@ -7,7 +7,7 @@
mutant_bodyparts = list("ears", "tail_human")
use_skintones = TRUE
skinned_type = /obj/item/stack/sheet/animalhide/human
- disliked_food = GROSS | RAW
+ disliked_food = GROSS | RAW | CLOTH
liked_food = JUNKFOOD | FRIED | SUGAR
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
loreblurb = "Mostly hairless mammalians. Their home system, Sol, lies in a sort of \"bluespace dead-zone\" that blocks anything from entering or exiting Sol's dead-zone through bluespace without a relay. While it leaves Sol extremely well-defended, it meant that they went unnoticed and uncontacted until they were themselves able to breach it."
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index 94cd1523344a..7dcfb31f1e8a 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -14,7 +14,7 @@
damage_overlay_type = ""
var/datum/action/innate/regenerate_limbs/regenerate_limbs
var/datum/action/innate/humanoid_customization/humanoid_customization
- liked_food = MEAT
+ liked_food = MEAT | GORE // Spliced with humans, they still never lost their carnivorous drive
disliked_food = NONE
toxic_food = NONE
coldmod = 6 // = 3x cold damage
diff --git a/code/modules/mob/living/carbon/human/species_types/kepori.dm b/code/modules/mob/living/carbon/human/species_types/kepori.dm
index 469c012a2d9d..5693c646cf3f 100644
--- a/code/modules/mob/living/carbon/human/species_types/kepori.dm
+++ b/code/modules/mob/living/carbon/human/species_types/kepori.dm
@@ -7,8 +7,8 @@
mutant_bodyparts = list("kepori_body_feathers", "kepori_tail_feathers", "kepori_feathers")
default_features = list("mcolor" = "0F0", "wings" = "None", "kepori_feathers" = "Plain", "kepori_body_feathers" = "Plain", "kepori_tail_feathers" = "Fan", "body_size" = "Normal")
meat = /obj/item/reagent_containers/food/snacks/meat/slab/chicken
- disliked_food = GROSS | FRIED
- liked_food = MEAT
+ disliked_food = FRIED | GROSS | CLOTH
+ liked_food = MEAT | GORE
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
loreblurb = "Kepori are a species covered in feathers vaguely reminiscent of earth’s extinct troodontidae. They’re small and sometimes seen as weak by other species due to their hollow bones but make up for that in speed and reflexes. Those found in space are commonly known as rollaways. They tend to woop when excited, scared, or for any other reason at all."
attack_verb = "slash"
diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
index 1391e33ee7c0..141efed98e12 100644
--- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
@@ -18,8 +18,8 @@
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard
skinned_type = /obj/item/stack/sheet/animalhide/lizard
exotic_bloodtype = "L"
- disliked_food = GRAIN | DAIRY
- liked_food = GROSS | MEAT
+ disliked_food = GRAIN | DAIRY | CLOTH | GROSS
+ liked_food = GORE | MEAT
inert_mutation = FIREBREATH
deathsound = 'sound/voice/lizard/deathsound.ogg'
wings_icons = list("Dragon")
diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
index d284224c37d0..02ddf79f6bc4 100644
--- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
@@ -11,9 +11,9 @@
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/moth
- liked_food = FRUIT | SUGAR
+ liked_food = FRUIT | SUGAR | CLOTH
disliked_food = GROSS
- toxic_food = MEAT | RAW
+ toxic_food = MEAT | RAW | GORE
mutanteyes = /obj/item/organ/eyes/compound //WS Edit - Compound eyes
mutanttongue = /obj/item/organ/tongue/moth //WS Edit - Insectoid language
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
index 6d14741c13b6..daa645a662a8 100644
--- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
@@ -14,7 +14,7 @@
heatmod = 1.5
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant
disliked_food = MEAT | DAIRY
- liked_food = VEGETABLES | FRUIT | GRAIN
+ liked_food = VEGETABLES | FRUIT | GRAIN | CLOTH //cannibals apparentely
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
species_language_holder = /datum/language_holder/plant
diff --git a/code/modules/mob/living/carbon/human/species_types/spider.dm b/code/modules/mob/living/carbon/human/species_types/spider.dm
index 0e6082b9d87d..84faffde6ca2 100644
--- a/code/modules/mob/living/carbon/human/species_types/spider.dm
+++ b/code/modules/mob/living/carbon/human/species_types/spider.dm
@@ -51,7 +51,7 @@ GLOBAL_LIST_INIT(spider_last, world.file2list("strings/names/spider_last.txt"))
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/spider
- liked_food = MEAT | RAW
+ liked_food = MEAT | RAW | GORE // Regular spiders literally liquify the insides of their prey and drink em like a smoothie. I think this fits
disliked_food = FRUIT | GROSS
toxic_food = VEGETABLES | DAIRY | CLOTH
mutanteyes = /obj/item/organ/eyes/night_vision/spider
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index 4f9aea033461..48f84240c5ac 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -274,7 +274,7 @@ GLOBAL_VAR_INIT(mouse_killed, 0)
bitesize = 3
eatverb = "devour"
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
- foodtype = GROSS | MEAT | RAW
+ foodtype = GORE | MEAT | RAW
grind_results = list(/datum/reagent/blood = 20, /datum/reagent/liquidgibs = 5)
/obj/item/reagent_containers/food/snacks/deadmouse/examine(mob/user)
diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index c87b82091597..d079fbed4ce4 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -10,6 +10,10 @@
#define BEE_POLLINATE_PEST_CHANCE 33
#define BEE_POLLINATE_POTENCY_CHANCE 50
+/* For when we makes bees edible lmao (NEWFOOD)
+#define BEE_FOODGROUPS RAW | MEAT | GORE /*| BUGS*/
+*/
+
/mob/living/simple_animal/hostile/poison/bees
name = "bee"
desc = "Buzzy buzzy bee, stingy sti- Ouch!"
diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index dd6d8efc1065..cafcc0196b1b 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -217,12 +217,6 @@
owner.Dizzy(10)
owner.losebreath += 10
severe_cooldown = world.time + 20 SECONDS
- if(prob(emp_vulnerability/severity)) //Chance of permanent effects
- organ_flags = ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon.
- Stop()
- owner.visible_message("[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!", \
- "You feel a terrible pain in your chest, as if your heart has stopped!")
- addtimer(CALLBACK(src, .proc/Restart), 10 SECONDS)
/obj/item/organ/heart/cybernetic/on_life()
. = ..()
diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm
index d8e10731da30..b2812d941975 100644
--- a/code/modules/surgery/organs/liver.dm
+++ b/code/modules/surgery/organs/liver.dm
@@ -116,8 +116,6 @@
if(world.time > severe_cooldown) //So we cant just spam emp to kill people.
owner.adjustToxLoss(10)
severe_cooldown = world.time + 10 SECONDS
- if(prob(emp_vulnerability/severity)) //Chance of permanent effects
- organ_flags = ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon.
/obj/item/organ/liver/cybernetic/upgraded/ipc
icon = 'icons/obj/surgery.dmi'
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index fa928c1e2053..fc5de4be3049 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -419,8 +419,6 @@
if(world.time > severe_cooldown) //So we cant just spam emp to kill people.
owner.losebreath += 20
severe_cooldown = world.time + 30 SECONDS
- if(prob(emp_vulnerability/severity)) //Chance of permanent effects
- organ_flags = ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon.
#undef PP
#undef PP_MOLES
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 264574c476e4..51d857aaeff6 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -38,7 +38,7 @@
/obj/item/organ/Initialize()
. = ..()
if(organ_flags & ORGAN_EDIBLE)
- AddComponent(/datum/component/edible, food_reagents, null, RAW | MEAT | GROSS, null, 10, null, null, null, CALLBACK(src, .proc/OnEatFrom))
+ AddComponent(/datum/component/edible, food_reagents, null, RAW | MEAT | GORE, null, 10, null, null, null, CALLBACK(src, .proc/OnEatFrom))
///When you take a bite you cant jam it in for surgery anymore.
/obj/item/organ/proc/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE)
diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm
index 615428d962b5..10cc049eb806 100644
--- a/code/modules/surgery/organs/stomach.dm
+++ b/code/modules/surgery/organs/stomach.dm
@@ -160,8 +160,6 @@
if(!COOLDOWN_FINISHED(src, severe_cooldown)) //So we cant just spam emp to kill people.
owner.vomit(stun = FALSE)
COOLDOWN_START(src, severe_cooldown, 10 SECONDS)
- if(prob(emp_vulnerability/severity)) //Chance of permanent effects
- organ_flags |= ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon.
//WS Begin - IPCs
diff --git a/html/changelogs/archive/2023-09.yml b/html/changelogs/archive/2023-09.yml
index d281e2a39f3f..1de0aaf70c4a 100644
--- a/html/changelogs/archive/2023-09.yml
+++ b/html/changelogs/archive/2023-09.yml
@@ -117,3 +117,24 @@
- spellcheck: Assualt is gone.
- code_imp: Repaths/renames most ballistic ammo pathing to maintain consistency
or take advantage of inherits, when possible.
+2023-09-20:
+ RKz, Jacquerel:
+ - rscadd: New foodtype, GORE. Split from GROSS, GORE foodtype will be replacing
+ it where the food in particular resembles a corpse or organ. GROSS should only
+ apply to inedible or rotting foods. (baseball burgers)
+ - balance: All butchered player species are considered to be gore, only preferred
+ by Lizards, Arachnids, Kepori, Slimepeople and Flies. If you like the taste
+ of your fellow(or rival) crew, prepare accordingly.
+ - balance: Moved food preferences around to make more sense with the current system.
+ Nothing drastic, but species liked foods should be much more immersive in general.
+ Skrem7:
+ - rscadd: Adds the double eyepatch, a blindfold made by adding a normal eyepatch
+ to another
+ - tweak: Eyepatches can now swap sides with ALT+CLICK
+ - balance: Cybernetic organs can no longer require replacement due to EMPs (they
+ do not suffer permanent damage)
+ spockye:
+ - bugfix: temp fixed the jukebox(with subtypes) so they appear in the mapmaker
+2023-09-23:
+ Apogee-dev:
+ - tweak: Removed RnD from the Colossus and updated its looks
diff --git a/icons/mob/clothing/eyes.dmi b/icons/mob/clothing/eyes.dmi
index bdfe41995f6d..9af8d7dc8bba 100644
Binary files a/icons/mob/clothing/eyes.dmi and b/icons/mob/clothing/eyes.dmi differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index c32434c83f1e..45d868f69692 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ