diff --git a/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm b/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm
index 4ff1b225364c1..49da2fefd64b6 100644
--- a/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm
+++ b/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm
@@ -519,7 +519,7 @@
/turf/open/floor/carpet,
/area/ruin/space/has_grav/powered/macspace)
"cd" = (
-/obj/item/food/toastedsandwich,
+/obj/item/food/grilled_cheese_sandwich,
/obj/structure/table/wood/fancy/blue,
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/powered/macspace)
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index f3ed424e9463f..2bb23bef285aa 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -4259,6 +4259,12 @@
"aTN" = (
/obj/structure/table,
/obj/item/kitchen/rollingpin,
+/obj/item/reagent_containers/food/condiment/peppermill{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/food/condiment/saltshaker{
+ pixel_x = -3
+ },
/turf/open/floor/iron/cafeteria,
/area/crew_quarters/kitchen)
"aTO" = (
@@ -4515,13 +4521,7 @@
/turf/open/floor/iron/cafeteria,
/area/crew_quarters/kitchen)
"aVD" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -3
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 3
- },
+/obj/machinery/griddle,
/turf/open/floor/iron/cafeteria,
/area/crew_quarters/kitchen)
"aVE" = (
@@ -44208,9 +44208,7 @@
/area/security/courtroom)
"ooe" = (
/obj/structure/closet/secure_closet/freezer/kitchen,
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-2"
},
@@ -62554,6 +62552,13 @@
/obj/structure/cable/yellow,
/turf/open/floor/plating,
/area/crew_quarters/heads/cmo)
+"wCj" = (
+/obj/structure/table,
+/obj/machinery/dish_drive{
+ pixel_y = 5
+ },
+/turf/open/floor/iron/cafeteria,
+/area/crew_quarters/kitchen)
"wCo" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable/yellow{
@@ -104700,8 +104705,8 @@ uve
lCW
hcL
bEr
-aVD
aVE
+aVD
aXm
aVz
kVI
@@ -104958,7 +104963,7 @@ aJI
aRB
thS
aTN
-cCq
+wCj
aVz
cAg
kVI
diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm
index 054ebcd8a0716..c71bc407996fd 100644
--- a/_maps/map_files/CorgStation/CorgStation.dmm
+++ b/_maps/map_files/CorgStation/CorgStation.dmm
@@ -691,16 +691,6 @@
},
/turf/open/floor/iron/dark,
/area/security/nuke_storage)
-"afY" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/obj/machinery/light{
- dir = 8
- },
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/iron,
-/area/quartermaster/storage)
"agb" = (
/obj/machinery/atmospherics/components/binary/volume_pump/on{
dir = 1;
@@ -1545,6 +1535,19 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/maintenance/starboard/central)
+"apN" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc/auto_name/north,
+/turf/open/floor/iron/dark,
+/area/quartermaster/storage)
"apW" = (
/obj/structure/chair{
dir = 1
@@ -3776,18 +3779,6 @@
},
/turf/open/space/basic,
/area/solar/port/fore)
-"aTC" = (
-/obj/effect/turf_decal/tile/brown/opposingcorners{
- dir = 1
- },
-/obj/structure/cable/yellow{
- icon_state = "2-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
-/turf/open/floor/iron,
-/area/quartermaster/storage)
"aTD" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "Maintenance Hatch";
@@ -5744,6 +5735,30 @@
/obj/effect/turf_decal/tile/yellow/half/contrasted,
/turf/open/floor/iron/dark,
/area/engine/engine_room)
+"bCq" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/mining{
+ name = "Quartermaster's Office";
+ req_access_txt = "41"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/turf/open/floor/iron,
+/area/quartermaster/qm)
"bCP" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -6301,14 +6316,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
/area/medical/cryo)
-"bKR" = (
-/obj/machinery/deepfryer,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red/fourcorners/contrasted,
-/turf/open/floor/iron/white,
-/area/crew_quarters/kitchen)
"bKV" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
@@ -7214,14 +7221,6 @@
},
/turf/open/floor/iron/dark,
/area/security/main)
-"bZk" = (
-/obj/effect/turf_decal/tile/brown/fourcorners/contrasted,
-/obj/effect/turf_decal/bot,
-/obj/structure/extinguisher_cabinet{
- pixel_x = -25
- },
-/turf/open/floor/iron,
-/area/quartermaster/storage)
"bZp" = (
/obj/structure/rack,
/obj/item/stock_parts/cell/high/plus,
@@ -8394,6 +8393,14 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextAP)
+"cvn" = (
+/obj/effect/turf_decal/tile/brown/fourcorners/contrasted,
+/obj/effect/turf_decal/bot,
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -25
+ },
+/turf/open/floor/iron,
+/area/quartermaster/storage)
"cvq" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
@@ -8991,15 +8998,6 @@
},
/turf/open/floor/iron/white,
/area/crew_quarters/heads/cmo)
-"cHq" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/bag/tray,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red/fourcorners/contrasted,
-/turf/open/floor/iron/white,
-/area/crew_quarters/kitchen)
"cHt" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/iron,
@@ -12840,6 +12838,18 @@
dir = 5
},
/area/science/breakroom)
+"dUC" = (
+/obj/effect/turf_decal/tile/brown/opposingcorners{
+ dir = 1
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/turf/open/floor/iron,
+/area/quartermaster/storage)
"dUK" = (
/obj/structure/reagent_dispensers/watertank/high,
/obj/machinery/light/small{
@@ -13377,30 +13387,6 @@
},
/turf/open/floor/carpet/purple,
/area/crew_quarters/heads/hor)
-"ecV" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/mining{
- name = "Quartermaster's Office";
- req_access_txt = "41"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/yellow{
- icon_state = "2-4"
- },
-/turf/open/floor/iron,
-/area/quartermaster/qm)
"edi" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating/asteroid,
@@ -22283,6 +22269,20 @@
"hdz" = (
/turf/closed/wall,
/area/science/mixing)
+"hdA" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "qmoffice";
+ name = "Quartermaster's Office Shutters"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/quartermaster/qm)
"hdC" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -26891,24 +26891,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/wood,
/area/crew_quarters/bar)
-"izh" = (
-/obj/effect/turf_decal/tile/red/fourcorners/contrasted,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
- },
-/obj/structure/chair/fancy/comfy{
- color = "#666666";
- dir = 1
- },
-/obj/effect/landmark/start/security_officer,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/security/main)
"izP" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -31405,20 +31387,6 @@
/obj/effect/turf_decal/tile/red,
/turf/open/floor/iron/white,
/area/crew_quarters/kitchen)
-"kaB" = (
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "qmoffice";
- name = "Quartermaster's Office Shutters"
- },
-/obj/structure/cable/yellow{
- icon_state = "0-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/quartermaster/qm)
"kaW" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -31994,6 +31962,24 @@
},
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat/foyer)
+"kkG" = (
+/obj/effect/turf_decal/tile/red/fourcorners/contrasted,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/obj/structure/chair/fancy/comfy{
+ color = "#666666";
+ dir = 1
+ },
+/obj/effect/landmark/start/security_officer,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/security/main)
"kkP" = (
/obj/structure/chair/office{
dir = 1
@@ -32481,6 +32467,36 @@
},
/turf/open/floor/plating,
/area/security/prison)
+"kqV" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/door/airlock/command/glass{
+ name = "Head of Security";
+ req_access_txt = "58"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/obj/machinery/door/poddoor/preopen{
+ id = "hosoffice";
+ name = "Head Of Security Blast door"
+ },
+/turf/open/floor/iron/dark,
+/area/security/brig)
"krj" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -34005,17 +34021,6 @@
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextAP)
-"kUb" = (
-/obj/structure/cable/yellow{
- icon_state = "0-2"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "hosoffice";
- name = "Head Of Security Blast door"
- },
-/turf/open/floor/plating,
-/area/security/brig)
"kUj" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -34052,6 +34057,15 @@
/obj/machinery/washing_machine,
/turf/open/floor/iron/freezer,
/area/security/prison)
+"kUI" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/bag/tray,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red/fourcorners/contrasted,
+/turf/open/floor/iron/white,
+/area/crew_quarters/kitchen)
"kUJ" = (
/obj/structure/chair/office/light{
dir = 4
@@ -37501,26 +37515,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/ai_monitored/storage/eva)
-"lZt" = (
-/obj/effect/turf_decal/tile/brown/fourcorners/contrasted,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
- },
-/obj/effect/turf_decal/tile/brown/fourcorners/contrasted,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable/yellow{
- icon_state = "2-8"
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark,
-/area/quartermaster/qm)
"lZv" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -39346,6 +39340,17 @@
},
/turf/open/floor/iron/dark,
/area/crew_quarters/heads/hos)
+"mAc" = (
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+ id = "hosoffice";
+ name = "Head Of Security Blast door"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/heads/hos)
"mAf" = (
/obj/machinery/atmospherics/pipe/simple/dark{
dir = 9
@@ -40323,25 +40328,6 @@
},
/turf/open/floor/iron/white,
/area/medical/genetics/cloning)
-"mOu" = (
-/obj/structure/table,
-/obj/item/clothing/under/rank/cargo/tech{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/clothing/gloves/fingerless{
- pixel_x = 1
- },
-/obj/structure/cable/yellow,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/obj/item/radio/intercom{
- pixel_x = -29;
- pixel_y = -2
- },
-/turf/open/floor/iron,
-/area/quartermaster/storage)
"mOF" = (
/obj/structure/cable/yellow{
icon_state = "1-4"
@@ -41718,16 +41704,6 @@
},
/turf/open/floor/iron/dark,
/area/maintenance/department/chapel/monastery)
-"nok" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/security/brig)
"noq" = (
/obj/item/storage/toolbox/electrical,
/obj/machinery/airalarm/directional/west,
@@ -43937,24 +43913,6 @@
},
/turf/open/floor/wood,
/area/library)
-"nXN" = (
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
- },
-/obj/effect/turf_decal/tile/brown/fourcorners/contrasted,
-/obj/structure/table/reinforced,
-/obj/item/computer_hardware/hard_drive/role/quartermaster{
- pixel_x = -6
- },
-/obj/item/computer_hardware/hard_drive/role/quartermaster{
- pixel_x = 6
- },
-/obj/item/computer_hardware/hard_drive/role/quartermaster{
- pixel_y = 6
- },
-/obj/item/gps/mining,
-/turf/open/floor/iron/dark,
-/area/quartermaster/qm)
"nXW" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -45229,6 +45187,23 @@
},
/turf/open/floor/iron/white,
/area/medical/medbay/lobby)
+"oud" = (
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+ id = "hosoffice";
+ name = "Head Of Security Blast door"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/heads/hos)
"oui" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
@@ -45716,6 +45691,26 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"oCA" = (
+/obj/effect/turf_decal/tile/brown/fourcorners/contrasted,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/brown/fourcorners/contrasted,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable/yellow{
+ icon_state = "2-8"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/dark,
+/area/quartermaster/qm)
"oCK" = (
/obj/effect/turf_decal/tile/red/opposingcorners,
/obj/item/radio/intercom{
@@ -46837,6 +46832,14 @@
},
/turf/closed/wall,
/area/engine/atmospherics_engine)
+"oYs" = (
+/obj/machinery/deepfryer,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red/fourcorners/contrasted,
+/turf/open/floor/iron/white,
+/area/crew_quarters/kitchen)
"oYA" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -49011,15 +49014,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron,
/area/hallway/primary/fore)
-"pLo" = (
-/obj/structure/cable/yellow,
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "hosoffice";
- name = "Head Of Security Blast door"
- },
-/turf/open/floor/plating,
-/area/crew_quarters/heads/hos)
"pLz" = (
/obj/machinery/power/apc/auto_name/south{
pixel_y = -24
@@ -49484,17 +49478,6 @@
/obj/structure/closet/firecloset/full,
/turf/open/floor/iron,
/area/hallway/primary/starboard)
-"pSX" = (
-/obj/structure/cable/yellow{
- icon_state = "0-2"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "hosoffice";
- name = "Head Of Security Blast door"
- },
-/turf/open/floor/plating,
-/area/crew_quarters/heads/hos)
"pTe" = (
/turf/open/floor/plating,
/area/crew_quarters/fitness/recreation)
@@ -53422,36 +53405,6 @@
/obj/structure/disposalpipe/junction,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
-"riQ" = (
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/obj/machinery/door/airlock/command/glass{
- name = "Head of Security";
- req_access_txt = "58"
- },
-/obj/structure/disposalpipe/segment{
- dir = 8
- },
-/obj/machinery/door/poddoor/preopen{
- id = "hosoffice";
- name = "Head Of Security Blast door"
- },
-/turf/open/floor/iron/dark,
-/area/security/brig)
"rjb" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -53553,6 +53506,17 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/crew_quarters/toilet)
+"rkB" = (
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+ id = "hosoffice";
+ name = "Head Of Security Blast door"
+ },
+/turf/open/floor/plating,
+/area/security/brig)
"rkK" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable/white{
@@ -53723,23 +53687,6 @@
},
/turf/open/floor/wood,
/area/crew_quarters/fitness/recreation)
-"rnk" = (
-/obj/structure/cable/yellow{
- icon_state = "2-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
-/obj/structure/cable/yellow{
- icon_state = "0-8"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
- id = "hosoffice";
- name = "Head Of Security Blast door"
- },
-/turf/open/floor/plating,
-/area/crew_quarters/heads/hos)
"rnn" = (
/obj/machinery/light_switch{
pixel_x = 1;
@@ -56568,6 +56515,15 @@
/obj/effect/turf_decal/tile/red/half/contrasted,
/turf/open/floor/iron/dark,
/area/security/warden)
+"siu" = (
+/obj/structure/cable/yellow,
+/obj/machinery/door/poddoor/preopen{
+ id = "hosoffice";
+ name = "Head Of Security Blast door"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/brig)
"siV" = (
/obj/item/kirbyplants/random,
/obj/machinery/light,
@@ -58310,6 +58266,15 @@
},
/turf/closed/wall,
/area/engine/atmospherics_engine)
+"sLg" = (
+/obj/structure/cable/yellow,
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+ id = "hosoffice";
+ name = "Head Of Security Blast door"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/heads/hos)
"sLm" = (
/turf/closed/wall,
/area/science/storage)
@@ -58665,6 +58630,14 @@
},
/turf/open/floor/engine,
/area/engine/atmospherics_engine)
+"sRL" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/maintenance_hatch{
+ name = "Cargo Maintenance";
+ req_access_txt = "31"
+ },
+/turf/open/floor/plating,
+/area/quartermaster/storage)
"sSj" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -58692,6 +58665,16 @@
/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted,
/turf/open/floor/iron,
/area/engine/atmos)
+"sSB" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/security/brig)
"sSL" = (
/obj/structure/window/reinforced/spawner,
/obj/structure/window/reinforced/spawner{
@@ -61419,6 +61402,25 @@
},
/turf/open/floor/iron/dark,
/area/hallway/primary/central)
+"tOn" = (
+/obj/structure/table,
+/obj/item/clothing/under/rank/cargo/tech{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/clothing/gloves/fingerless{
+ pixel_x = 1
+ },
+/obj/structure/cable/yellow,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/obj/item/radio/intercom{
+ pixel_x = -29;
+ pixel_y = -2
+ },
+/turf/open/floor/iron,
+/area/quartermaster/storage)
"tOF" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -64407,14 +64409,6 @@
},
/turf/open/floor/iron/dark,
/area/maintenance/department/chapel/monastery)
-"uLB" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance_hatch{
- name = "Cargo Maintenance";
- req_access_txt = "31"
- },
-/turf/open/floor/plating,
-/area/quartermaster/storage)
"uMg" = (
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/neutral{
@@ -65458,19 +65452,6 @@
},
/turf/open/floor/iron,
/area/engine/engine_room)
-"veL" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/structure/cable/yellow{
- icon_state = "0-8"
- },
-/obj/machinery/power/apc/auto_name/north,
-/turf/open/floor/iron/dark,
-/area/quartermaster/storage)
"veT" = (
/obj/structure/table/wood,
/obj/item/storage/fancy/candle_box,
@@ -65629,6 +65610,16 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"vhD" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/iron,
+/area/quartermaster/storage)
"vhE" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -67165,6 +67156,24 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/dark,
/area/security/brig)
+"vEj" = (
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/brown/fourcorners/contrasted,
+/obj/structure/table/reinforced,
+/obj/item/computer_hardware/hard_drive/role/quartermaster{
+ pixel_x = -6
+ },
+/obj/item/computer_hardware/hard_drive/role/quartermaster{
+ pixel_x = 6
+ },
+/obj/item/computer_hardware/hard_drive/role/quartermaster{
+ pixel_y = 6
+ },
+/obj/item/gps/mining,
+/turf/open/floor/iron/dark,
+/area/quartermaster/qm)
"vEs" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -68769,15 +68778,6 @@
},
/turf/open/floor/iron/dark,
/area/quartermaster/miningdock)
-"wgP" = (
-/obj/machinery/button/door{
- id = "detectivewindows";
- name = "Detective Private Shutters";
- pixel_y = -8;
- req_access_txt = "4"
- },
-/turf/closed/wall,
-/area/security/detectives_office)
"wgR" = (
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
/turf/open/floor/iron/white,
@@ -71481,6 +71481,15 @@
},
/turf/open/floor/iron/dark,
/area/engine/atmospherics_engine)
+"wZF" = (
+/obj/machinery/button/door{
+ id = "detectivewindows";
+ name = "Detective Private Shutters";
+ pixel_y = -8;
+ req_access_txt = "4"
+ },
+/turf/closed/wall,
+/area/security/detectives_office)
"wZS" = (
/obj/structure/table/glass,
/obj/machinery/requests_console{
@@ -74278,15 +74287,6 @@
},
/turf/open/floor/iron/dark,
/area/bridge)
-"xUc" = (
-/obj/structure/cable/yellow,
-/obj/machinery/door/poddoor/preopen{
- id = "hosoffice";
- name = "Head Of Security Blast door"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/security/brig)
"xUf" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -110841,7 +110841,7 @@ sIf
cyL
uYN
qsX
-bKR
+oYs
wWq
jOn
jNy
@@ -111355,7 +111355,7 @@ aYT
tnJ
hZf
aPw
-cHq
+kUI
wWq
gEw
aYT
@@ -113084,7 +113084,7 @@ ykq
wkk
tmQ
kQW
-izh
+kkG
qRL
nXe
hhE
@@ -113857,7 +113857,7 @@ uQV
kkf
vwV
wKV
-wgP
+wZF
dqa
lev
ijS
@@ -115142,7 +115142,7 @@ wBm
fEX
tXi
rfO
-nok
+sSB
mLz
bkx
nPz
@@ -115647,9 +115647,9 @@ sEA
ezb
eZq
eZq
-kUb
-riQ
-xUc
+rkB
+kqV
+siu
duF
duF
cik
@@ -118217,9 +118217,9 @@ fpM
ajU
naL
iRh
-pSX
-rnk
-pLo
+mAc
+oud
+sLg
iRh
iRh
anT
@@ -118762,8 +118762,8 @@ hcZ
oeF
ivK
ecG
-uLB
-aTC
+sRL
+dUC
enS
qUi
kuy
@@ -119020,7 +119020,7 @@ oeF
ivK
sKt
aWM
-veL
+apN
aiQ
cNs
uiA
@@ -119519,11 +119519,11 @@ ivK
sEx
lJc
hgC
-lZt
-ecV
+oCA
+bCq
fcU
-afY
-bZk
+vhD
+cvn
mqk
azU
mqk
@@ -119533,7 +119533,7 @@ lDt
rDh
gMD
kvM
-mOu
+tOn
gdv
gdv
wpa
@@ -119777,7 +119777,7 @@ sEx
kYZ
mKw
pZL
-kaB
+hdA
qZv
nxL
nxL
@@ -120033,8 +120033,8 @@ ivK
sEx
vjM
vqO
-nXN
-kaB
+vEj
+hdA
aFR
vQo
enI
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index ce04c26e93f98..4a04c058623b8 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -10012,9 +10012,7 @@
/turf/open/floor/iron,
/area/crew_quarters/kitchen)
"bhR" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/bot,
-/obj/item/book/manual/wiki/cooking_to_serve_man,
+/obj/machinery/griddle,
/turf/open/floor/iron,
/area/crew_quarters/kitchen)
"bhS" = (
@@ -10563,6 +10561,7 @@
pixel_y = 5
},
/obj/effect/turf_decal/bot,
+/obj/item/book/manual/wiki/cooking_to_serve_man,
/turf/open/floor/iron,
/area/crew_quarters/kitchen)
"blw" = (
diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm
index e0ea43e0b62de..0da15aeae0613 100644
--- a/_maps/map_files/EchoStation/EchoStation.dmm
+++ b/_maps/map_files/EchoStation/EchoStation.dmm
@@ -9023,6 +9023,18 @@
req_access = null;
req_one_access_txt = "28;25;35"
},
+/obj/item/storage/box/ingredients/fruity{
+ pixel_x = 4;
+ pixel_y = 6
+ },
+/obj/item/storage/box/ingredients/vegetarian{
+ pixel_x = -1;
+ pixel_y = 4
+ },
+/obj/item/storage/box/ingredients/wildcard{
+ pixel_x = -5;
+ pixel_y = 8
+ },
/turf/open/floor/iron/freezer,
/area/crew_quarters/kitchen/coldroom)
"eoQ" = (
@@ -28962,15 +28974,7 @@
/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted,
/mob/living/simple_animal/hostile/retaliate/frog{
attacked_sound = 'sound/effects/huuu.ogg';
- density = 0;
- desc = "It seems a little sad.";
dir = 8;
- head_icon = 'icons/mob/pets_held.dmi';
- held_state = "";
- icon = 'icons/mob/animal.dmi';
- icon_dead = "frog_dead";
- icon_living = "frog";
- icon_state = "frog";
name = "Larry";
pixel_y = 12;
stepped_sound = null
@@ -35130,19 +35134,7 @@
/turf/open/floor/iron,
/area/engine/engineering)
"rZh" = (
-/obj/structure/table,
-/obj/item/storage/box/ingredients/wildcard{
- pixel_x = -5;
- pixel_y = 8
- },
-/obj/item/storage/box/ingredients/fruity{
- pixel_x = 4;
- pixel_y = 6
- },
-/obj/item/storage/box/ingredients/vegetarian{
- pixel_x = -1;
- pixel_y = 4
- },
+/obj/machinery/griddle,
/turf/open/floor/iron/cafeteria,
/area/crew_quarters/kitchen)
"rZv" = (
@@ -36559,7 +36551,6 @@
/area/crew_quarters/cafeteria)
"sMM" = (
/obj/machinery/airalarm{
- dir = 2;
pixel_y = 28
},
/turf/open/openspace,
diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm
index 00421407d23e9..cc74d9935b042 100644
--- a/_maps/map_files/FlandStation/FlandStation.dmm
+++ b/_maps/map_files/FlandStation/FlandStation.dmm
@@ -4474,9 +4474,7 @@
/turf/open/floor/iron/dark,
/area/hallway/secondary/entry)
"aYi" = (
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
/obj/machinery/camera{
c_tag = "Medbay - Chief Medical Officer's Office";
@@ -6052,9 +6050,7 @@
/obj/structure/cable/yellow{
icon_state = "0-8"
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/dark,
/area/chapel/office)
@@ -9911,12 +9907,9 @@
},
/area/hallway/primary/port)
"czD" = (
-/obj/structure/table,
/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/glass/bowl,
-/obj/item/food/grown/tomato,
-/obj/item/food/dough,
/obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/machinery/griddle,
/turf/open/floor/iron/cafeteria,
/area/crew_quarters/kitchen)
"czF" = (
@@ -10225,9 +10218,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -11785,9 +11776,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -11915,6 +11904,10 @@
/obj/effect/turf_decal/bot,
/obj/structure/table,
/obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/food/condiment/flour{
+ pixel_x = 4
+ },
/turf/open/floor/iron/cafeteria,
/area/crew_quarters/kitchen)
"dap" = (
@@ -14949,6 +14942,10 @@
/obj/structure/disposalpipe/trunk{
dir = 4
},
+/obj/machinery/airalarm{
+ dir = 1;
+ pixel_y = -22
+ },
/turf/open/floor/iron/dark,
/area/hydroponics)
"dPC" = (
@@ -16114,6 +16111,10 @@
},
/turf/open/floor/prison,
/area/security/prison)
+"ehF" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/hydroponics)
"ehG" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/closeup{
@@ -19089,9 +19090,7 @@
/turf/open/floor/plating,
/area/maintenance/port/central)
"eSB" = (
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow,
/obj/effect/turf_decal/siding/wood{
dir = 8
@@ -19213,9 +19212,7 @@
/turf/open/floor/iron/grid/steel,
/area/bridge)
"eTQ" = (
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow,
/turf/open/floor/iron/dark,
/area/engine/storage)
@@ -19702,6 +19699,10 @@
},
/turf/open/floor/iron,
/area/quartermaster/office)
+"eYj" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/crew_quarters/kitchen)
"eYk" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/circuit,
@@ -20411,6 +20412,14 @@
},
/turf/open/floor/iron,
/area/hallway/primary/port)
+"fiV" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/structure/table,
+/obj/item/food/dough,
+/obj/item/reagent_containers/glass/bowl,
+/obj/item/food/grown/tomato,
+/turf/open/floor/iron/cafeteria,
+/area/crew_quarters/kitchen)
"fiW" = (
/obj/effect/turf_decal/stripes/end,
/obj/effect/turf_decal/stripes/red/end,
@@ -20843,13 +20852,13 @@
/turf/open/floor/engine/air/light,
/area/engine/atmos)
"foJ" = (
-/obj/machinery/deepfryer,
/obj/item/radio/intercom{
pixel_x = 28
},
/obj/effect/turf_decal/tile/bar/opposingcorners{
dir = 1
},
+/obj/machinery/griddle,
/turf/open/floor/iron/cafeteria,
/area/vacant_room/commissary/commissaryFood)
"foO" = (
@@ -23237,9 +23246,7 @@
/turf/open/floor/iron,
/area/hallway/primary/central)
"fSI" = (
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow,
/obj/structure/cable/yellow{
icon_state = "0-8"
@@ -23929,9 +23936,7 @@
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/ai_upload_foyer)
"gbx" = (
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -24435,10 +24440,6 @@
/turf/open/floor/plating,
/area/maintenance/port/central)
"ghK" = (
-/obj/structure/noticeboard{
- dir = 8;
- pixel_x = 32
- },
/obj/machinery/light/small{
dir = 4
},
@@ -26111,6 +26112,9 @@
/obj/item/storage/bag/plants/portaseeder,
/obj/item/plant_analyzer,
/obj/item/reagent_containers/glass/bucket,
+/obj/item/seeds/wheat,
+/obj/item/seeds/wheat,
+/obj/item/seeds/wheat,
/turf/open/floor/grass,
/area/hydroponics/garden)
"gCA" = (
@@ -26258,9 +26262,7 @@
dir = 9;
network = list("vault")
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -30283,9 +30285,7 @@
/turf/open/floor/iron,
/area/hallway/primary/central)
"hJw" = (
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -37168,9 +37168,7 @@
/obj/structure/cable/yellow{
icon_state = "0-8"
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/chair/foldable{
dir = 8
},
@@ -39582,9 +39580,7 @@
/obj/machinery/airalarm{
pixel_y = 22
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-2"
},
@@ -41952,10 +41948,6 @@
/obj/item/hand_labeler,
/obj/effect/turf_decal/bot,
/obj/structure/table,
-/obj/machinery/airalarm{
- dir = 1;
- pixel_y = -22
- },
/turf/open/floor/iron/grid/steel,
/area/hydroponics)
"kFJ" = (
@@ -42458,16 +42450,9 @@
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"kMK" = (
-/obj/structure/table,
-/obj/effect/turf_decal/bot,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/reagent_containers/food/condiment/flour{
- pixel_x = 4
- },
-/obj/item/food/chocolatebar,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron/cafeteria,
-/area/crew_quarters/kitchen)
+/mob/living/simple_animal/chicken,
+/turf/open/floor/grass,
+/area/hydroponics/garden)
"kMO" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -42933,9 +42918,7 @@
name = "medbay camera";
network = list("ss13","medbay")
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -43951,9 +43934,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -47803,9 +47784,7 @@
/obj/item/stock_parts/cell/hyper,
/obj/item/stack/cable_coil,
/obj/effect/turf_decal/bot,
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -48968,9 +48947,7 @@
/turf/open/floor/carpet/orange,
/area/quartermaster/qm)
"muu" = (
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow,
/turf/open/floor/carpet,
/area/hallway/primary/starboard)
@@ -50334,6 +50311,7 @@
/obj/item/storage/box/ingredients/wildcard,
/obj/item/food/mint,
/obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/item/food/chocolatebar,
/turf/open/floor/iron/cafeteria,
/area/crew_quarters/kitchen)
"mLS" = (
@@ -53079,6 +53057,10 @@
pixel_x = 4;
pixel_y = -4
},
+/obj/structure/noticeboard{
+ dir = 4;
+ pixel_x = -27
+ },
/turf/open/floor/iron/dark,
/area/crew_quarters/bar)
"nwT" = (
@@ -59259,9 +59241,7 @@
/turf/open/floor/iron/dark,
/area/bridge)
"pgZ" = (
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-2"
},
@@ -63031,9 +63011,7 @@
/area/maintenance/central)
"qfK" = (
/obj/item/kirbyplants/random,
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -65806,9 +65784,7 @@
/turf/open/floor/iron/freezer,
/area/crew_quarters/kitchen/coldroom)
"qPX" = (
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -66714,9 +66690,7 @@
/obj/structure/cable/yellow{
icon_state = "0-8"
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/machinery/light_switch{
pixel_x = 24;
pixel_y = 24
@@ -68753,9 +68727,7 @@
/turf/open/floor/iron/dark,
/area/quartermaster/miningdock)
"rCW" = (
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -70048,9 +70020,7 @@
/area/hydroponics)
"rQK" = (
/obj/item/kirbyplants/random,
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -71329,6 +71299,11 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/security/execution/transfer)
+"sis" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/structure/table,
+/turf/open/floor/iron/cafeteria,
+/area/crew_quarters/kitchen)
"siB" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/closeup,
@@ -72786,9 +72761,7 @@
/turf/open/floor/iron/ridged/steel,
/area/science/xenobiology)
"sBB" = (
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -73098,9 +73071,7 @@
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 4
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-2"
},
@@ -77012,9 +76983,7 @@
/obj/structure/cable/yellow{
icon_state = "0-8"
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted,
/turf/open/floor/iron,
/area/storage/tools)
@@ -79728,9 +79697,7 @@
dir = 5
},
/obj/item/kirbyplants/random,
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -80675,9 +80642,7 @@
/area/engine/engine_room)
"uBs" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-2"
},
@@ -81655,9 +81620,7 @@
/turf/open/floor/iron/dark,
/area/engine/gravity_generator)
"uOg" = (
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -83805,9 +83768,7 @@
/turf/open/floor/wood,
/area/security/detectives_office)
"vmR" = (
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow,
/turf/open/floor/iron/dark,
/area/science/robotics/mechbay)
@@ -89063,9 +89024,7 @@
/turf/open/floor/iron/dark,
/area/science/lobby)
"wvS" = (
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/old,
/obj/structure/closet/secure_closet/injection,
@@ -116658,7 +116617,7 @@ tqu
fUf
fUf
fUf
-fUf
+kMK
fUf
veT
gVE
@@ -119242,7 +119201,7 @@ ajI
vqH
vqH
vpW
-vqH
+eYj
lHN
sxF
mRd
@@ -120518,7 +120477,7 @@ arZ
mEH
ptN
kFI
-arZ
+ehF
kZd
jAa
xNi
@@ -120788,8 +120747,8 @@ cRo
mib
mib
rfs
-mib
-mib
+sis
+fiV
mib
njG
jOJ
@@ -121046,7 +121005,7 @@ pYP
qxm
mib
mLj
-kMK
+czD
mib
qrj
jOJ
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 41232f42c62e2..3574fdd5fdb6f 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -55048,14 +55048,12 @@
/area/medical/medbay/central)
"lHW" = (
/obj/structure/table,
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
+/obj/item/storage/bag/tray,
/obj/item/book/manual/chef_recipes{
pixel_x = -4;
pixel_y = 6
},
-/obj/item/book/manual/chef_recipes{
- pixel_y = 2
- },
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
/turf/open/floor/iron/dark,
/area/crew_quarters/kitchen)
"lIC" = (
@@ -61752,7 +61750,6 @@
/turf/open/floor/iron/showroomfloor,
/area/medical/surgery)
"nZX" = (
-/obj/machinery/deepfryer,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/stripes/corner,
/obj/effect/turf_decal/stripes/line{
@@ -61761,6 +61758,7 @@
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 4
},
+/obj/machinery/food_cart,
/turf/open/floor/iron/dark,
/area/crew_quarters/kitchen)
"oaf" = (
@@ -61845,10 +61843,12 @@
/area/maintenance/starboard)
"ocf" = (
/obj/structure/table,
-/obj/item/storage/bag/tray,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
},
+/obj/machinery/reagentgrinder{
+ pixel_y = 5
+ },
/turf/open/floor/iron/dark,
/area/crew_quarters/kitchen)
"ocg" = (
@@ -65601,9 +65601,7 @@
/turf/open/floor/plating,
/area/quartermaster/warehouse)
"plP" = (
-/obj/effect/turf_decal/tile/dark_green/half/contrasted{
- color = "#439C1E"
- },
+/obj/effect/turf_decal/tile/dark_green/half/contrasted,
/obj/effect/turf_decal/stripes/corner,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -85868,13 +85866,13 @@
/turf/open/floor/iron/showroomfloor,
/area/medical/medbay/central)
"wgS" = (
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+ dir = 8
+ },
/obj/structure/table,
/obj/machinery/microwave{
pixel_y = 5
},
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
- dir = 8
- },
/turf/open/floor/iron/dark,
/area/crew_quarters/kitchen)
"wgX" = (
@@ -90967,13 +90965,10 @@
},
/area/maintenance/starboard/aft)
"xQc" = (
-/obj/structure/table,
-/obj/machinery/reagentgrinder{
- pixel_y = 5
- },
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
+/obj/machinery/griddle,
/turf/open/floor/iron/dark,
/area/crew_quarters/kitchen)
"xQl" = (
@@ -92397,9 +92392,7 @@
/area/crew_quarters/cryopods)
"ylk" = (
/obj/effect/decal/cleanable/blood/old,
-/obj/effect/turf_decal/tile/dark_green/half/contrasted{
- color = "#439C1E"
- },
+/obj/effect/turf_decal/tile/dark_green/half/contrasted,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 7b6dd78d5e312..a2cece2542cf2 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -29469,8 +29469,6 @@
/turf/open/floor/iron/dark,
/area/aisat)
"fpB" = (
-/obj/structure/table,
-/obj/item/food/mint,
/obj/machinery/airalarm{
dir = 4;
pixel_x = -23
@@ -29481,6 +29479,13 @@
pixel_y = -24
},
/obj/structure/cable/yellow,
+/obj/structure/rack,
+/obj/item/storage/box/donkpockets,
+/obj/item/stack/package_wrap,
+/obj/item/book/manual/chef_recipes{
+ pixel_x = 2;
+ pixel_y = 6
+ },
/turf/open/floor/iron/checker,
/area/crew_quarters/kitchen)
"fpC" = (
@@ -35284,10 +35289,12 @@
/turf/open/floor/plating,
/area/maintenance/aft/secondary)
"hEt" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/door/poddoor/preopen{
+ id = "kitchenwindow";
+ name = "kitchen shutters"
},
-/turf/open/floor/iron/checker,
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
/area/crew_quarters/kitchen)
"hEL" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -43273,6 +43280,7 @@
"kId" = (
/obj/structure/table,
/obj/item/book/manual/wiki/cooking_to_serve_man,
+/obj/item/storage/box/donkpockets,
/turf/open/floor/iron/checker,
/area/crew_quarters/kitchen)
"kIn" = (
@@ -43473,6 +43481,7 @@
/obj/item/reagent_containers/food/condiment/enzyme{
layer = 5
},
+/obj/item/food/mint,
/turf/open/floor/iron/checker,
/area/crew_quarters/kitchen)
"kKl" = (
@@ -45876,9 +45885,6 @@
/obj/structure/cable/yellow{
icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
},
@@ -53120,10 +53126,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/white,
/area/medical/medbay/aft)
-"oub" = (
-/obj/structure/sign/poster/official/random,
-/turf/closed/wall,
-/area/hydroponics)
"oue" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
@@ -59033,9 +59035,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -60310,9 +60310,7 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -62521,13 +62519,7 @@
/obj/structure/extinguisher_cabinet{
pixel_y = -30
},
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/bot{
- dir = 1
- },
+/obj/machinery/processor,
/turf/open/floor/iron/checker,
/area/crew_quarters/kitchen)
"sdw" = (
@@ -64629,11 +64621,6 @@
/turf/open/floor/engine,
/area/science/xenobiology)
"sVr" = (
-/obj/structure/table,
-/obj/machinery/microwave{
- pixel_x = -3;
- pixel_y = 4
- },
/obj/machinery/button/door{
id = "kitchen";
name = "Kitchen Shutters Control";
@@ -64648,6 +64635,10 @@
/obj/machinery/light{
dir = 1
},
+/obj/structure/table,
+/obj/machinery/dish_drive{
+ pixel_y = 5
+ },
/turf/open/floor/iron/checker,
/area/crew_quarters/kitchen)
"sVA" = (
@@ -66326,13 +66317,11 @@
/turf/open/floor/iron/grid/steel,
/area/medical/virology)
"tDj" = (
-/obj/structure/rack,
-/obj/item/book/manual/chef_recipes{
- pixel_x = 2;
- pixel_y = 6
+/obj/structure/table,
+/obj/machinery/microwave{
+ pixel_x = -3;
+ pixel_y = 4
},
-/obj/item/stack/package_wrap,
-/obj/item/storage/box/donkpockets,
/turf/open/floor/iron/checker,
/area/crew_quarters/kitchen)
"tDC" = (
@@ -66353,8 +66342,7 @@
/turf/open/floor/iron/white,
/area/medical/medbay/aft)
"tDH" = (
-/obj/structure/table,
-/obj/item/storage/box/donkpockets,
+/obj/machinery/griddle,
/turf/open/floor/iron/checker,
/area/crew_quarters/kitchen)
"tDM" = (
@@ -66627,9 +66615,6 @@
/turf/open/floor/iron,
/area/hallway/primary/fore)
"tIN" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -66639,6 +66624,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
+/obj/structure/disposalpipe/trunk/multiz/down{
+ dir = 1
+ },
/turf/open/floor/iron/checker,
/area/crew_quarters/kitchen)
"tIU" = (
@@ -68041,7 +68029,6 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/obj/machinery/deepfryer,
/turf/open/floor/iron/checker,
/area/crew_quarters/kitchen)
"ukx" = (
@@ -71280,9 +71267,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -75165,7 +75150,11 @@
departmentType = 2;
pixel_x = 30
},
-/obj/machinery/processor,
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/bot{
+ dir = 1
+ },
+/obj/structure/disposalpipe/trunk,
/turf/open/floor/iron/checker,
/area/crew_quarters/kitchen)
"wVV" = (
@@ -75924,9 +75913,7 @@
name = "medbay camera";
network = list("ss13","medbay")
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow,
/turf/open/floor/iron/dark,
/area/medical/surgery)
@@ -77493,7 +77480,6 @@
/obj/effect/turf_decal/tile/red/fourcorners/contrasted,
/mob/living/simple_animal/kalo{
desc = "The Perma brig's cute grass snake.";
- icon = 'icons/mob/animal.dmi';
icon_dead = "snake_dead";
icon_living = "snake";
icon_state = "snake";
@@ -111795,7 +111781,7 @@ dik
bKe
bOP
bOP
-bOP
+hEt
bKe
bSS
soe
@@ -113082,7 +113068,7 @@ leM
kId
qqj
djR
-oub
+bUe
bUi
hzl
bWT
@@ -113595,7 +113581,7 @@ ujJ
duS
owC
qqj
-hEt
+ujJ
bSV
bUh
mPh
@@ -114110,7 +114096,7 @@ dLU
agH
wVR
tIN
-bST
+bUe
kwI
hzl
bWT
diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm
index 3edc695f1ca9b..db9b8bf350545 100644
--- a/_maps/map_files/RadStation/RadStation.dmm
+++ b/_maps/map_files/RadStation/RadStation.dmm
@@ -453,9 +453,7 @@
/turf/open/floor/iron,
/area/hallway/primary/fore)
"agS" = (
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -494,9 +492,7 @@
/area/ai_monitored/turret_protected/ai)
"aic" = (
/obj/structure/table/reinforced,
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/item/clothing/glasses/welding,
/turf/open/floor/plating,
/area/ai_monitored/storage/satellite)
@@ -1159,9 +1155,7 @@
/obj/item/radio/intercom{
pixel_y = -35
},
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/machinery/recharge_station{
name = "EPS recharging station"
},
@@ -1831,8 +1825,7 @@
dir = 2
},
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/effect/turf_decal/guideline/guideline_in/darkblue{
dir = 4
@@ -2141,7 +2134,6 @@
dir = 1
},
/obj/machinery/camera/autoname{
- dir = 2;
view_range = 12
},
/obj/machinery/status_display/evac{
@@ -2747,7 +2739,6 @@
broadcasting = 1;
canhear_range = 6;
dir = 8;
- listening = 1;
name = "Station Intercom (Court)"
},
/obj/item/gavelhammer{
@@ -3060,9 +3051,7 @@
/turf/open/floor/iron,
/area/science/xenobiology)
"aXX" = (
-/obj/structure/chair/wood/normal{
- dir = 2
- },
+/obj/structure/chair/wood/normal,
/turf/open/floor/wood,
/area/crew_quarters/theatre)
"aYr" = (
@@ -3381,8 +3370,7 @@
/obj/item/toy/figure/captain{
icon_state = "nuketoy";
name = "Toy Nuke";
- toysay = "What the fuck did you do?";
- toysound = 'sound/machines/click.ogg'
+ toysay = "What the fuck did you do?"
},
/turf/open/floor/plating/airless,
/area/science/test_area)
@@ -3683,7 +3671,6 @@
dir = 1
},
/obj/machinery/camera/autoname{
- dir = 2;
network = list("ss13","engine")
},
/turf/open/floor/iron/tech,
@@ -3855,7 +3842,6 @@
dir = 4
},
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E"
},
/turf/open/floor/iron,
@@ -4298,8 +4284,7 @@
dir = 5
},
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/structure/disposalpipe/sorting/mail{
name = "Security"
@@ -4667,9 +4652,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -4701,7 +4684,6 @@
/obj/structure/closet/secure_closet/freezer/meat,
/obj/effect/turf_decal/bot,
/obj/machinery/airalarm{
- dir = 2;
pixel_y = 28
},
/turf/open/floor/iron/freezer,
@@ -4752,8 +4734,7 @@
/area/medical/sleeper)
"bCx" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/effect/turf_decal/bot,
/obj/machinery/light{
@@ -5481,7 +5462,6 @@
dir = 8
},
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E"
},
/turf/open/floor/iron,
@@ -5740,7 +5720,6 @@
dir = 4
},
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E"
},
/turf/open/floor/iron,
@@ -6087,7 +6066,6 @@
dir = 4
},
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E"
},
/turf/open/floor/iron,
@@ -6228,7 +6206,6 @@
/obj/machinery/light/floor{
brightness = 15;
bulb_colour = "#FFE4CE";
- bulb_emergency_brightness_mul = 0.25;
bulb_vacuum_brightness = 15;
nightshift_brightness = 10;
nightshift_light_color = "#E6EBFF"
@@ -6259,7 +6236,6 @@
/obj/machinery/light/floor{
brightness = 15;
bulb_colour = "#FFE4CE";
- bulb_emergency_brightness_mul = 0.25;
bulb_vacuum_brightness = 15;
nightshift_brightness = 10;
nightshift_light_color = "#E6EBFF"
@@ -6271,8 +6247,7 @@
/area/crew_quarters/heads/hos)
"ccv" = (
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/effect/turf_decal/guideline/guideline_in/darkblue{
dir = 4
@@ -7135,7 +7110,6 @@
"coY" = (
/obj/structure/table,
/obj/machinery/door/window/eastright{
- dir = 4;
icon_state = "left";
name = "Research and Development Desk";
req_one_access_txt = "7;29"
@@ -7541,8 +7515,7 @@
/area/engine/atmos)
"cvf" = (
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/structure/disposalpipe/segment{
dir = 2
@@ -7904,7 +7877,6 @@
dir = 1
},
/obj/machinery/camera/autoname{
- dir = 2;
network = list("ss13","medbay");
view_range = 10
},
@@ -8041,9 +8013,7 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
-/obj/machinery/nuclearbomb/selfdestruct{
- base_icon_state = null
- },
+/obj/machinery/nuclearbomb/selfdestruct,
/turf/open/floor/circuit/green{
luminosity = 2
},
@@ -8615,7 +8585,6 @@
},
/obj/effect/turf_decal/guideline/guideline_edge_alt/blue,
/obj/effect/turf_decal/guideline/guideline_tri/blue{
- color = "#52B4E9";
dir = 4
},
/turf/open/floor/iron/white/side{
@@ -9202,15 +9171,11 @@
/turf/open/floor/iron/dark,
/area/hallway/primary/central)
"cWP" = (
-/obj/structure/chair/wood/normal{
- dir = 2
- },
+/obj/structure/chair/wood/normal,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/effect/turf_decal/siding/wood/corner{
dir = 1
},
@@ -9569,9 +9534,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 6
},
-/turf/open/floor/iron/dark/side{
- dir = 2
- },
+/turf/open/floor/iron/dark/side,
/area/hallway/primary/central)
"dcB" = (
/obj/machinery/ai_slipper{
@@ -10256,8 +10219,7 @@
/area/quartermaster/storage)
"dmU" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/structure/closet/secure_closet/engineering_personal,
/obj/effect/turf_decal/bot,
@@ -10560,9 +10522,7 @@
pixel_x = -1;
pixel_y = 5
},
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/machinery/camera/autoname{
c_tag = "Starbird Security Checkpoint";
dir = 1
@@ -10981,7 +10941,6 @@
pixel_y = -32
},
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E";
dir = 1
},
@@ -11084,9 +11043,7 @@
dir = 8
},
/obj/effect/turf_decal/guideline/guideline_edge/red,
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
@@ -11201,8 +11158,7 @@
/area/engine/atmos)
"dBX" = (
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/structure/disposalpipe/segment{
dir = 2
@@ -11581,7 +11537,6 @@
dir = 6
},
/obj/machinery/airalarm{
- dir = 2;
pixel_y = 28
},
/obj/machinery/chem_dispenser/mutagensaltpetersmall,
@@ -11804,7 +11759,6 @@
/obj/machinery/light/floor{
brightness = 15;
bulb_colour = "#FFE4CE";
- bulb_emergency_brightness_mul = 0.25;
bulb_vacuum_brightness = 15;
nightshift_brightness = 10;
nightshift_light_color = "#E6EBFF"
@@ -12110,9 +12064,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/iron/dark/side{
- dir = 2
- },
+/turf/open/floor/iron/dark/side,
/area/science/mixing/chamber)
"dNE" = (
/obj/effect/landmark/start/janitor,
@@ -12278,9 +12230,7 @@
/turf/open/floor/engine,
/area/science/xenobiology)
"dQf" = (
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -12521,7 +12471,6 @@
/obj/machinery/light/floor{
brightness = 15;
bulb_colour = "#FFE4CE";
- bulb_emergency_brightness_mul = 0.25;
bulb_vacuum_brightness = 15;
nightshift_brightness = 10;
nightshift_light_color = "#E6EBFF"
@@ -12586,7 +12535,6 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/components/binary/pump{
- dir = 2;
name = "Atmos to Loop"
},
/obj/effect/turf_decal/delivery,
@@ -13468,7 +13416,6 @@
/obj/machinery/light/floor{
brightness = 15;
bulb_colour = "#FFE4CE";
- bulb_emergency_brightness_mul = 0.25;
bulb_vacuum_brightness = 15;
nightshift_brightness = 10;
nightshift_light_color = "#E6EBFF"
@@ -13534,8 +13481,7 @@
"elG" = (
/obj/effect/turf_decal/tile/dark_red/half/contrasted{
alpha = 180;
- color = "#DE3A3A";
- dir = 2
+ color = "#DE3A3A"
},
/obj/structure/cable/yellow{
icon_state = "1-8"
@@ -13887,9 +13833,7 @@
/turf/open/floor/iron,
/area/maintenance/starboard/aft)
"ert" = (
-/obj/machinery/power/emitter/welded{
- dir = 2
- },
+/obj/machinery/power/emitter/welded,
/obj/structure/cable/yellow{
icon_state = "0-4"
},
@@ -14411,7 +14355,6 @@
dir = 4
},
/obj/effect/turf_decal/guideline/guideline_tri/blue{
- color = "#52B4E9";
dir = 1
},
/obj/structure/disposalpipe/segment{
@@ -15270,8 +15213,7 @@
dir = 8
},
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/structure/disposalpipe/segment{
dir = 1
@@ -15307,9 +15249,7 @@
dir = 1;
network = list("ss13","security")
},
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/item/radio/intercom{
frequency = 1423;
name = "Interrogation Intercom";
@@ -15667,7 +15607,6 @@
},
/obj/effect/turf_decal/guideline/guideline_edge_alt/blue,
/obj/effect/turf_decal/guideline/guideline_tri/blue{
- color = "#52B4E9";
dir = 4
},
/turf/open/floor/iron/white/side{
@@ -15697,9 +15636,7 @@
"eTm" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/turf_decal/bot,
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/turf/open/floor/iron,
/area/engine/atmos)
"eTn" = (
@@ -15986,7 +15923,6 @@
},
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/obj/machinery/camera/autoname{
- c_tag = null;
dir = 8;
network = list("ss13","medbay");
view_range = 8
@@ -16705,9 +16641,7 @@
/area/maintenance/port/aft)
"fid" = (
/obj/effect/turf_decal/siding/wideplating/dark,
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 9
},
@@ -17391,7 +17325,6 @@
dir = 8
},
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E"
},
/turf/open/floor/iron,
@@ -17414,7 +17347,6 @@
/obj/machinery/light/floor{
brightness = 15;
bulb_colour = "#FFE4CE";
- bulb_emergency_brightness_mul = 0.25;
bulb_vacuum_brightness = 15;
nightshift_brightness = 10;
nightshift_light_color = "#E6EBFF"
@@ -17767,9 +17699,7 @@
pixel_x = 1;
pixel_y = -36
},
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/structure/chair/fancy/sofa/old/right{
dir = 1
},
@@ -17896,9 +17826,7 @@
/turf/open/floor/wood,
/area/security/courtroom)
"fzv" = (
-/obj/machinery/computer/cloning{
- dir = 2
- },
+/obj/machinery/computer/cloning,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/medical/genetics/cloning)
@@ -18074,9 +18002,7 @@
dir = 1
},
/obj/effect/turf_decal/siding/wideplating/dark,
-/turf/open/floor/iron/dark/side{
- dir = 2
- },
+/turf/open/floor/iron/dark/side,
/area/hallway/primary/central)
"fCz" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -18594,7 +18520,6 @@
/obj/machinery/light/floor{
brightness = 15;
bulb_colour = "#FFE4CE";
- bulb_emergency_brightness_mul = 0.25;
bulb_vacuum_brightness = 15;
nightshift_brightness = 10;
nightshift_light_color = "#E6EBFF"
@@ -18613,15 +18538,11 @@
/obj/structure/cable/yellow{
icon_state = "0-8"
},
-/obj/structure/curtain/directional{
- dir = 2
- },
+/obj/structure/curtain/directional,
/turf/open/floor/plating,
/area/security/courtroom)
"fLQ" = (
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/item/kirbyplants/random,
/turf/open/floor/iron,
/area/science/lobby)
@@ -19590,9 +19511,7 @@
layer = 3.00001;
pixel_y = 1
},
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/structure/extinguisher_cabinet{
pixel_y = -33
},
@@ -19888,9 +19807,7 @@
/obj/structure/extinguisher_cabinet{
pixel_x = -27
},
-/turf/open/floor/iron/dark/side{
- dir = 2
- },
+/turf/open/floor/iron/dark/side,
/area/hallway/primary/central)
"geq" = (
/obj/machinery/meter,
@@ -20179,9 +20096,7 @@
/obj/structure/extinguisher_cabinet{
pixel_y = -33
},
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/turf/open/floor/iron/white/side{
dir = 1
},
@@ -20421,8 +20336,7 @@
dir = 8
},
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/structure/disposalpipe/segment{
dir = 1
@@ -21147,8 +21061,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/effect/turf_decal/guideline/guideline_in/darkblue{
dir = 4
@@ -21553,8 +21466,7 @@
location = "2-Sec"
},
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
@@ -21814,7 +21726,6 @@
/obj/machinery/light/floor{
brightness = 15;
bulb_colour = "#FFE4CE";
- bulb_emergency_brightness_mul = 0.25;
bulb_vacuum_brightness = 15;
nightshift_brightness = 10;
nightshift_light_color = "#E6EBFF"
@@ -21992,7 +21903,6 @@
pixel_y = 1
},
/obj/machinery/airalarm{
- dir = 2;
pixel_y = 28
},
/turf/open/floor/iron/white,
@@ -22139,8 +22049,7 @@
icon_state = "4-8"
},
/obj/effect/turf_decal/guideline/guideline_in/neutral{
- alpha = 255;
- dir = 2
+ alpha = 255
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -22288,7 +22197,6 @@
pixel_y = 29
},
/obj/machinery/camera/autoname{
- dir = 2;
network = list("ss13","rd")
},
/turf/open/floor/iron/dark,
@@ -22526,9 +22434,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/turf/open/floor/engine,
/area/science/explab)
"gRN" = (
@@ -22943,7 +22849,6 @@
dir = 1
},
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E"
},
/turf/open/floor/iron,
@@ -23021,9 +22926,7 @@
/turf/open/floor/iron/white,
/area/science/research)
"gYh" = (
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -23745,11 +23648,8 @@
/obj/effect/turf_decal/guideline/guideline_edge_alt/blue{
dir = 8
},
-/obj/effect/turf_decal/guideline/guideline_tri/blue{
- color = "#52B4E9"
- },
+/obj/effect/turf_decal/guideline/guideline_tri/blue,
/obj/machinery/camera/autoname{
- dir = 2;
network = list("ss13","medbay");
view_range = 10
},
@@ -23946,7 +23846,6 @@
/obj/machinery/light/floor{
brightness = 15;
bulb_colour = "#FFE4CE";
- bulb_emergency_brightness_mul = 0.25;
bulb_vacuum_brightness = 15;
nightshift_brightness = 10;
nightshift_light_color = "#E6EBFF"
@@ -24180,9 +24079,7 @@
/turf/open/floor/iron/stairs/right,
/area/hallway/primary/central)
"hsL" = (
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/turf/open/floor/iron,
/area/hallway/primary/central)
"hsU" = (
@@ -25383,9 +25280,7 @@
/obj/structure/cable/yellow{
icon_state = "0-8"
},
-/obj/structure/curtain/directional{
- dir = 2
- },
+/obj/structure/curtain/directional,
/turf/open/floor/plating,
/area/crew_quarters/heads/chief)
"hNf" = (
@@ -25711,7 +25606,6 @@
/obj/machinery/light/floor{
brightness = 15;
bulb_colour = "#FFE4CE";
- bulb_emergency_brightness_mul = 0.25;
bulb_vacuum_brightness = 15;
nightshift_brightness = 10;
nightshift_light_color = "#E6EBFF"
@@ -25813,9 +25707,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/camera/autoname{
- dir = 2
- },
+/obj/machinery/camera/autoname,
/turf/open/floor/iron/dark,
/area/storage/primary)
"hTN" = (
@@ -27875,8 +27767,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/structure/disposalpipe/segment{
dir = 1
@@ -28047,9 +27938,7 @@
"iJN" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/components/trinary/filter{
- flipped = 0
- },
+/obj/machinery/atmospherics/components/trinary/filter,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/engine/atmospherics_engine)
@@ -28237,9 +28126,7 @@
/turf/open/floor/iron/dark,
/area/security/courtroom)
"iNu" = (
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
},
@@ -28757,9 +28644,7 @@
alpha = 180;
dir = 4
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-2"
},
@@ -29471,8 +29356,7 @@
dir = 8
},
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/structure/disposalpipe/segment{
dir = 1
@@ -30333,8 +30217,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/structure/disposalpipe/segment{
dir = 1
@@ -30408,9 +30291,7 @@
/obj/structure/disposalpipe/segment{
dir = 5
},
-/turf/open/floor/iron/dark/side{
- dir = 2
- },
+/turf/open/floor/iron/dark/side,
/area/hallway/primary/central)
"jwG" = (
/obj/effect/turf_decal/guideline/guideline_in/neutral{
@@ -30510,8 +30391,6 @@
pixel_y = -2
},
/obj/machinery/door/window/northright{
- dir = 1;
- icon_state = "right";
layer = 3.1;
name = "Jetpack Storage";
req_access_txt = "19"
@@ -30735,9 +30614,7 @@
/obj/structure/reagent_dispensers/peppertank{
pixel_y = -30
},
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/machinery/button/door/incinerator_vent_toxmix{
id = "tox_ESD";
name = "Emergency space door";
@@ -31004,7 +30881,6 @@
dir = 4
},
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E"
},
/turf/open/floor/iron,
@@ -31176,9 +31052,7 @@
pixel_y = 5
},
/obj/structure/table/wood,
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-2"
},
@@ -32083,7 +31957,6 @@
"jXw" = (
/obj/structure/bed/roller,
/obj/effect/turf_decal/guideline/guideline_tri/blue{
- color = "#52B4E9";
dir = 8
},
/turf/open/floor/iron/white/side{
@@ -32331,8 +32204,7 @@
/area/science/robotics/mechbay)
"kaQ" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/turf/open/floor/iron,
/area/engine/storage)
@@ -32416,7 +32288,6 @@
},
/obj/machinery/firealarm/directional/north,
/obj/machinery/camera/autoname{
- dir = 2;
network = list("ss13","engine")
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -32636,7 +32507,6 @@
dir = 4
},
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E"
},
/turf/open/floor/iron,
@@ -32834,9 +32704,7 @@
/turf/open/floor/iron/dark,
/area/engine/atmos)
"kjs" = (
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/hydroponics/constructable,
/obj/effect/turf_decal/stripes/line{
@@ -33083,7 +32951,6 @@
"kmq" = (
/obj/effect/turf_decal/box/white,
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 2;
external_pressure_bound = 120;
name = "server vent"
},
@@ -33411,7 +33278,6 @@
dir = 4
},
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E"
},
/turf/open/floor/iron,
@@ -34093,9 +33959,7 @@
/area/ai_monitored/turret_protected/ai_upload)
"kDX" = (
/obj/effect/landmark/start/randommaint/magician,
-/obj/structure/chair/wood/normal{
- dir = 2
- },
+/obj/structure/chair/wood/normal,
/turf/open/floor/wood,
/area/crew_quarters/theatre)
"kEh" = (
@@ -34140,9 +34004,7 @@
/obj/structure/cable{
icon_state = "0-8"
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/turf/open/floor/engine{
initial_gas_mix = "n2=100;TEMP=80";
name = "mainframe floor"
@@ -34261,9 +34123,7 @@
dir = 1
},
/obj/effect/turf_decal/siding/wideplating/dark,
-/turf/open/floor/iron/dark/side{
- dir = 2
- },
+/turf/open/floor/iron/dark/side,
/area/hallway/primary/central)
"kIg" = (
/obj/item/soap/nanotrasen,
@@ -34627,7 +34487,6 @@
/area/space)
"kOt" = (
/obj/docking_port/stationary{
- dir = 1;
dwidth = 12;
height = 69;
id = "whiteship_home";
@@ -34807,8 +34666,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/structure/disposalpipe/segment{
dir = 1
@@ -35501,9 +35359,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -35584,8 +35440,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/effect/turf_decal/guideline/guideline_in/darkblue{
dir = 4
@@ -35696,9 +35551,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -36439,9 +36292,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow,
/turf/open/floor/wood,
/area/security/courtroom)
@@ -36791,10 +36642,6 @@
/turf/open/floor/iron,
/area/medical/apothecary)
"lxd" = (
-/obj/machinery/camera/autoname{
- dir = 2;
- network = list("ss13","rd")
- },
/obj/machinery/requests_console{
department = "Science";
departmentType = 2;
@@ -36802,6 +36649,10 @@
pixel_y = 30;
receive_ore_updates = 1
},
+/obj/machinery/camera/autoname{
+ dir = 2;
+ network = list("ss13","rd")
+ },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -37099,9 +36950,7 @@
/turf/open/floor/iron/dark,
/area/engine/atmos)
"lBL" = (
-/obj/effect/turf_decal/tile/dark_green{
- dir = 2
- },
+/obj/effect/turf_decal/tile/dark_green,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/reagent_dispensers/cooking_oil,
/turf/open/floor/iron,
@@ -37198,9 +37047,7 @@
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high/plus,
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/machinery/camera/autoname{
dir = 1;
network = list("ss13","engine")
@@ -37263,7 +37110,6 @@
id = "chapelgun"
},
/obj/machinery/door/window{
- dir = 2;
name = "Mass Driver";
req_access_txt = "22"
},
@@ -37865,7 +37711,6 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/start/assistant,
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E";
dir = 1
},
@@ -38583,12 +38428,10 @@
"mbI" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green{
- layer = 3;
pixel_x = -8;
pixel_y = 15
},
/obj/item/storage/secure/briefcase{
- layer = 3;
pixel_x = 2;
pixel_y = 8
},
@@ -38631,7 +38474,6 @@
dir = 4
},
/obj/machinery/door/airlock/virology/glass{
- id_tag = null;
name = "Virology Ward";
req_access_txt = "39"
},
@@ -39900,6 +39742,9 @@
pixel_x = 26;
pixel_y = -1
},
+/obj/machinery/chem_master/condimaster{
+ name = "CondiMaster Neo"
+ },
/turf/open/floor/iron/freezer,
/area/crew_quarters/kitchen/coldroom)
"mwM" = (
@@ -41193,7 +41038,6 @@
/obj/machinery/light/floor{
brightness = 15;
bulb_colour = "#FFE4CE";
- bulb_emergency_brightness_mul = 0.25;
bulb_vacuum_brightness = 15;
nightshift_brightness = 10;
nightshift_light_color = "#E6EBFF"
@@ -41291,19 +41135,6 @@
"mRV" = (
/turf/closed/wall/mineral/plastitanium,
/area/security/brig/medbay)
-"mSi" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/sign/warning/securearea{
- pixel_y = 30
- },
-/obj/machinery/camera/autoname{
- dir = 2;
- network = list("ss13","engine")
- },
-/turf/open/floor/iron/dark,
-/area/engine/engine_room)
"mSo" = (
/obj/structure/disposalpipe/segment{
dir = 9
@@ -41449,7 +41280,6 @@
icon_state = "2-4"
},
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E"
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
@@ -41493,6 +41323,16 @@
/obj/machinery/light_switch{
pixel_x = 21
},
+/obj/item/food/dough{
+ pixel_y = 1
+ },
+/obj/item/food/dough{
+ pixel_x = -4
+ },
+/obj/item/kitchen/rollingpin{
+ pixel_x = 3;
+ pixel_y = 5
+ },
/turf/open/floor/iron/white,
/area/crew_quarters/kitchen)
"mVA" = (
@@ -41573,7 +41413,6 @@
dir = 4
},
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E";
dir = 1
},
@@ -41763,7 +41602,6 @@
dir = 1
},
/obj/effect/turf_decal/guideline/guideline_tri/blue{
- color = "#52B4E9";
dir = 4
},
/obj/effect/turf_decal/guideline/guideline_edge_alt/blue,
@@ -42101,9 +41939,7 @@
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 8
},
-/obj/effect/turf_decal/guideline/guideline_in/blue{
- dir = 2
- },
+/obj/effect/turf_decal/guideline/guideline_in/blue,
/obj/machinery/light_switch{
pixel_x = 21;
pixel_y = -21
@@ -43183,8 +43019,7 @@
"nss" = (
/obj/effect/turf_decal/tile/dark_red/half/contrasted{
alpha = 180;
- color = "#DE3A3A";
- dir = 2
+ color = "#DE3A3A"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -43978,7 +43813,6 @@
/area/hallway/primary/fore)
"nDB" = (
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E"
},
/obj/effect/turf_decal/tile/dark_green/half/contrasted{
@@ -45324,8 +45158,7 @@
dir = 2
},
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/effect/turf_decal/guideline/guideline_in/darkblue{
dir = 4
@@ -46487,9 +46320,6 @@
name = "Security Viewing Hall"
})
"ovc" = (
-/obj/machinery/chem_master/condimaster{
- name = "CondiMaster Neo"
- },
/obj/machinery/light{
dir = 8
},
@@ -46497,6 +46327,7 @@
dir = 4
},
/obj/effect/turf_decal/bot,
+/obj/machinery/deepfryer,
/turf/open/floor/iron/white,
/area/crew_quarters/kitchen)
"ovj" = (
@@ -46679,9 +46510,7 @@
/area/medical/surgery)
"ozf" = (
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/effect/turf_decal/numbers/two_nine{
- dir = 2
- },
+/obj/effect/turf_decal/numbers/two_nine,
/obj/effect/turf_decal/box,
/turf/open/floor/iron,
/area/maintenance/port/aft)
@@ -47584,9 +47413,7 @@
/obj/effect/turf_decal/guideline/guideline_half_edge/blue{
dir = 10
},
-/obj/effect/turf_decal/guideline/guideline_tri/blue{
- color = "#52B4E9"
- },
+/obj/effect/turf_decal/guideline/guideline_tri/blue,
/obj/effect/turf_decal/guideline/guideline_edge_alt/blue{
dir = 8
},
@@ -47651,9 +47478,7 @@
},
/area/quartermaster/exploration_prep)
"oOw" = (
-/obj/machinery/power/emitter/welded{
- dir = 2
- },
+/obj/machinery/power/emitter/welded,
/obj/structure/cable/yellow,
/obj/structure/cable/yellow{
icon_state = "1-4"
@@ -48102,23 +47927,25 @@
/turf/open/floor/plating,
/area/engine/break_room)
"oVm" = (
-/obj/structure/table,
-/obj/item/food/dough{
- pixel_x = -4
- },
-/obj/item/food/dough{
- pixel_y = 1
- },
-/obj/item/kitchen/rollingpin{
- pixel_x = 3;
- pixel_y = 5
- },
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/light{
dir = 4
},
+/obj/structure/table,
+/obj/item/storage/box/ingredients/wildcard{
+ pixel_x = -5;
+ pixel_y = 8
+ },
+/obj/item/storage/box/ingredients/fruity{
+ pixel_x = 4;
+ pixel_y = 6
+ },
+/obj/item/storage/box/ingredients/vegetarian{
+ pixel_x = -1;
+ pixel_y = 4
+ },
/turf/open/floor/iron/white,
/area/crew_quarters/kitchen)
"oVx" = (
@@ -48954,8 +48781,7 @@
dir = 4
},
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/turf/open/floor/iron/dark/corner{
dir = 1
@@ -48997,8 +48823,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/structure/disposalpipe/segment{
dir = 1
@@ -49146,9 +48971,7 @@
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 8
},
-/obj/effect/turf_decal/guideline/guideline_in/blue{
- dir = 2
- },
+/obj/effect/turf_decal/guideline/guideline_in/blue,
/obj/machinery/light{
dir = 8
},
@@ -49469,9 +49292,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/structure/extinguisher_cabinet{
pixel_x = -8;
pixel_y = -30
@@ -49851,7 +49672,6 @@
/area/engine/atmos)
"pxJ" = (
/obj/machinery/door/window/brigdoor/northleft{
- dir = 1;
name = "Telecommunications";
req_access_txt = "49"
},
@@ -49864,7 +49684,6 @@
/obj/effect/turf_decal/tile/red/fourcorners/contrasted,
/mob/living/simple_animal/kalo{
desc = "The Perma brig's cute grass snake.";
- icon = 'icons/mob/animal.dmi';
icon_dead = "snake_dead";
icon_living = "snake";
icon_state = "snake";
@@ -49911,9 +49730,7 @@
"pzk" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable/yellow,
-/obj/structure/curtain/directional{
- dir = 2
- },
+/obj/structure/curtain/directional,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -50008,9 +49825,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/machinery/camera/autoname{
dir = 1;
pixel_x = 2
@@ -50107,9 +49922,7 @@
/turf/open/floor/iron/tech,
/area/engine/engine_room)
"pCi" = (
-/obj/effect/turf_decal/tile/dark_green{
- dir = 2
- },
+/obj/effect/turf_decal/tile/dark_green,
/turf/open/floor/iron,
/area/maintenance/central)
"pCu" = (
@@ -50284,9 +50097,7 @@
/obj/structure/cable/yellow{
icon_state = "0-4"
},
-/obj/structure/curtain/directional{
- dir = 2
- },
+/obj/structure/curtain/directional,
/turf/open/floor/plating,
/area/crew_quarters/heads/chief)
"pEZ" = (
@@ -50473,7 +50284,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/door/window/southleft{
- dir = 2;
name = "Engineering Delivery";
req_access_txt = "24"
},
@@ -50618,7 +50428,6 @@
/area/maintenance/department/medical)
"pJP" = (
/obj/effect/turf_decal/guideline/guideline_tri/blue{
- color = "#52B4E9";
dir = 8
},
/obj/structure/cable/yellow{
@@ -50777,7 +50586,6 @@
/obj/machinery/light/floor{
brightness = 15;
bulb_colour = "#FFE4CE";
- bulb_emergency_brightness_mul = 0.25;
bulb_vacuum_brightness = 15;
nightshift_brightness = 10;
nightshift_light_color = "#E6EBFF"
@@ -51482,7 +51290,6 @@
},
/obj/machinery/recharge_station,
/obj/machinery/camera/autoname{
- dir = 2;
network = list("ss13","rd")
},
/obj/effect/landmark/start/cyborg,
@@ -51608,8 +51415,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/effect/turf_decal/guideline/guideline_in/darkblue{
dir = 4
@@ -51652,7 +51458,6 @@
dir = 4
},
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E"
},
/obj/machinery/navbeacon{
@@ -51912,9 +51717,7 @@
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 8
},
-/obj/effect/turf_decal/guideline/guideline_in/blue{
- dir = 2
- },
+/obj/effect/turf_decal/guideline/guideline_in/blue,
/turf/open/floor/iron/white,
/area/medical/medbay/lobby)
"qcz" = (
@@ -51926,8 +51729,7 @@
icon_state = "4-8"
},
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/structure/disposalpipe/segment{
dir = 1
@@ -51951,8 +51753,7 @@
/area/hallway/secondary/exit/departure_lounge)
"qcH" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/structure/closet/secure_closet/engineering_personal,
/obj/effect/turf_decal/bot,
@@ -52021,7 +51822,6 @@
dir = 1
},
/obj/effect/turf_decal/guideline/guideline_tri/blue{
- color = "#52B4E9";
dir = 4
},
/obj/effect/turf_decal/guideline/guideline_edge_alt/blue,
@@ -52796,8 +52596,7 @@
dir = 2
},
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/effect/turf_decal/guideline/guideline_half_in/darkblue{
@@ -52933,9 +52732,7 @@
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 8
},
-/obj/effect/turf_decal/guideline/guideline_in/blue{
- dir = 2
- },
+/obj/effect/turf_decal/guideline/guideline_in/blue,
/turf/open/floor/iron/white,
/area/medical/medbay/lobby)
"quK" = (
@@ -53040,7 +52837,6 @@
dir = 10
},
/obj/machinery/camera/autoname{
- dir = 2;
view_range = 12
},
/obj/effect/turf_decal/siding/wideplating/dark/corner{
@@ -53376,7 +53172,6 @@
dir = 4
},
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E"
},
/turf/open/floor/iron,
@@ -53418,8 +53213,7 @@
/area/science/mixing)
"qCQ" = (
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/effect/landmark/start/cyborg,
/turf/open/floor/iron,
@@ -53519,7 +53313,6 @@
dir = 4
},
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E"
},
/turf/open/floor/iron,
@@ -53621,7 +53414,6 @@
"qGM" = (
/obj/effect/turf_decal/tile/green/fourcorners/contrasted,
/obj/machinery/door/airlock/virology/glass{
- id_tag = null;
name = "Virology Ward";
req_access_txt = "39"
},
@@ -54172,8 +53964,7 @@
dir = 1
},
/obj/effect/turf_decal/tile/yellow/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron,
@@ -54366,7 +54157,6 @@
dir = 5
},
/obj/effect/turf_decal/guideline/guideline_tri/_corner/blue{
- color = "#52B4E9";
dir = 1
},
/turf/open/floor/iron/white,
@@ -54657,7 +54447,6 @@
icon_state = "4-8"
},
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E"
},
/turf/open/floor/iron,
@@ -54706,7 +54495,6 @@
/area/engine/engine_room)
"qYz" = (
/obj/machinery/camera/autoname{
- dir = 2;
network = list("ss13","rd")
},
/obj/structure/disposalpipe/segment{
@@ -54796,7 +54584,6 @@
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical{
- id_tag = null;
name = "Medbay";
req_one_access_txt = "5"
},
@@ -54912,7 +54699,6 @@
dir = 8
},
/obj/effect/turf_decal/guideline/guideline_tri/_corner/blue{
- color = "#52B4E9";
dir = 8
},
/turf/open/floor/iron/white,
@@ -55068,9 +54854,7 @@
/turf/open/floor/iron/white,
/area/medical/sleeper)
"res" = (
-/obj/machinery/computer/operating{
- dir = 2
- },
+/obj/machinery/computer/operating,
/turf/open/floor/iron/white,
/area/science/robotics)
"rev" = (
@@ -55798,9 +55582,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
-/obj/effect/turf_decal/tile/dark_green{
- dir = 2
- },
+/obj/effect/turf_decal/tile/dark_green,
/turf/open/floor/iron,
/area/hallway/secondary/service)
"rqR" = (
@@ -56467,17 +56249,6 @@
/obj/structure/table/wood/fancy,
/turf/open/floor/carpet/grimy,
/area/chapel/office)
-"rCc" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 2
- },
-/area/hallway/primary/central)
"rCn" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -56523,7 +56294,6 @@
dir = 4
},
/obj/machinery/camera/autoname{
- dir = 2;
network = list("ss13","security")
},
/obj/machinery/power/apc/auto_name/east,
@@ -56817,9 +56587,7 @@
/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{
alpha = 180
},
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/structure/extinguisher_cabinet{
pixel_x = 27;
pixel_y = -1
@@ -56828,8 +56596,7 @@
/area/ai_monitored/turret_protected/aisat/foyer)
"rHP" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 10
@@ -56986,9 +56753,7 @@
/turf/open/floor/carpet/blue,
/area/medical/exam_room)
"rKH" = (
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/machinery/computer/med_data{
dir = 1
},
@@ -57139,8 +56904,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/structure/disposalpipe/segment{
dir = 1
@@ -57814,7 +57578,6 @@
/area/maintenance/port/aft)
"rZQ" = (
/obj/machinery/camera/autoname{
- c_tag = null;
dir = 4;
network = list("ss13","medbay");
view_range = 8
@@ -59557,8 +59320,7 @@
dir = 8
},
/obj/machinery/camera/preset/toxins{
- dir = 4;
- network = list("rd","toxins")
+ dir = 4
},
/turf/open/floor/plating/airless,
/area/science/test_area)
@@ -59793,8 +59555,7 @@
"sIW" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/structure/disposalpipe/segment{
dir = 1
@@ -60379,8 +60140,7 @@
/obj/structure/chair/office,
/obj/effect/turf_decal/tile/dark_red/half/contrasted{
alpha = 180;
- color = "#DE3A3A";
- dir = 2
+ color = "#DE3A3A"
},
/obj/machinery/newscaster{
pixel_x = 32;
@@ -60945,9 +60705,7 @@
/turf/closed/wall/r_wall,
/area/security/warden)
"taL" = (
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/structure/table/reinforced,
/obj/item/stack/sheet/iron/fifty{
pixel_x = -2;
@@ -61118,7 +60876,6 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E"
},
/turf/open/floor/iron,
@@ -61234,9 +60991,7 @@
pixel_y = -33
},
/obj/machinery/disposal/bin,
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/effect/turf_decal/tile/purple/anticorner/contrasted,
/obj/effect/turf_decal/bot,
/obj/structure/disposalpipe/trunk{
@@ -61822,7 +61577,6 @@
/obj/machinery/light/floor{
brightness = 15;
bulb_colour = "#FFE4CE";
- bulb_emergency_brightness_mul = 0.25;
bulb_vacuum_brightness = 15;
nightshift_brightness = 10;
nightshift_light_color = "#E6EBFF"
@@ -62043,9 +61797,7 @@
},
/area/hallway/secondary/exit/departure_lounge)
"tpM" = (
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
@@ -62670,9 +62422,7 @@
/area/medical/medbay/lobby)
"tyE" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -63298,7 +63048,6 @@
"tIJ" = (
/obj/structure/table/wood,
/obj/item/toy/plush/moth/luna{
- layer = 3;
pixel_x = -18;
pixel_y = 16
},
@@ -63330,8 +63079,7 @@
"tIT" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/structure/disposalpipe/segment{
dir = 1
@@ -63958,9 +63706,7 @@
/area/engine/atmos)
"tTZ" = (
/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/curtain/directional{
- dir = 2
- },
+/obj/structure/curtain/directional,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -64283,9 +64029,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/guideline/guideline_edge/purple,
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/turf/open/floor/iron/white/side{
dir = 1
},
@@ -65179,9 +64923,7 @@
/area/hallway/primary/port)
"umA" = (
/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/curtain/directional{
- dir = 2
- },
+/obj/structure/curtain/directional,
/turf/open/floor/plating,
/area/crew_quarters/dorms)
"umL" = (
@@ -65253,9 +64995,7 @@
/obj/structure/cable/yellow{
icon_state = "0-4"
},
-/obj/structure/curtain/directional{
- dir = 2
- },
+/obj/structure/curtain/directional,
/turf/open/floor/plating,
/area/security/courtroom)
"uog" = (
@@ -65379,9 +65119,7 @@
/area/crew_quarters/dorms)
"upL" = (
/obj/structure/table/reinforced,
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/item/aicard,
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat_interior)
@@ -65704,7 +65442,6 @@
"uvp" = (
/obj/effect/turf_decal/tile/bar/opposingcorners,
/obj/machinery/camera/autoname{
- c_tag = null;
dir = 8;
network = list("ss13","medbay");
view_range = 8
@@ -65826,7 +65563,6 @@
/area/maintenance/department/medical/morgue)
"uxt" = (
/obj/machinery/camera/autoname{
- c_tag = null;
dir = 8;
network = list("ss13","medbay")
},
@@ -66162,9 +65898,7 @@
/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
dir = 4
},
-/obj/machinery/camera/autoname{
- dir = 2
- },
+/obj/machinery/camera/autoname,
/obj/vehicle/ridden/janicart,
/obj/item/key/janitor,
/turf/open/floor/iron,
@@ -66306,7 +66040,6 @@
dir = 8
},
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E"
},
/turf/open/floor/iron,
@@ -67307,9 +67040,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
-/obj/effect/turf_decal/tile/dark_green{
- dir = 2
- },
+/obj/effect/turf_decal/tile/dark_green,
/turf/open/floor/iron,
/area/maintenance/central)
"uWe" = (
@@ -67414,8 +67145,7 @@
icon_state = "4-8"
},
/obj/effect/turf_decal/guideline/guideline_in/neutral{
- alpha = 255;
- dir = 2
+ alpha = 255
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -67475,15 +67205,12 @@
/turf/open/floor/plating/rust,
/area/maintenance/starboard/aft)
"uXH" = (
-/obj/machinery/computer/operating{
- dir = 2
- },
+/obj/machinery/computer/operating,
/obj/effect/turf_decal/bot,
/obj/machinery/newscaster{
pixel_y = 34
},
/obj/machinery/camera/autoname{
- dir = 2;
network = list("ss13","medbay")
},
/turf/open/floor/iron,
@@ -67674,7 +67401,6 @@
"vat" = (
/obj/structure/bookcase/random/fiction,
/obj/machinery/airalarm{
- dir = 2;
pixel_y = 28
},
/turf/open/floor/wood,
@@ -67860,9 +67586,7 @@
/turf/open/floor/carpet/purple,
/area/chapel/main)
"vdz" = (
-/obj/effect/turf_decal/numbers/two_nine{
- dir = 2
- },
+/obj/effect/turf_decal/numbers/two_nine,
/turf/open/floor/iron/grid/steel,
/area/medical/virology)
"vdH" = (
@@ -68188,22 +67912,10 @@
/turf/open/floor/iron/white,
/area/medical/medbay/central)
"vjD" = (
-/obj/structure/table,
-/obj/item/storage/box/ingredients/wildcard{
- pixel_x = -5;
- pixel_y = 8
- },
-/obj/item/storage/box/ingredients/fruity{
- pixel_x = 4;
- pixel_y = 6
- },
-/obj/item/storage/box/ingredients/vegetarian{
- pixel_x = -1;
- pixel_y = 4
- },
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/machinery/griddle,
/turf/open/floor/iron/white,
/area/crew_quarters/kitchen)
"vjG" = (
@@ -68409,7 +68121,6 @@
/area/engine/atmospherics_engine)
"vma" = (
/obj/machinery/camera/autoname{
- c_tag = null;
dir = 4;
network = list("ss13","medbay")
},
@@ -68486,9 +68197,7 @@
/area/maintenance/department/medical)
"vnI" = (
/obj/effect/turf_decal/bot,
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/effect/turf_decal/tile/blue/fourcorners/contrasted,
/obj/structure/cable/yellow,
/obj/item/kirbyplants/random,
@@ -68547,8 +68256,7 @@
icon_state = "4-8"
},
/obj/effect/turf_decal/guideline/guideline_in/neutral{
- alpha = 255;
- dir = 2
+ alpha = 255
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -68631,9 +68339,7 @@
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 8
},
-/obj/effect/turf_decal/guideline/guideline_in/blue{
- dir = 2
- },
+/obj/effect/turf_decal/guideline/guideline_in/blue,
/turf/open/floor/iron/white,
/area/medical/medbay/lobby)
"vqq" = (
@@ -68651,9 +68357,7 @@
/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{
alpha = 180
},
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/structure/extinguisher_cabinet{
pixel_x = -26;
pixel_y = -1
@@ -68860,7 +68564,6 @@
},
/obj/machinery/door/window/northright{
dir = 2;
- icon_state = "right";
name = "Engi Desk";
req_one_access_txt = "32;19"
},
@@ -68912,11 +68615,9 @@
dir = 1
},
/obj/machinery/camera/autoname{
- dir = 2;
network = list("ss13","medbay")
},
/obj/machinery/airalarm{
- dir = 2;
pixel_y = 28
},
/obj/structure/cable/yellow{
@@ -69111,8 +68812,8 @@
/turf/open/floor/iron/dark,
/area/science/misc_lab/range)
"vzi" = (
-/obj/machinery/deepfryer,
-/obj/effect/turf_decal/bot,
+/obj/structure/table,
+/obj/item/knife/kitchen,
/turf/open/floor/iron/white,
/area/crew_quarters/kitchen)
"vzm" = (
@@ -69168,7 +68869,6 @@
/obj/machinery/light/floor{
brightness = 15;
bulb_colour = "#FFE4CE";
- bulb_emergency_brightness_mul = 0.25;
bulb_vacuum_brightness = 15;
nightshift_brightness = 10;
nightshift_light_color = "#E6EBFF"
@@ -69295,7 +68995,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/turf_decal/guideline/guideline_tri/blue{
- color = "#52B4E9";
dir = 1
},
/obj/structure/cable/yellow{
@@ -69797,9 +69496,7 @@
/area/construction/mining/aux_base)
"vJG" = (
/obj/structure/lattice/catwalk,
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/machinery/porta_turret/ai{
dir = 4
},
@@ -69857,8 +69554,7 @@
dir = 4
},
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 8
@@ -70631,14 +70327,6 @@
/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted,
/mob/living/simple_animal/hostile/retaliate/frog{
attacked_sound = 'sound/effects/huuu.ogg';
- density = 0;
- desc = "It seems a little sad.";
- head_icon = 'icons/mob/pets_held.dmi';
- held_state = "";
- icon = 'icons/mob/animal.dmi';
- icon_dead = "frog_dead";
- icon_living = "frog";
- icon_state = "frog";
name = "Larry";
pixel_y = 12;
stepped_sound = null
@@ -70932,9 +70620,7 @@
/turf/open/floor/iron,
/area/maintenance/department/medical)
"wcw" = (
-/obj/machinery/power/emitter/welded{
- dir = 2
- },
+/obj/machinery/power/emitter/welded,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
@@ -71205,9 +70891,7 @@
/turf/open/floor/plating,
/area/maintenance/port/central)
"wgp" = (
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/machinery/light{
dir = 4
},
@@ -71432,7 +71116,6 @@
},
/obj/machinery/firealarm/directional/west,
/obj/machinery/camera/autoname{
- c_tag = null;
dir = 4;
network = list("ss13","medbay");
view_range = 8
@@ -71936,7 +71619,6 @@
name = "Toxins Storage";
pixel_x = -1;
pixel_y = -29;
- req_access = null;
req_access_txt = "49"
},
/obj/structure/cable/yellow{
@@ -72049,9 +71731,7 @@
/obj/structure/chair/fancy/bench/pew/right{
dir = 8
},
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/turf/open/floor/iron/dark,
/area/chapel/main)
"wyu" = (
@@ -72099,9 +71779,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/iron/dark/side{
- dir = 2
- },
+/turf/open/floor/iron/dark/side,
/area/hallway/primary/central)
"wzs" = (
/obj/machinery/door/firedoor,
@@ -73151,7 +72829,6 @@
dir = 4
},
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E"
},
/obj/structure/cable/yellow{
@@ -73261,9 +72938,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 1
},
-/obj/structure/chair/wood/normal{
- dir = 2
- },
+/obj/structure/chair/wood/normal,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -73861,9 +73536,7 @@
/turf/open/floor/iron,
/area/hallway/primary/starboard)
"xcR" = (
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
},
@@ -74000,7 +73673,6 @@
broadcasting = 1;
canhear_range = 6;
dir = 8;
- listening = 1;
name = "Station Intercom (Court)"
},
/turf/open/floor/wood,
@@ -74286,7 +73958,6 @@
broadcasting = 1;
canhear_range = 6;
dir = 8;
- listening = 1;
name = "Station Intercom (Court)"
},
/obj/machinery/firealarm/directional/west,
@@ -74502,8 +74173,7 @@
icon_state = "4-8"
},
/obj/effect/turf_decal/guideline/guideline_in/neutral{
- alpha = 255;
- dir = 2
+ alpha = 255
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -75043,7 +74713,6 @@
/obj/machinery/light/floor{
brightness = 15;
bulb_colour = "#FFE4CE";
- bulb_emergency_brightness_mul = 0.25;
bulb_vacuum_brightness = 15;
nightshift_brightness = 10;
nightshift_light_color = "#E6EBFF"
@@ -75249,15 +74918,12 @@
/area/maintenance/port/aft)
"xwZ" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/structure/closet/secure_closet/engineering_electrical,
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/structure/cable/yellow,
/turf/open/floor/iron,
/area/engine/storage)
@@ -75412,9 +75078,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 6
},
-/obj/machinery/light{
- dir = 2
- },
+/obj/machinery/light,
/obj/effect/decal/cleanable/shreds,
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/dark,
@@ -76053,8 +75717,7 @@
/area/medical/chemistry)
"xII" = (
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
- alpha = 180;
- dir = 2
+ alpha = 180
},
/obj/structure/disposalpipe/segment{
dir = 2
@@ -76783,9 +76446,7 @@
/turf/open/floor/iron,
/area/science/lobby)
"xXE" = (
-/obj/machinery/power/apc/auto_name/east{
- pixel_x = 24
- },
+/obj/machinery/power/apc/auto_name/east,
/obj/machinery/camera/autoname{
dir = 1
},
@@ -77586,7 +77247,6 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/guideline/guideline_in/green{
- alpha = 180;
color = "#439C1E";
dir = 1
},
@@ -108641,7 +108301,7 @@ seT
seT
hdp
hdp
-rCc
+xgv
fWh
vAx
hVF
@@ -109237,7 +108897,7 @@ oOn
lbK
poW
mKJ
-mSi
+lnr
rVX
hvL
pBG
diff --git a/beestation.dme b/beestation.dme
index b86c3efe5a82b..af63ade8de2d1 100644
--- a/beestation.dme
+++ b/beestation.dme
@@ -634,6 +634,7 @@
#include "code\datums\components\force_move.dm"
#include "code\datums\components\forensics.dm"
#include "code\datums\components\gps.dm"
+#include "code\datums\components\grillable.dm"
#include "code\datums\components\gravity_aura.dm"
#include "code\datums\components\haircolor_clothes.dm"
#include "code\datums\components\heirloom.dm"
@@ -2618,6 +2619,7 @@
#include "code\modules\food_and_drinks\kitchen_machinery\deep_fryer.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\food_cart.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\gibber.dm"
+#include "code\modules\food_and_drinks\kitchen_machinery\griddle.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\grill.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\icecream_vat.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\microwave.dm"
diff --git a/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_food.dm b/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_food.dm
index 534f5a6629662..8e134d4828e8f 100644
--- a/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_food.dm
+++ b/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_food.dm
@@ -27,6 +27,20 @@
///called on item when created through microwaving (): (obj/machinery/microwave/M, cooking_efficiency)
#define COMSIG_ITEM_MICROWAVE_COOKED "microwave_cooked"
+// Grilling foods (griddle, grill, and bonfire)
+///Called when an object is placed onto a griddle
+#define COMSIG_ITEM_GRILL_PLACED "item_placed_on_griddle"
+///Called when an object is grilled ontop of a griddle
+#define COMSIG_ITEM_GRILL_PROCESS "item_griddled"
+ /// Return to not burn the item
+ #define COMPONENT_HANDLED_GRILLING (1<<0)
+///Called when an object is turned into another item through grilling ontop of a griddle
+#define COMSIG_ITEM_GRILLED "item_grill_completed"
+
+#define COMSIG_GRILL_COMPLETED "grill_completed"
+///Called when an object is meant to be grilled through a grill: (atom/fry_object, grill_time)
+#define COMSIG_GRILL_FOOD "item_grill_food"
+
///From /datum/component/edible/on_compost(source, /mob/living/user)
#define COMSIG_EDIBLE_ON_COMPOST "on_compost"
// Used to stop food from being composted.
diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm
index 11b5ae5dc21f4..16c3f336cb821 100644
--- a/code/__DEFINES/flags.dm
+++ b/code/__DEFINES/flags.dm
@@ -26,19 +26,34 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
#define DF_VAR_EDITED (1<<1)
#define DF_ISPROCESSING (1<<2)
-//! ## FLAGS BITMASK
-#define CONDUCT_1 (1<<5) //! conducts electricity (iron etc.)
-#define NODECONSTRUCT_1 (1<<7) //! For machines and structures that should not break into parts, eg, holodeck stuff
-#define OVERLAY_QUEUED_1 (1<<8) //! atom queued to SSoverlay
-#define ON_BORDER_1 (1<<9) //! item has priority to check when entering or leaving
-#define PREVENT_CLICK_UNDER_1 (1<<11) //! Prevent clicking things below it on the same turf eg. doors/ fulltile windows
-#define HOLOGRAM_1 (1<<12)
-#define TESLA_IGNORE_1 (1<<13) //! TESLA_IGNORE grants immunity from being targeted by tesla-style electricity
-#define INITIALIZED_1 (1<<14) //! Whether /atom/Initialize(mapload) has already run for the object
-#define ADMIN_SPAWNED_1 (1<<15) //! was this spawned by an admin? used for stat tracking stuff.
-#define PREVENT_CONTENTS_EXPLOSION_1 (1<<16)
-#define UNPAINTABLE_1 (1<<17)
-#define HTML_USE_INITAL_ICON_1 (1<<18) //! Should we use the initial icon for display? Mostly used by overlay only objects
+//FLAGS BITMASK
+
+/// conducts electricity (iron etc.)
+#define CONDUCT_1 (1<<1)
+/// For machines and structures that should not break into parts, eg, holodeck stuff
+#define NODECONSTRUCT_1 (1<<2)
+/// atom queued to SSoverlay
+#define OVERLAY_QUEUED_1 (1<<3)
+/// item has priority to check when entering or leaving
+#define ON_BORDER_1 (1<<4)
+/// Prevent clicking things below it on the same turf eg. doors/ fulltile windows
+#define PREVENT_CLICK_UNDER_1 (1<<5)
+///specifies that this atom is a hologram that isnt real
+#define HOLOGRAM_1 (1<<6)
+/// grants immunity from being targeted by tesla-style electricity
+#define TESLA_IGNORE_1 (1<<7)
+///Whether /atom/Initialize() has already run for the object
+#define INITIALIZED_1 (1<<8)
+/// was this spawned by an admin? used for stat tracking stuff.
+#define ADMIN_SPAWNED_1 (1<<9)
+/// should not get harmed if this gets caught by an explosion?
+#define PREVENT_CONTENTS_EXPLOSION_1 (1<<10)
+/// Should this object be unpaintable?
+#define UNPAINTABLE_1 (1<<11)
+/// Is this atom on top of another atom, and as such has click priority?
+#define IS_ONTOP_1 (1<<12)
+/// Should we use the initial icon for display? Mostly used by overlay only objects
+#define HTML_USE_INITAL_ICON_1 (1<<13)
// Update flags for [/atom/proc/update_appearance]
/// Update the atom's name
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 9c1d53535056c..f25247793a6cf 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -192,7 +192,7 @@
for(var/atom/target in checking) // will filter out nulls
if(closed[target] || isarea(target)) // avoid infinity situations
continue
- if(isturf(target) || isturf(target.loc) || (target in direct_access)) //Directly accessible atoms
+ if(isturf(target) || isturf(target.loc) || (target in direct_access) || (isobj(target) && target.flags_1 & IS_ONTOP_1)) //Directly accessible atoms
if(Adjacent(target) || (tool && CheckToolReach(src, target, tool.reach))) //Adjacent or reaching attacks
return TRUE
diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm
index 32f03b53d12b7..40f394ba83afc 100644
--- a/code/datums/components/food/edible.dm
+++ b/code/datums/components/food/edible.dm
@@ -82,6 +82,7 @@ Behavior that's still missing from this component that original food items had t
if(isitem(parent))
RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(use_from_hand))
+ RegisterSignal(parent, COMSIG_GRILL_FOOD, PROC_REF(GrillFood))
RegisterSignal(parent, COMSIG_ITEM_MICROWAVE_ACT, PROC_REF(on_microwaved))
RegisterSignal(parent, COMSIG_ITEM_USED_AS_INGREDIENT, PROC_REF(used_to_customize))
@@ -173,6 +174,28 @@ Behavior that's still missing from this component that original food items had t
return TryToEat(M, user)
+/datum/component/edible/proc/GrillFood(datum/source, atom/fry_object, grill_time)
+ SIGNAL_HANDLER
+
+ var/atom/this_food = parent
+
+ switch(grill_time) //no 0-20 to prevent spam
+ if(20 to 30)
+ this_food.name = "lightly-grilled [this_food.name]"
+ this_food.desc = "[this_food.desc] It's been lightly grilled."
+ if(30 to 80)
+ this_food.name = "grilled [this_food.name]"
+ this_food.desc = "[this_food.desc] It's been grilled."
+ foodtypes |= FRIED
+ if(80 to 100)
+ this_food.name = "heavily grilled [this_food.name]"
+ this_food.desc = "[this_food.desc] It's been heavily grilled."
+ foodtypes |= FRIED
+ if(100 to INFINITY) //grill marks reach max alpha
+ this_food.name = "Powerfully Grilled [this_food.name]"
+ this_food.desc = "A [this_food.name]. Reminds you of your wife, wait, no, it's prettier!"
+ foodtypes |= FRIED
+
///Called when food is created through processing (Usually this means it was sliced). We use this to pass the OG items reagents.
/datum/component/edible/proc/on_processed(datum/source, atom/original_atom, list/chosen_processing_option)
SIGNAL_HANDLER
diff --git a/code/datums/components/grillable.dm b/code/datums/components/grillable.dm
new file mode 100644
index 0000000000000..cb1f25e30c3d1
--- /dev/null
+++ b/code/datums/components/grillable.dm
@@ -0,0 +1,91 @@
+/datum/component/grillable
+ ///Result atom type of grilling this object
+ var/atom/cook_result
+ ///Amount of time required to cook the food
+ var/required_cook_time = 2 MINUTES
+ ///Is this a positive grill result?
+ var/positive_result = TRUE
+
+ ///Time spent cooking so far
+ var/current_cook_time = 0
+
+ ///Are we currently grilling?
+ var/currently_grilling = FALSE
+
+ ///Do we use the large steam sprite?
+ var/use_large_steam_sprite = FALSE
+
+/datum/component/grillable/Initialize(cook_result, required_cook_time, positive_result, use_large_steam_sprite)
+ . = ..()
+ if(!isitem(parent)) //Only items support grilling at the moment
+ return COMPONENT_INCOMPATIBLE
+
+ src.cook_result = cook_result
+ src.required_cook_time = required_cook_time
+ src.positive_result = positive_result
+ src.use_large_steam_sprite = use_large_steam_sprite
+
+ RegisterSignal(parent, COMSIG_ITEM_GRILLED, PROC_REF(OnGrill))
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(OnExamine))
+
+///Ran every time an item is grilled by something
+/datum/component/grillable/proc/OnGrill(datum/source, atom/used_grill, delta_time = 1)
+ SIGNAL_HANDLER
+
+ . = COMPONENT_HANDLED_GRILLING
+
+ current_cook_time += delta_time * 10 //turn it into ds
+ if(current_cook_time >= required_cook_time)
+ FinishGrilling(used_grill)
+ else if(!currently_grilling) //We havn't started grilling yet
+ StartGrilling(used_grill)
+
+
+///Ran when an object starts grilling on something
+/datum/component/grillable/proc/StartGrilling(atom/grill_source)
+ currently_grilling = TRUE
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(OnMoved))
+ RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(AddGrilledItemOverlay))
+
+ var/atom/A = parent
+ A.update_appearance()
+
+///Ran when an object finished grilling
+/datum/component/grillable/proc/FinishGrilling(atom/grill_source)
+ var/atom/original_object = parent
+ var/atom/grilled_result = new cook_result(original_object.loc)
+
+ grilled_result.pixel_x = original_object.pixel_x
+ grilled_result.pixel_y = original_object.pixel_y
+
+ grill_source.visible_message("[parent] turns into \a [grilled_result]!")
+ SEND_SIGNAL(parent, COMSIG_GRILL_COMPLETED, grilled_result)
+ currently_grilling = FALSE
+ qdel(parent)
+
+///Ran when an object almost finishes grilling
+/datum/component/grillable/proc/OnExamine(atom/A, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+ if(!current_cook_time) //Not grilled yet
+ return
+
+ if(positive_result)
+ if(current_cook_time <= required_cook_time * 0.75)
+ examine_list += "[parent] probably needs to be cooked a bit longer!"
+ else if(current_cook_time <= required_cook_time)
+ examine_list += "[parent] seems to be almost finished cooking!"
+ else
+ examine_list += "[parent] should probably not be put on the grill"
+
+///Ran when an object moves from the grill
+/datum/component/grillable/proc/OnMoved(atom/A, atom/OldLoc, Dir, Forced)
+ SIGNAL_HANDLER
+ currently_grilling = FALSE
+ UnregisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS)
+ UnregisterSignal(parent, COMSIG_MOVABLE_MOVED)
+ A.update_appearance()
+
+/datum/component/grillable/proc/AddGrilledItemOverlay(datum/source, list/overlays)
+ SIGNAL_HANDLER
+
+ overlays += mutable_appearance('icons/effects/steam.dmi', "[use_large_steam_sprite ? "steam_triple" : "steam_single"]", ABOVE_OBJ_LAYER)
diff --git a/code/datums/looping_sounds/machinery_sounds.dm b/code/datums/looping_sounds/machinery_sounds.dm
index be22022823965..24224a15f0ba1 100644
--- a/code/datums/looping_sounds/machinery_sounds.dm
+++ b/code/datums/looping_sounds/machinery_sounds.dm
@@ -41,6 +41,13 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/datum/looping_sound/grill
+ mid_sounds = list('sound/machines/grill/grillsizzle.ogg' = 1)
+ mid_length = 18
+ volume = 50
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/datum/looping_sound/deep_fryer
mid_length = 2
mid_sounds = list('sound/machines/fryer/deep_fryer_1.ogg' = 1, 'sound/machines/fryer/deep_fryer_2.ogg' = 1)
volume = 30
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index c976427405fe9..c3e84332b5b42 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -1057,6 +1057,13 @@
req_components = list(/obj/item/stock_parts/micro_laser = 1)
needs_anchored = FALSE
+/obj/item/circuitboard/machine/griddle
+ name = "circuit board (Griddle)"
+ icon_state = "service"
+ build_path = /obj/machinery/griddle
+ req_components = list(/obj/item/stock_parts/micro_laser = 1)
+ needs_anchored = FALSE
+
/obj/item/circuitboard/machine/dish_drive
name = "dish drive (Machine Board)"
icon_state = "service"
diff --git a/code/game/objects/items/food/_food.dm b/code/game/objects/items/food/_food.dm
index 35f6278449f9c..7e12b97e6cb38 100644
--- a/code/game/objects/items/food/_food.dm
+++ b/code/game/objects/items/food/_food.dm
@@ -48,6 +48,7 @@
make_edible()
make_processable()
make_leave_trash()
+ make_grillable()
///This proc adds the edible component, overwrite this if you for some reason want to change some specific args like callbacks.
/obj/item/food/proc/make_edible()
@@ -68,6 +69,11 @@
/obj/item/food/proc/make_processable()
return
+///This proc handles grillable components, overwrite if you want different grill results etc.
+/obj/item/food/proc/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/badrecipe, rand(20 SECONDS, 30 SECONDS), FALSE)
+ return
+
///This proc handles trash components, overwrite this if you want the object to spawn trash
/obj/item/food/proc/make_leave_trash()
if(trash_type)
diff --git a/code/game/objects/items/food/meatdish.dm b/code/game/objects/items/food/meatdish.dm
index 069b37e1c2f2b..88ed34df18b6b 100644
--- a/code/game/objects/items/food/meatdish.dm
+++ b/code/game/objects/items/food/meatdish.dm
@@ -130,6 +130,9 @@
foodtypes = MEAT | TOXIC
w_class = WEIGHT_CLASS_SMALL
+/obj/item/food/spiderleg/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/boiledspiderleg, rand(50 SECONDS, 60 SECONDS), TRUE, TRUE)
+
/obj/item/food/cornedbeef
name = "corned beef and cabbage"
desc = "Now you can feel like a real tourist vacationing in Ireland."
@@ -158,20 +161,168 @@
foodtypes = MEAT | ALCOHOL
w_class = WEIGHT_CLASS_SMALL
+//Raw
+
+/obj/item/food/raw_meatball
+ name = "raw meatball"
+ desc = "A great meal all round. Not a cord of wood. Kinda raw"
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "raw_meatball"
+ food_reagents = list(/datum/reagent/consumable/nutriment/protein = 2)
+ tastes = list("meat" = 1)
+ foodtypes = MEAT | RAW
+ w_class = WEIGHT_CLASS_SMALL
+ var/meatball_type = /obj/item/food/meatball
+ var/patty_type = /obj/item/food/raw_patty
+
+/obj/item/food/raw_meatball/make_grillable()
+ AddComponent(/datum/component/grillable, meatball_type, rand(30 SECONDS, 40 SECONDS), TRUE)
+
+/obj/item/food/raw_meatball/make_processable()
+ AddElement(/datum/element/processable, TOOL_ROLLINGPIN, patty_type, 1, 20)
+
+/obj/item/food/raw_meatball/human
+ name = "strange raw meatball"
+ meatball_type = /obj/item/food/meatball/human
+ patty_type = /obj/item/food/raw_patty/human
+
+/obj/item/food/raw_meatball/corgi
+ name = "raw corgi meatball"
+ meatball_type = /obj/item/food/meatball/corgi
+ patty_type = /obj/item/food/raw_patty/corgi
+
+/obj/item/food/raw_meatball/xeno
+ name = "raw xeno meatball"
+ meatball_type = /obj/item/food/meatball/xeno
+ patty_type = /obj/item/food/raw_patty/xeno
+
+/obj/item/food/raw_meatball/bear
+ name = "raw bear meatball"
+ meatball_type = /obj/item/food/meatball/bear
+ patty_type = /obj/item/food/raw_patty/bear
+
+/obj/item/food/raw_meatball/chicken
+ name = "raw chicken meatball"
+ meatball_type = /obj/item/food/meatball/chicken
+ patty_type = /obj/item/food/raw_patty/chicken
+
+//Cooked
+
/obj/item/food/meatball
name = "meatball"
desc = "A great meal all round. Not a cord of wood."
icon = 'icons/obj/food/meat.dmi'
icon_state = "meatball"
food_reagents = list(
- /datum/reagent/consumable/nutriment/protein = 2,
- /datum/reagent/consumable/nutriment = 3,
+ /datum/reagent/consumable/nutriment/protein = 2
)
tastes = list("meat" = 1)
foodtypes = MEAT
food_flags = FOOD_FINGER_FOOD
w_class = WEIGHT_CLASS_SMALL
+/obj/item/food/meatball/human
+ name = "strange meatball"
+
+/obj/item/food/meatball/corgi
+ name = "corgi meatball"
+
+/obj/item/food/meatball/bear
+ name = "bear meatball"
+ tastes = list("meat" = 1, "salmon" = 1)
+
+/obj/item/food/meatball/xeno
+ name = "xenomorph meatball"
+ tastes = list("meat" = 1, "acid" = 1)
+
+/obj/item/food/meatball/chicken
+ name = "chicken meatball"
+ tastes = list("chicken" = 1)
+ icon_state = "chicken_meatball"
+
+/obj/item/food/raw_patty
+ name = "raw patty"
+ desc = "I'm.....NOT REAAADDYY."
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "raw_patty"
+ food_reagents = list(/datum/reagent/consumable/nutriment/protein = 2)
+ tastes = list("meat" = 1)
+ foodtypes = MEAT | RAW
+ w_class = WEIGHT_CLASS_SMALL
+ var/patty_type = /obj/item/food/patty/plain
+
+/obj/item/food/raw_patty/make_grillable()
+ AddComponent(/datum/component/grillable, patty_type, rand(30 SECONDS, 40 SECONDS), TRUE)
+
+/obj/item/food/raw_patty/human
+ name = "strange raw patty"
+ patty_type = /obj/item/food/patty/human
+
+/obj/item/food/raw_patty/corgi
+ name = "raw corgi patty"
+ patty_type = /obj/item/food/patty/corgi
+
+/obj/item/food/raw_patty/bear
+ name = "raw bear patty"
+ tastes = list("meat" = 1, "salmon" = 1)
+ patty_type = /obj/item/food/patty/bear
+
+/obj/item/food/raw_patty/xeno
+ name = "raw xenomorph patty"
+ tastes = list("meat" = 1, "acid" = 1)
+ patty_type = /obj/item/food/patty/xeno
+
+/obj/item/food/raw_patty/chicken
+ name = "raw chicken patty"
+ tastes = list("chicken" = 1)
+ patty_type = /obj/item/food/patty/chicken
+
+/obj/item/food/patty
+ name = "patty"
+ desc = "The nanotrasen patty is the patty for you and me!"
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "patty"
+ food_reagents = list(/datum/reagent/consumable/nutriment/protein = 2)
+ tastes = list("meat" = 1)
+ foodtypes = MEAT
+ w_class = WEIGHT_CLASS_SMALL
+
+///Exists purely for the crafting recipe (because itll take subtypes)
+/obj/item/food/patty/plain
+
+/obj/item/food/patty/human
+ name = "strange patty"
+
+/obj/item/food/patty/corgi
+ name = "corgi patty"
+
+/obj/item/food/patty/bear
+ name = "bear patty"
+ tastes = list("meat" = 1, "salmon" = 1)
+
+/obj/item/food/patty/xeno
+ name = "xenomorph patty"
+ tastes = list("meat" = 1, "acid" = 1)
+
+/obj/item/food/patty/chicken
+ name = "chicken patty"
+ tastes = list("chicken" = 1)
+ icon_state = "chicken_patty"
+
+/obj/item/food/raw_sausage
+ name = "raw sausage"
+ desc = "A piece of mixed, long meat, but then raw"
+ icon = 'icons/obj/food/meat.dmi'
+ icon_state = "raw_sausage"
+ food_reagents = list(/datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+ tastes = list("meat" = 1)
+ foodtypes = MEAT | RAW
+ eatverbs = list("bite","chew","nibble","deep throat","gobble","chomp")
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/raw_sausage/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/sausage, rand(60 SECONDS, 75 SECONDS), TRUE)
+
/obj/item/food/sausage
name = "sausage"
desc = "A piece of mixed, long meat."
@@ -190,6 +341,15 @@
/obj/item/food/sausage/make_processable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/salami, 6, 3 SECONDS, table_required = TRUE,/* screentip_verb = "Slice"*/)
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/sausage/american, 1, 3 SECONDS, table_required = TRUE)
+
+/obj/item/food/sausage/american
+ name = "american sausage"
+ desc = "Snip."
+ icon_state = "american_sausage"
+
+/obj/item/food/sausage/american/make_processable() //or else it would make itself? Lmao
+ return
/obj/item/food/salami
name = "salami"
@@ -218,7 +378,10 @@
tastes = list("meat" = 1, "onions" = 1, "garlic" = 1)
foodtypes = MEAT | RAW
w_class = WEIGHT_CLASS_SMALL
- microwaved_type = /obj/item/food/khinkali
+
+/obj/item/food/rawkhinkali/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/khinkali, rand(50 SECONDS, 60 SECONDS), TRUE)
+
/obj/item/food/khinkali
name = "khinkali"
desc = "One hundred khinkalis? Do I look like a pig?"
diff --git a/code/game/objects/items/food/meatslab.dm b/code/game/objects/items/food/meatslab.dm
index 5c75dfc18830b..9ff87d628db00 100644
--- a/code/game/objects/items/food/meatslab.dm
+++ b/code/game/objects/items/food/meatslab.dm
@@ -10,7 +10,6 @@
desc = "A slab of meat."
icon_state = "meat"
//dried_type = /obj/item/food//sosjerky/healthy
- microwaved_type = /obj/item/food/meat/steak/plain
bite_consumption = 3
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 6,
@@ -21,10 +20,8 @@
///Legacy code, handles the coloring of the overlay of the cutlets made from this.
var/slab_color = "#FF0000"
-/*
-/obj/item/food/meat/slab/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/plain)
-*/
+/obj/item/food/meat/slab/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/plain, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE) //Add medium rare later maybe?
/obj/item/food/meat/slab/make_processable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/plain, 3, 30)
@@ -33,14 +30,11 @@
/obj/item/food/meat/slab/human
name = "meat"
- microwaved_type = /obj/item/food/meat/steak/plain/human
tastes = list("tender meat" = 1)
foodtypes = MEAT | RAW | GORE
-/*
-/obj/item/food/meat/slab/human/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/plain/human)
-*/
+/obj/item/food/meat/slab/human/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/plain/human, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE) //Add medium rare later maybe?
/obj/item/food/meat/slab/human/make_processable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/plain/human, 3, 30)
@@ -73,14 +67,11 @@
/obj/item/food/meat/slab/human/mutant/lizard
icon_state = "lizardmeat"
desc = "Delicious dino damage."
- microwaved_type = /obj/item/food/meat/steak/plain/human/lizard
tastes = list("meat" = 4, "scales" = 1)
foodtypes = MEAT | RAW | GORE
-/*
-/obj/item/food/meat/slab/human/mutant/lizard/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/plain/human/lizard)
-*/
+/obj/item/food/meat/slab/human/mutant/lizard/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/plain/human/lizard, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE)
/obj/item/food/meat/slab/human/mutant/plant
icon_state = "plantmeat"
@@ -156,19 +147,16 @@
desc = "A synthetic slab of... ethical* meat?"
foodtypes = RAW | MEAT // If it looks like a duck, quacks like a duck, its probably...
+/obj/item/food/meat/slab/synthmeat/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/plain/synth, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE)
+
/obj/item/food/meat/slab/meatproduct
name = "meat product"
//icon_state = "meatproduct"
- microwaved_type = /obj/item/food/meat/steak/meatproduct
desc = "A slab of station reclaimed and chemically processed meat product."
tastes = list("meat flavoring" = 2, "modified starches" = 2, "natural & artificial dyes" = 1, "butyric acid" = 1) // its supposed to be various processed chemicals seen in very processed food. Butyric acid is a reference to how a certain North American Candymaker puts a chemical commonly seen in vomit into chocolate
foodtypes = RAW | MEAT
-/*
-/obj/item/food/meat/slab/meatproduct/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/meatproduct)
-*/
-
/obj/item/food/meat/slab/monkey
name = "monkey meat"
foodtypes = RAW | MEAT
@@ -199,15 +187,12 @@
name = "killer tomato meat"
desc = "A slice from a huge tomato."
icon_state = "tomatomeat"
- microwaved_type = /obj/item/food/meat/steak/killertomato
food_reagents = list(/datum/reagent/consumable/nutriment = 2)
tastes = list("tomato" = 1)
foodtypes = FRUIT // Yeah, tomatoes are FRUIT. Bite me.
-/*
-/obj/item/food/meat/slab/killertomato/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/killertomato)
-*/
+/obj/item/food/meat/slab/killertomato/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/killertomato, rand(70 SECONDS, 85 SECONDS), TRUE, TRUE)
/obj/item/food/meat/slab/killertomato/make_processable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/killertomato, 3, 30)
@@ -216,7 +201,6 @@
name = "bear meat"
desc = "A very manly slab of meat."
icon_state = "bearmeat"
- microwaved_type = /obj/item/food/meat/steak/bear
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 16,
/datum/reagent/medicine/morphine = 5,
@@ -226,10 +210,8 @@
tastes = list("meat" = 1, "salmon" = 1)
foodtypes = RAW | MEAT
-/*
-/obj/item/food/meat/slab/bear/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/bear)
-*/
+/obj/item/food/meat/slab/bear/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/bear, rand(40 SECONDS, 70 SECONDS), TRUE, TRUE)
/obj/item/food/meat/slab/bear/make_processable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/bear, 3, 30)
@@ -238,7 +220,6 @@
name = "xeno meat"
desc = "A slab of meat."
icon_state = "xenomeat"
- microwaved_type = /obj/item/food/meat/steak/xeno
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 8,
/datum/reagent/consumable/nutriment/vitamin = 3
@@ -247,19 +228,16 @@
tastes = list("meat" = 1, "acid" = 1)
foodtypes = RAW | MEAT
-/*
-/obj/item/food/meat/slab/xeno/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/xeno)
-*/
-
/obj/item/food/meat/slab/xeno/make_processable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/xeno, 3, 30)
+/obj/item/food/meat/slab/xeno/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/xeno, rand(40 SECONDS, 70 SECONDS), TRUE, TRUE)
+
/obj/item/food/meat/slab/spider
name = "spider meat"
desc = "A slab of spider meat. That is so Kafkaesque."
icon_state = "spidermeat"
- microwaved_type = /obj/item/food/meat/steak/spider
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 5,
/datum/reagent/toxin = 3,
@@ -268,14 +246,12 @@
tastes = list("cobwebs" = 1)
foodtypes = RAW | MEAT | TOXIC
-/*
-/obj/item/food/meat/slab/spider/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/spider)
-*/
-
/obj/item/food/meat/slab/spider/make_processable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/spider, 3, 30)
+/obj/item/food/meat/slab/spider/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/spider, rand(40 SECONDS, 70 SECONDS), TRUE, TRUE)
+
/obj/item/food/meat/slab/goliath
name = "goliath meat"
desc = "A slab of goliath meat. It's not very edible now, but it cooks great in lava."
@@ -320,7 +296,6 @@
name = "raw piece of bacon"
desc = "A raw piece of bacon."
icon_state = "bacon"
- microwaved_type = /obj/item/food/meat/bacon
bite_consumption = 2
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 2,
@@ -329,10 +304,8 @@
tastes = list("bacon" = 1)
foodtypes = RAW | MEAT | BREAKFAST
-/*
-/obj/item/food/meat/rawbacon/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/bacon)
-*/
+/obj/item/food/meat/rawbacon/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/bacon, rand(25 SECONDS, 45 SECONDS), TRUE, TRUE)
/obj/item/food/meat/bacon
name = "piece of bacon"
@@ -349,7 +322,6 @@
/obj/item/food/meat/slab/gondola
name = "gondola meat"
desc = "According to legends of old, consuming raw gondola flesh grants one inner peace."
- microwaved_type = /obj/item/food/meat/steak/gondola
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 4,
/datum/reagent/tranquility = 5,
@@ -358,10 +330,8 @@
tastes = list("meat" = 4, "tranquility" = 1)
foodtypes = RAW | MEAT
-/*
-/obj/item/food/meat/slab/gondola/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/gondola)
-*/
+/obj/item/food/meat/slab/gondola/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/gondola, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE) //Add medium rare later maybe?
/obj/item/food/meat/slab/gondola/make_processable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/gondola, 3, 30)
@@ -369,7 +339,6 @@
/obj/item/food/meat/slab/penguin
name = "penguin meat"
//icon_state = "birdmeat"
- microwaved_type = /obj/item/food/meat/steak/penguin
desc = "A slab of penguin meat."
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 4,
@@ -377,10 +346,8 @@
)
tastes = list("beef" = 1, "cod fish" = 1)
-/*
-/obj/item/food/meat/slab/penguin/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/penguin)
-*/
+/obj/item/food/meat/slab/penguin/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/penguin, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE) //Add medium rare later maybe?
/obj/item/food/meat/slab/penguin/make_processable()
. = ..()
@@ -399,10 +366,8 @@
tastes = list("raw crab" = 1)
foodtypes = RAW | MEAT
-/*
-/obj/item/food/meat/rawcrab/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/crab)
-*/
+/obj/item/food/meat/slab/rawcrab/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/crab, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE) //Add medium rare later maybe?
/obj/item/food/meat/crab
name = "crab meat"
@@ -419,16 +384,14 @@
/obj/item/food/meat/slab/chicken
name = "chicken meat"
//icon_state = "birdmeat"
- microwaved_type = /obj/item/food/meat/steak/chicken
desc = "A slab of raw chicken. Remember to wash your hands!"
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 6
) //low fat
tastes = list("chicken" = 1)
-/*
-/obj/item/food/meat/slab/chicken/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/steak/chicken)
-*/
+
+/obj/item/food/meat/slab/chicken/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/chicken, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE) //Add medium rare later maybe? (no this is chicken)
/obj/item/food/meat/slab/chicken/make_processable()
. = ..()
@@ -554,7 +517,7 @@
//icon_state = "meatproductsteak"
tastes = list("enhanced char" = 2, "suspicious tenderness" = 2, "natural & artificial dyes" = 2, "emulsifying agents" = 1)
-/obj/item/food/meat/steak/synth
+/obj/item/food/meat/steak/plain/synth
name = "synthsteak"
desc = "A synthetic meat steak. It doesn't look quite right, now does it?"
icon_state = "meatsteak"
@@ -592,19 +555,16 @@
name = "raw cutlet"
desc = "A raw meat cutlet."
icon_state = "rawcutlet"
- microwaved_type = /obj/item/food/meat/cutlet/plain
bite_consumption = 2
food_reagents = list(
- /datum/reagent/consumable/nutriment/protein = 1
+ /datum/reagent/consumable/nutriment/protein = 2
)
tastes = list("meat" = 1)
foodtypes = MEAT | RAW
var/meat_type = "meat"
-/*
-/obj/item/food/meat/rawcutlet/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/cutlet/plain)
-*/
+/obj/item/food/meat/rawcutlet/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/cutlet/plain, rand(35 SECONDS, 50 SECONDS), TRUE, TRUE)
/obj/item/food/meat/rawcutlet/OnCreatedFromProcessing(mob/living/user, obj/item/work_tool, list/chosen_option, atom/original_atom)
. = ..()
@@ -620,14 +580,11 @@
foodtypes = MEAT
/obj/item/food/meat/rawcutlet/plain/human
- microwaved_type = /obj/item/food/meat/cutlet/plain/human
tastes = list("tender meat" = 1)
foodtypes = MEAT | RAW | GORE
-/*
-/obj/item/food/meat/rawcutlet/plain/human/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/cutlet/plain/human)
-*/
+/obj/item/food/meat/rawcutlet/plain/human/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/cutlet/plain/human, rand(35 SECONDS, 50 SECONDS), TRUE, TRUE)
/obj/item/food/meat/rawcutlet/plain/human/OnCreatedFromProcessing(mob/living/user, obj/item/I, list/chosen_option, atom/original_atom)
. = ..()
@@ -644,72 +601,51 @@
name = "raw killer tomato cutlet"
tastes = list("tomato" = 1)
foodtypes = FRUIT
- microwaved_type = /obj/item/food/meat/cutlet/killertomato
-/*
-/obj/item/food/meat/rawcutlet/killertomato/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/cutlet/killertomato)
-*/
+/obj/item/food/meat/rawcutlet/killertomato/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/cutlet/killertomato, rand(35 SECONDS, 50 SECONDS), TRUE, TRUE)
/obj/item/food/meat/rawcutlet/bear
name = "raw bear cutlet"
tastes = list("meat" = 1, "salmon" = 1)
- microwaved_type = /obj/item/food/meat/cutlet/bear
-/*
-/obj/item/food/meat/rawcutlet/bear/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/cutlet/bear)
-*/
+/obj/item/food/meat/rawcutlet/bear/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/cutlet/bear, rand(35 SECONDS, 50 SECONDS), TRUE, TRUE)
/obj/item/food/meat/rawcutlet/xeno
name = "raw xeno cutlet"
tastes = list("meat" = 1, "acid" = 1)
- microwaved_type = /obj/item/food/meat/cutlet/xeno
-/*
-/obj/item/food/meat/rawcutlet/xeno/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/cutlet/xeno)
-*/
+/obj/item/food/meat/rawcutlet/xeno/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/cutlet/xeno, rand(35 SECONDS, 50 SECONDS), TRUE, TRUE)
/obj/item/food/meat/rawcutlet/spider
name = "raw spider cutlet"
tastes = list("cobwebs" = 1)
- microwaved_type = /obj/item/food/meat/cutlet/spider
-/*
-/obj/item/food/meat/rawcutlet/spider/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/cutlet/spider)
-*/
+/obj/item/food/meat/rawcutlet/spider/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/cutlet/spider, rand(35 SECONDS, 50 SECONDS), TRUE, TRUE)
/obj/item/food/meat/rawcutlet/gondola
name = "raw gondola cutlet"
tastes = list("meat" = 1, "tranquility" = 1)
- microwaved_type = /obj/item/food/meat/cutlet/gondola
-/*
-/obj/item/food/meat/rawcutlet/gondola/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/cutlet/gondola)
-*/
+/obj/item/food/meat/rawcutlet/gondola/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/cutlet/gondola, rand(35 SECONDS, 50 SECONDS), TRUE, TRUE)
/obj/item/food/meat/rawcutlet/penguin
name = "raw penguin cutlet"
tastes = list("beef" = 1, "cod fish" = 1)
- microwaved_type = /obj/item/food/meat/cutlet/penguin
-/*
-/obj/item/food/meat/rawcutlet/penguin/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/cutlet/penguin)
-*/
+/obj/item/food/meat/rawcutlet/penguin/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/cutlet/penguin, rand(35 SECONDS, 50 SECONDS), TRUE, TRUE)
/obj/item/food/meat/rawcutlet/chicken
name = "raw chicken cutlet"
tastes = list("chicken" = 1)
- microwaved_type = /obj/item/food/meat/cutlet/chicken
-/*
-/obj/item/food/meat/rawcutlet/chicken/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/cutlet/chicken)
-*/
+/obj/item/food/meat/rawcutlet/chicken/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/cutlet/chicken, rand(35 SECONDS, 50 SECONDS), TRUE, TRUE)
/obj/item/food/meat/rawcutlet/grub //grub meat is small, so its in cutlets
name = "redgrub cutlet"
@@ -725,10 +661,8 @@
foodtypes = RAW | MEAT | TOXIC
microwaved_type = /obj/item/food/meat/cutlet/grub
-/*
-/obj/item/food/meat/rawcutlet/grub/make_microwaveable()
- AddElement(/datum/element/microwavable, /obj/item/food/meat/cutlet/grub)
-*/
+/obj/item/food/meat/rawcutlet/grub/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/meat/cutlet/grub, rand(35 SECONDS, 50 SECONDS), TRUE, TRUE)
//Cooked cutlets
diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm
index 57300f36796e4..b6b5df75ec0c1 100644
--- a/code/game/objects/items/food/misc.dm
+++ b/code/game/objects/items/food/misc.dm
@@ -59,6 +59,14 @@
foodtypes = GROSS
w_class = WEIGHT_CLASS_SMALL
+/obj/item/food/badrecipe/Initialize()
+ . = ..()
+ RegisterSignal(src, COMSIG_ITEM_GRILLED, PROC_REF(OnGrill))
+
+///Prevents grilling burnt shit from well, burning.
+/obj/item/food/badrecipe/proc/OnGrill()
+ return COMPONENT_HANDLED_GRILLING
+
/obj/item/food/badrecipe/burn()
if(QDELETED(src))
return
@@ -69,6 +77,9 @@
SSfire_burning.processing -= src
qdel(src)
+// We override the parent procs here to prevent burned messes from cooking into burned messes.
+/obj/item/food/badrecipe/make_grillable()
+ return
/obj/item/food/spidereggs
name = "spider eggs"
diff --git a/code/game/objects/items/food/sandwichtoast.dm b/code/game/objects/items/food/sandwichtoast.dm
index 8b5fc86d82cb6..9f977a7702882 100644
--- a/code/game/objects/items/food/sandwichtoast.dm
+++ b/code/game/objects/items/food/sandwichtoast.dm
@@ -9,24 +9,10 @@
/datum/reagent/consumable/nutriment/vitamin = 1
)
tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1)
- microwaved_type = /obj/item/food/toastedsandwich
foodtypes = GRAIN | VEGETABLES
food_flags = FOOD_FINGER_FOOD
w_class = WEIGHT_CLASS_SMALL
-/obj/item/food/toastedsandwich
- name = "toasted sandwich"
- desc = "Now if you only had a pepper bar."
- icon = 'icons/obj/food/burgerbread.dmi'
- icon_state = "toastedsandwich"
- trash_type = /obj/item/trash/plate
- food_reagents = list(
- /datum/reagent/consumable/nutriment = 6,
- /datum/reagent/carbon = 2
- )
- tastes = list("toast" = 1)
- foodtypes = GRAIN
-
/obj/item/food/grilled_cheese_sandwich
name = "grilled cheese sandwich"
desc = "A warm, melty sandwich that goes perfectly with tomato soup."
@@ -43,6 +29,20 @@
food_flags = FOOD_FINGER_FOOD
w_class = WEIGHT_CLASS_SMALL
+/obj/item/food/cheese_sandwich
+ name = "cheese sandwich"
+ desc = "A light snack for a warm day. ...but what if you grilled it?"
+ icon = 'icons/obj/food/burgerbread.dmi'
+ icon_state = "sandwich"
+ trash_type = /obj/item/trash/plate
+ food_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
+ tastes = list("bread" = 1, "cheese" = 1)
+ foodtypes = GRAIN | DAIRY
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/cheese_sandwich/make_grillable()
+ AddComponent(/datum/component/grillable, /obj/item/food/grilled_cheese_sandwich, rand(30 SECONDS, 60 SECONDS), TRUE)
+
/obj/item/food/jellysandwich
name = "jelly sandwich"
desc = "You wish you had some peanut butter to go with this..."
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index 64b66506c069b..b3ba40a6ef6b4 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -4,9 +4,12 @@
if(QDELETED(src))
stack_trace("[src] taking damage after deletion")
return
+ if(obj_integrity <= 0)
+ stack_trace("[src] taking damage while having <= 0 integrity")
+ return
if(sound_effect)
play_attack_sound(damage_amount, damage_type, damage_flag)
- if((resistance_flags & INDESTRUCTIBLE) || obj_integrity <= 0)
+ if(resistance_flags & INDESTRUCTIBLE)
return
damage_amount = run_obj_armor(damage_amount, damage_type, damage_flag, attack_dir, armour_penetration)
if(damage_amount < DAMAGE_PRECISION)
diff --git a/code/modules/admin/verbs/cluwneplayer.dm b/code/modules/admin/verbs/cluwneplayer.dm
index e19f75f7bacaf..42df6bd2a4c25 100644
--- a/code/modules/admin/verbs/cluwneplayer.dm
+++ b/code/modules/admin/verbs/cluwneplayer.dm
@@ -8,10 +8,12 @@
var/mob/living/simple_animal/cluwne/newmob = new(get_turf(src))
- if (client)
+ if(client)
client.give_award(/datum/award/achievement/misc/cluwne, client.mob)
- M.transfer_to(newmob)
+ if(mind) // If the mob has a mind, we transfer
+ M.transfer_to(newmob)
+
if(key) // afk (no mind)
newmob.key = key
diff --git a/code/modules/food_and_drinks/kitchen_machinery/griddle.dm b/code/modules/food_and_drinks/kitchen_machinery/griddle.dm
new file mode 100644
index 0000000000000..2d47a4e325322
--- /dev/null
+++ b/code/modules/food_and_drinks/kitchen_machinery/griddle.dm
@@ -0,0 +1,149 @@
+/obj/machinery/griddle
+ name = "griddle"
+ desc = "Because using pans is for pansies."
+ icon = 'icons/obj/machines/kitchenmachines.dmi'
+ icon_state = "griddle1_off"
+ density = TRUE
+ pass_flags_self = PASSMACHINE | PASSTABLE| LETPASSTHROW
+ use_power = IDLE_POWER_USE
+ idle_power_usage = 5
+ layer = BELOW_OBJ_LAYER
+ circuit = /obj/item/circuitboard/machine/griddle
+ processing_flags = START_PROCESSING_MANUALLY
+ resistance_flags = FIRE_PROOF
+
+ ///Things that are being griddled right now
+ var/list/griddled_objects = list()
+ ///Looping sound for the grill
+ var/datum/looping_sound/grill/grill_loop
+ ///Whether or not the machine is turned on right now
+ var/on = FALSE
+ ///What variant of griddle is this?
+ var/variant = 1
+ ///How many shit fits on the griddle?
+ var/max_items = 8
+
+/obj/machinery/griddle/Initialize()
+ . = ..()
+ grill_loop = new(src, FALSE)
+ if(isnum(variant))
+ variant = rand(1,3)
+ // Add expose_reagent to add pancakes. I tried already. https://github.com/BeeStation/BeeStation-Hornet/pull/8479
+ //RegisterSignal(src, COMSIG_ATOM_EXPOSE_REAGENT, PROC_REF(on_expose_reagent))
+
+/obj/machinery/griddle/Destroy()
+ QDEL_NULL(grill_loop)
+ return ..()
+
+/obj/machinery/griddle/crowbar_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(flags_1 & NODECONSTRUCT_1)
+ return
+ if(default_deconstruction_crowbar(I, ignore_panel = TRUE))
+ return
+ variant = rand(1,3)
+
+/* See https://github.com/BeeStation/BeeStation-Hornet/pull/8479
+/obj/machinery/griddle/proc/on_expose_reagent(atom/parent_atom, datum/reagent/exposing_reagent, reac_volume)
+ SIGNAL_HANDLER
+
+ if(griddled_objects.len >= max_items || !istype(exposing_reagent, /datum/reagent/consumable/pancakebatter) || reac_volume < 5)
+ return NONE //make sure you have space... it's actually batter... and a proper amount of it.
+
+ for(var/pancakes in 1 to FLOOR(reac_volume, 5) step 5) //this adds as many pancakes as you possibly could make, with 5u needed per pancake
+ var/obj/item/food/pancakes/raw/new_pancake = new(src)
+ new_pancake.pixel_x = rand(16,-16)
+ new_pancake.pixel_y = rand(16,-16)
+ AddToGrill(new_pancake)
+ if(griddled_objects.len >= max_items)
+ break
+ visible_message("[exposing_reagent] begins to cook on [src].")
+ return NONE
+*/
+
+/obj/machinery/griddle/crowbar_act(mob/living/user, obj/item/I)
+ . = ..()
+ return default_deconstruction_crowbar(I, ignore_panel = TRUE)
+
+/obj/machinery/griddle/attackby(obj/item/I, mob/user, params)
+ if(griddled_objects.len >= max_items)
+ to_chat(user, "[src] can't fit more items!")
+ return
+ var/list/modifiers = params2list(params)
+ //Center the icon where the user clicked.
+ if(!LAZYACCESS(modifiers, ICON_X) || !LAZYACCESS(modifiers, ICON_Y))
+ return
+ if(user.transferItemToLoc(I, src, silent = FALSE))
+ //Clamp it so that the icon never moves more than 16 pixels in either direction (thus leaving the table turf)
+ I.pixel_x = clamp(text2num(LAZYACCESS(modifiers, ICON_X)) - 16, -(world.icon_size/2), world.icon_size/2)
+ I.pixel_y = clamp(text2num(LAZYACCESS(modifiers, ICON_Y)) - 16, -(world.icon_size/2), world.icon_size/2)
+ to_chat(user, "You place [I] on [src].")
+ AddToGrill(I, user)
+ update_appearance()
+ else
+ return ..()
+
+/obj/machinery/griddle/attack_hand(mob/user)
+ . = ..()
+ on = !on
+ if(on)
+ begin_processing()
+ else
+ end_processing()
+ update_appearance()
+ update_grill_audio()
+
+
+/obj/machinery/griddle/proc/AddToGrill(obj/item/item_to_grill, mob/user)
+ vis_contents += item_to_grill
+ griddled_objects += item_to_grill
+ item_to_grill.flags_1 |= IS_ONTOP_1
+ RegisterSignal(item_to_grill, COMSIG_MOVABLE_MOVED, PROC_REF(ItemMoved))
+ RegisterSignal(item_to_grill, COMSIG_GRILL_COMPLETED, PROC_REF(GrillCompleted))
+ RegisterSignal(item_to_grill, COMSIG_PARENT_QDELETING, PROC_REF(ItemRemovedFromGrill))
+ update_grill_audio()
+
+/obj/machinery/griddle/proc/ItemRemovedFromGrill(obj/item/I)
+ SIGNAL_HANDLER
+ I.flags_1 &= ~IS_ONTOP_1
+ griddled_objects -= I
+ vis_contents -= I
+ UnregisterSignal(I, list(COMSIG_GRILL_COMPLETED, COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING))
+ update_grill_audio()
+
+/obj/machinery/griddle/proc/ItemMoved(obj/item/I, atom/OldLoc, Dir, Forced)
+ SIGNAL_HANDLER
+ ItemRemovedFromGrill(I)
+
+/obj/machinery/griddle/proc/GrillCompleted(obj/item/source, atom/grilled_result)
+ SIGNAL_HANDLER
+ AddToGrill(grilled_result)
+
+/obj/machinery/griddle/proc/update_grill_audio()
+ if(on && griddled_objects.len)
+ grill_loop.start()
+ else
+ grill_loop.stop()
+
+/obj/machinery/griddle/wrench_act(mob/living/user, obj/item/I)
+ ..()
+ default_unfasten_wrench(user, I, 2 SECONDS)
+ return TRUE
+
+///Override to prevent storage dumping onto the griddle until I figure out how to navigate the mess that is storage code to allow me to nicely move the dumped objects onto the griddle.
+/obj/machinery/griddle/get_dumping_location(obj/item/storage/source, mob/user)
+ return
+
+/obj/machinery/griddle/process(delta_time)
+ ..()
+ for(var/i in griddled_objects)
+ var/obj/item/griddled_item = i
+ if(SEND_SIGNAL(griddled_item, COMSIG_ITEM_GRILLED, src, delta_time) & COMPONENT_HANDLED_GRILLING)
+ continue
+ griddled_item.fire_act(1000) //Hot hot hot!
+ if(prob(10))
+ visible_message("[griddled_item] doesn't seem to be doing too great on the [src]!")
+
+/obj/machinery/griddle/update_icon_state()
+ icon_state = "griddle[variant]_[on ? "on" : "off"]"
+ return ..()
diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm
index 426cd431cd1ff..3963ffa3cfb0e 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm
@@ -9,10 +9,11 @@
icon = 'icons/obj/kitchen.dmi'
icon_state = "grill_open"
density = TRUE
+ pass_flags_self = PASSMACHINE | LETPASSTHROW // sorta like griddles
layer = BELOW_OBJ_LAYER
use_power = NO_POWER_USE
var/grill_fuel = 0
- var/obj/item/reagent_containers/food/grilled_item
+ var/obj/item/food/grilled_item
var/grill_time = 0
var/datum/looping_sound/grill/grill_loop
@@ -20,13 +21,20 @@
. = ..()
grill_loop = new(src, FALSE)
-/obj/machinery/grill/update_icon()
+/obj/machinery/grill/Destroy()
+ grilled_item = null
+ QDEL_NULL(grill_loop)
+ return ..()
+
+/obj/machinery/grill/update_icon_state()
if(grilled_item)
icon_state = "grill"
- else if(grill_fuel > 0)
+ return ..()
+ if(grill_fuel > 0)
icon_state = "grill_on"
- else
- icon_state = "grill_open"
+ return ..()
+ icon_state = "grill_open"
+ return ..()
/obj/machinery/grill/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/stack/sheet/mineral/coal) || istype(I, /obj/item/stack/sheet/wood))
@@ -38,36 +46,36 @@
else
grill_fuel += (50 * stackamount)
S.use(stackamount)
- update_icon()
+ update_appearance()
return
if(I.resistance_flags & INDESTRUCTIBLE)
to_chat(user, "You don't feel it would be wise to grill [I]...")
return ..()
- if(istype(I, /obj/item/reagent_containers))
- if(istype(I, /obj/item/reagent_containers/food) && !istype(I, /obj/item/reagent_containers/food/drinks))
- if(HAS_TRAIT(I, TRAIT_NODROP) || (I.item_flags & (ABSTRACT | DROPDEL)))
- return ..()
- else if(!grill_fuel)
- to_chat(user, "There is not enough fuel.")
- return
- else if(!grilled_item && user.transferItemToLoc(I, src))
- grilled_item = I
- to_chat(user, "You put the [grilled_item] on [src].")
- update_icon()
- grill_loop.start()
- return
- else
- if(I.reagents.has_reagent(/datum/reagent/consumable/monkey_energy))
- grill_fuel += (20 * (I.reagents.get_reagent_amount(/datum/reagent/consumable/monkey_energy)))
- to_chat(user, "You pour the Monkey Energy in [src].")
- I.reagents.remove_reagent(/datum/reagent/consumable/monkey_energy, I.reagents.get_reagent_amount(/datum/reagent/consumable/monkey_energy))
- update_icon()
- return
+ if(istype(I, /obj/item/reagent_containers/glass))
+ if(I.reagents.has_reagent(/datum/reagent/consumable/monkey_energy))
+ grill_fuel += (20 * (I.reagents.get_reagent_amount(/datum/reagent/consumable/monkey_energy)))
+ to_chat(user, "You pour the Monkey Energy in [src].")
+ I.reagents.remove_reagent(/datum/reagent/consumable/monkey_energy, I.reagents.get_reagent_amount(/datum/reagent/consumable/monkey_energy))
+ update_appearance()
+ return
+ else if(IS_EDIBLE(I))
+ if(HAS_TRAIT(I, TRAIT_NODROP) || (I.item_flags & (ABSTRACT | DROPDEL)))
+ return ..()
+ else if(!grill_fuel)
+ to_chat(user, "There is not enough fuel.")
+ return
+ else if(!grilled_item && user.transferItemToLoc(I, src))
+ grilled_item = I
+ RegisterSignal(grilled_item, COMSIG_GRILL_COMPLETED, PROC_REF(GrillCompleted))
+ to_chat(user, "You put the [grilled_item] on [src].")
+ update_appearance()
+ grill_loop.start()
+ return
..()
/obj/machinery/grill/process(delta_time)
..()
- update_icon()
+ update_appearance()
if(grill_fuel <= 0)
return
else
@@ -77,6 +85,7 @@
smoke.set_up(1, loc)
smoke.start()
if(grilled_item)
+ SEND_SIGNAL(grilled_item, COMSIG_ITEM_GRILLED, src, delta_time)
grill_time += delta_time
grilled_item.reagents.add_reagent(/datum/reagent/consumable/char, 0.5 * delta_time)
grill_fuel -= GRILL_FUELUSAGE_ACTIVE * delta_time
@@ -88,11 +97,6 @@
grilled_item = null
return ..()
-/obj/machinery/grill/Destroy()
- QDEL_NULL(grill_loop)
- grilled_item = null
- . = ..()
-
/obj/machinery/grill/handle_atom_del(atom/A)
if(A == grilled_item)
grilled_item = null
@@ -117,30 +121,21 @@
if(grilled_item)
to_chat(user, "You take out [grilled_item] from [src].")
grilled_item.forceMove(drop_location())
- update_icon()
+ update_appearance()
return
return ..()
/obj/machinery/grill/proc/finish_grill()
- switch(grill_time) //no 0-20 to prevent spam
- if(20 to 30)
- grilled_item.name = "lightly-grilled [grilled_item.name]"
- grilled_item.desc = "[grilled_item.desc] It's been lightly grilled."
- if(30 to 80)
- grilled_item.name = "grilled [grilled_item.name]"
- grilled_item.desc = "[grilled_item.desc] It's been grilled."
- grilled_item.foodtype |= FRIED
- if(80 to 100)
- grilled_item.name = "heavily grilled [grilled_item.name]"
- grilled_item.desc = "[grilled_item.desc] It's been heavily grilled."
- grilled_item.foodtype |= FRIED
- if(100 to INFINITY) //grill marks reach max alpha
- grilled_item.name = "Powerfully Grilled [grilled_item.name]"
- grilled_item.desc = "A [grilled_item.name]. Reminds you of your wife, wait, no, it's prettier!"
- grilled_item.foodtype |= FRIED
+ SEND_SIGNAL(grilled_item, COMSIG_GRILL_FOOD, grilled_item, grill_time)
grill_time = 0
+ UnregisterSignal(grilled_item, COMSIG_GRILL_COMPLETED, PROC_REF(GrillCompleted))
grill_loop.stop()
+///Called when a food is transformed by the grillable component
+/obj/machinery/grill/proc/GrillCompleted(obj/item/source, atom/grilled_result)
+ SIGNAL_HANDLER
+ grilled_item = grilled_result //use the new item!!
+
/obj/machinery/grill/unwrenched
anchored = FALSE
diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
index d60f250236763..1d09b6b72a037 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
@@ -29,8 +29,10 @@
/obj/machinery/processor/proc/process_food(datum/food_processor_process/recipe, atom/movable/what)
if (recipe.output && loc && !QDELETED(src))
- for(var/i = 0, i < rating_amount, i++)
+ var/cached_multiplier = (recipe.food_multiplier * rating_amount)
+ for(var/i in 1 to cached_multiplier)
new recipe.output(drop_location())
+
if (ismob(what))
var/mob/themob = what
themob.gib(TRUE,TRUE,TRUE)
diff --git a/code/modules/food_and_drinks/recipes/processor_recipes.dm b/code/modules/food_and_drinks/recipes/processor_recipes.dm
index e80e29079a6e9..42bf986021265 100644
--- a/code/modules/food_and_drinks/recipes/processor_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/processor_recipes.dm
@@ -2,11 +2,56 @@
var/input
var/output
var/time = 40
+ /// The machine required to do this recipe
var/required_machine = /obj/machinery/processor
+ /// Multiplied additional food made when processed
+ var/food_multiplier = 1
/datum/food_processor_process/meat
input = /obj/item/food/meat/slab
- output = /obj/item/food/meatball
+ output = /obj/item/food/raw_meatball
+ food_multiplier = 3
+
+/datum/food_processor_process/cutlet
+ input = /obj/item/food/meat/cutlet/plain
+ output = /obj/item/food/raw_meatball
+
+/datum/food_processor_process/meat/human
+ input = /obj/item/food/meat/slab/human
+ output = /obj/item/food/raw_meatball/human
+
+/datum/food_processor_process/cutlet/human
+ input = /obj/item/food/meat/cutlet/plain/human
+ output = /obj/item/food/raw_meatball/human
+
+/datum/food_processor_process/meat/corgi
+ input = /obj/item/food/meat/slab/corgi
+ output = /obj/item/food/raw_meatball/corgi
+
+/datum/food_processor_process/meat/xeno
+ input = /obj/item/food/meat/slab/xeno
+ output = /obj/item/food/raw_meatball/xeno
+
+/datum/food_processor_process/cutlet/xeno
+ input = /obj/item/food/meat/cutlet/xeno
+ output = /obj/item/food/raw_meatball/xeno
+
+/datum/food_processor_process/meat/bear
+ input = /obj/item/food/meat/slab/bear
+ output = /obj/item/food/raw_meatball/bear
+
+/datum/food_processor_process/cutlet/bear
+ input = /obj/item/food/meat/cutlet/bear
+ output = /obj/item/food/raw_meatball/bear
+
+/datum/food_processor_process/meat/chicken
+ input = /obj/item/food/meat/slab/chicken
+ output = /obj/item/food/raw_meatball/chicken
+ food_multiplier = 3
+
+/datum/food_processor_process/cutlet/chicken
+ input = /obj/item/food/meat/cutlet/chicken
+ output = /obj/item/food/raw_meatball/chicken
/datum/food_processor_process/bacon
input = /obj/item/food/meat/rawcutlet
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
index 6ecf1a02fcf8b..24bc4b08519b5 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
@@ -8,10 +8,10 @@
name = "Human burger"
reqs = list(
/obj/item/food/bun = 1,
- /obj/item/food/meat/steak/plain/human = 1
+ /obj/item/food/patty/human = 1
)
parts = list(
- /obj/item/food/meat/steak/plain/human = 1
+ /obj/item/food/patty = 1
)
result = /obj/item/food/burger/human
subcategory = CAT_BURGER
@@ -19,7 +19,7 @@
/datum/crafting_recipe/food/burger
name = "Burger"
reqs = list(
- /obj/item/food/meat/steak/plain = 1,
+ /obj/item/food/patty/plain = 1,
/obj/item/food/bun = 1
)
@@ -29,7 +29,7 @@
/datum/crafting_recipe/food/corgiburger
name = "Corgi burger"
reqs = list(
- /obj/item/food/meat/slab/corgi = 1,
+ /obj/item/food/patty/corgi = 1,
/obj/item/food/bun = 1
)
@@ -57,7 +57,7 @@
/datum/crafting_recipe/food/xenoburger
name = "Xeno burger"
reqs = list(
- /obj/item/food/meat/steak/xeno = 1,
+ /obj/item/food/patty/xeno = 1,
/obj/item/food/bun = 1
)
result = /obj/item/food/burger/xeno
@@ -66,7 +66,7 @@
/datum/crafting_recipe/food/bearger
name = "Bearger"
reqs = list(
- /obj/item/food/meat/steak/bear = 1,
+ /obj/item/food/patty/bear = 1,
/obj/item/food/bun = 1
)
result = /obj/item/food/burger/bearger
@@ -122,7 +122,7 @@
/datum/crafting_recipe/food/redburger
name = "Red burger"
reqs = list(
- /obj/item/food/meat/steak/plain = 1,
+ /obj/item/food/patty/plain = 1,
/obj/item/toy/crayon/red = 1,
/obj/item/food/bun = 1
)
@@ -132,7 +132,7 @@
/datum/crafting_recipe/food/orangeburger
name = "Orange burger"
reqs = list(
- /obj/item/food/meat/steak/plain = 1,
+ /obj/item/food/patty/plain = 1,
/obj/item/toy/crayon/orange = 1,
/obj/item/food/bun = 1
)
@@ -142,7 +142,7 @@
/datum/crafting_recipe/food/yellowburger
name = "Yellow burger"
reqs = list(
- /obj/item/food/meat/steak/plain = 1,
+ /obj/item/food/patty/plain = 1,
/obj/item/toy/crayon/yellow = 1,
/obj/item/food/bun = 1
)
@@ -152,7 +152,7 @@
/datum/crafting_recipe/food/greenburger
name = "Green burger"
reqs = list(
- /obj/item/food/meat/steak/plain = 1,
+ /obj/item/food/patty/plain = 1,
/obj/item/toy/crayon/green = 1,
/obj/item/food/bun = 1
)
@@ -162,7 +162,7 @@
/datum/crafting_recipe/food/blueburger
name = "Blue burger"
reqs = list(
- /obj/item/food/meat/steak/plain = 1,
+ /obj/item/food/patty/plain = 1,
/obj/item/toy/crayon/blue = 1,
/obj/item/food/bun = 1
)
@@ -172,7 +172,7 @@
/datum/crafting_recipe/food/purpleburger
name = "Purple burger"
reqs = list(
- /obj/item/food/meat/steak/plain = 1,
+ /obj/item/food/patty/plain = 1,
/obj/item/toy/crayon/purple = 1,
/obj/item/food/bun = 1
)
@@ -182,7 +182,7 @@
/datum/crafting_recipe/food/blackburger
name = "Black burger"
reqs = list(
- /obj/item/food/meat/steak/plain = 1,
+ /obj/item/food/patty/plain = 1,
/obj/item/toy/crayon/black = 1,
/obj/item/food/bun = 1
)
@@ -192,7 +192,7 @@
/datum/crafting_recipe/food/whiteburger
name = "White burger"
reqs = list(
- /obj/item/food/meat/steak/plain = 1,
+ /obj/item/food/patty/plain = 1,
/obj/item/toy/crayon/white = 1,
/obj/item/food/bun = 1
)
@@ -211,7 +211,7 @@
/datum/crafting_recipe/food/bigbiteburger
name = "Big bite burger"
reqs = list(
- /obj/item/food/meat/steak/plain = 3,
+ /obj/item/food/patty/plain = 3,
/obj/item/food/cheese/wedge = 2,
/obj/item/food/bun = 1
)
@@ -223,7 +223,7 @@
reqs = list(
/datum/reagent/consumable/sodiumchloride = 5,
/datum/reagent/consumable/blackpepper = 5,
- /obj/item/food/meat/steak/plain = 5,
+ /obj/item/food/patty/plain = 5,
/obj/item/food/grown/tomato = 4,
/obj/item/food/cheese/wedge = 3,
/obj/item/food/boiledegg = 1,
@@ -255,7 +255,7 @@
/datum/crafting_recipe/food/fivealarmburger
name = "Five alarm burger"
reqs = list(
- /obj/item/food/meat/steak/plain = 1,
+ /obj/item/food/patty/plain = 1,
/obj/item/food/grown/ghost_chili = 2,
/obj/item/food/bun = 1
)
@@ -313,7 +313,7 @@
/datum/crafting_recipe/food/cheeseburger
name = "Cheese Burger"
reqs = list(
- /obj/item/food/meat/steak/plain = 1,
+ /obj/item/food/patty/plain = 1,
/obj/item/food/cheese/wedge = 1,
/obj/item/food/bun = 1
)
@@ -353,7 +353,7 @@
/datum/crafting_recipe/food/chickenburger
name = "Chicken Sandwich"
reqs = list(
- /obj/item/food/meat/steak/chicken = 1,
+ /obj/item/food/patty/chicken = 1,
/datum/reagent/consumable/mayonnaise = 5,
/obj/item/food/bun = 1
)
@@ -363,7 +363,7 @@
/datum/crafting_recipe/food/crazyhamburger
name = "Crazy Hamburger"
reqs = list(
- /obj/item/food/meat/steak/plain = 1, // we have no horse meat sadly
+ /obj/item/food/patty/plain = 1, // we have no horse meat sadly
/obj/item/food/grown/chili = 2,
/datum/reagent/consumable/cooking_oil = 20,
/obj/item/food/grown/nettle/death = 2, // closest thing to "grass of death"
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
index 41ad014451470..7b539a450b8c4 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
@@ -141,7 +141,7 @@
/obj/item/food/meatball = 1,
/obj/item/food/meat/cutlet = 2
)
- result = /obj/item/food/sausage
+ result = /obj/item/food/raw_sausage
subcategory = CAT_MEAT
/datum/crafting_recipe/food/nugget
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
index ca80830f284b8..88301a9d199bf 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
@@ -16,13 +16,13 @@
result = /obj/item/food/sandwich
subcategory = CAT_SANDWICH
-/datum/crafting_recipe/food/grilled_cheese_sandwich
+/datum/crafting_recipe/food/cheese_sandwich
name = "Cheese sandwich"
reqs = list(
/obj/item/food/breadslice/plain = 2,
/obj/item/food/cheese/wedge = 2
)
- result = /obj/item/food/grilled_cheese_sandwich
+ result = /obj/item/food/cheese_sandwich
subcategory = CAT_SANDWICH
/datum/crafting_recipe/food/slimesandwich
diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm
index 14e8832ff2606..694593f8e28f7 100644
--- a/code/modules/hydroponics/grown/towercap.dm
+++ b/code/modules/hydroponics/grown/towercap.dm
@@ -292,9 +292,9 @@
var/mob/living/L = A
L.adjust_fire_stacks(fire_stack_strength * 0.5 * delta_time)
L.IgniteMob()
- else if(istype(A, /obj/item) && DT_PROB(10, delta_time))
- var/obj/item/O = A
- O.microwave_act()
+ else if(istype(A, /obj/item))
+ var/obj/item/grilled_item = A
+ SEND_SIGNAL(grilled_item, COMSIG_ITEM_GRILLED, src, delta_time) //Not a big fan, maybe make this use fire_act() in the future.
/obj/structure/bonfire/process(delta_time)
if(needs_oxygen && !CheckOxygen())
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 32454a53fea2f..4877e203b16ce 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -571,6 +571,14 @@
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+/datum/design/board/griddle
+ name = "Machine Design (Griddle)"
+ desc = "The circuit board for a Griddle."
+ id = "griddle"
+ build_path = /obj/item/circuitboard/machine/griddle
+ category = list ("Misc. Machinery")
+ departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
/datum/design/board/donksofttoyvendor
name = "Machine Design (Donksoft Toy Vendor Board)"
desc = "The circuit board for a Donksoft Toy Vendor."
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 9174d2dc8b990..f14f7c0648171 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -287,7 +287,7 @@
"dish_drive",
"fat_sucker",
"gibber",
- "gibber",
+ "griddle",
"microwave",
"monkey_recycler",
"processor",
diff --git a/icons/effects/steam.dmi b/icons/effects/steam.dmi
new file mode 100644
index 0000000000000..d79e58e2d5490
Binary files /dev/null and b/icons/effects/steam.dmi differ
diff --git a/icons/obj/food/meat.dmi b/icons/obj/food/meat.dmi
index 6b4502f4695a8..08e401a5ce0d1 100644
Binary files a/icons/obj/food/meat.dmi and b/icons/obj/food/meat.dmi differ
diff --git a/icons/obj/machines/kitchenmachines.dmi b/icons/obj/machines/kitchenmachines.dmi
new file mode 100644
index 0000000000000..32098601bf914
Binary files /dev/null and b/icons/obj/machines/kitchenmachines.dmi differ
diff --git a/sound/machines/grill/grillsizzle.ogg b/sound/machines/grill/grillsizzle.ogg
new file mode 100644
index 0000000000000..056ce45941c41
Binary files /dev/null and b/sound/machines/grill/grillsizzle.ogg differ