mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-20 04:26:03 +01:00
[MIRROR] Reinstates grilled cheese sandwich taste and fixes a typo. [NO GBP] [MDB IGNORE] (#21580)
* Reinstates grilled cheese sandwich taste and fixes a typo. [NO GBP] * Update sandwichtoast.dm * sandwich * guh --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com> Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com>
This commit is contained in:
SkyratBot
@@ -21993,6 +21993,17 @@
|
||||
/obj/machinery/camera/autoname/directional/east,
|
||||
/turf/open/floor/iron,
|
||||
/area/station/science/lower)
|
||||
"ikD" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/window/spawner/directional/east,
|
||||
/obj/structure/window/spawner/directional/north,
|
||||
/mob/living/basic/chick/permanent{
|
||||
name = "Morgan"
|
||||
},
|
||||
/turf/open/floor/grass,
|
||||
/area/station/cargo/storage)
|
||||
"ikH" = (
|
||||
/obj/structure/table/bronze,
|
||||
/obj/machinery/computer/security/wooden_tv{
|
||||
@@ -25636,11 +25647,6 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/station/engineering/supermatter/room)
|
||||
"jAA" = (
|
||||
/obj/effect/decal/cleanable/dirt/dust,
|
||||
/obj/machinery/light/small/directional/west,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/science/ordnance/testlab)
|
||||
"jAB" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
@@ -25982,6 +25988,19 @@
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/station/security)
|
||||
"jGh" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
dir = 4;
|
||||
id = "kitchenshutters";
|
||||
name = "Kitchen Shutters"
|
||||
},
|
||||
/obj/item/plate,
|
||||
/obj/item/food/sandwich/peanut_butter_jelly,
|
||||
/turf/open/floor/iron/cafeteria,
|
||||
/area/station/service/kitchen)
|
||||
"jGA" = (
|
||||
/obj/structure/chair/sofa/bench/right{
|
||||
dir = 4
|
||||
@@ -27817,6 +27836,19 @@
|
||||
/obj/structure/closet/firecloset,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/port/aft)
|
||||
"kmZ" = (
|
||||
/obj/structure/closet/crate/secure{
|
||||
desc = "A secure crate containing various materials for building a customised test-site.";
|
||||
name = "Test Site Materials Crate";
|
||||
req_access = list("ordnance")
|
||||
},
|
||||
/obj/item/target/clown,
|
||||
/obj/item/target/clown,
|
||||
/obj/item/target/syndicate,
|
||||
/obj/item/target/alien,
|
||||
/obj/effect/decal/cleanable/dirt/dust,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/science/ordnance/testlab)
|
||||
"knk" = (
|
||||
/obj/machinery/conveyor{
|
||||
dir = 4;
|
||||
@@ -32735,17 +32767,6 @@
|
||||
/obj/machinery/light/small/directional/west,
|
||||
/turf/open/floor/iron/large,
|
||||
/area/station/hallway/primary/central/fore)
|
||||
"lWl" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/window/spawner/directional/east,
|
||||
/obj/structure/window/spawner/directional/north,
|
||||
/mob/living/basic/chick/permanent{
|
||||
name = "Morgan"
|
||||
},
|
||||
/turf/open/floor/grass,
|
||||
/area/station/cargo/storage)
|
||||
"lWv" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
@@ -52434,6 +52455,11 @@
|
||||
/obj/machinery/light/small/directional/north,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/science/ordnance)
|
||||
"sCb" = (
|
||||
/obj/effect/decal/cleanable/dirt/dust,
|
||||
/obj/machinery/light/small/directional/west,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/science/ordnance/testlab)
|
||||
"sCc" = (
|
||||
/obj/effect/spawner/structure/window/reinforced/tinted,
|
||||
/turf/open/floor/plating,
|
||||
@@ -62288,17 +62314,6 @@
|
||||
"vKb" = (
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/medical/medbay/lobby)
|
||||
"vKx" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
dir = 4;
|
||||
id = "kitchenshutters";
|
||||
name = "Kitchen Shutters"
|
||||
},
|
||||
/obj/item/plate,
|
||||
/obj/item/food/sandwich/peanut_butter_jelly,
|
||||
/turf/open/floor/iron/cafeteria,
|
||||
/area/station/service/kitchen)
|
||||
"vKy" = (
|
||||
/obj/effect/turf_decal/siding/wood{
|
||||
dir = 4
|
||||
@@ -62809,19 +62824,6 @@
|
||||
/obj/effect/turf_decal/stripes/white/line,
|
||||
/turf/open/floor/noslip/tram_plate,
|
||||
/area/station/maintenance/port/aft)
|
||||
"vSr" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
dir = 4;
|
||||
id = "kitchenshutters";
|
||||
name = "Kitchen Shutters"
|
||||
},
|
||||
/obj/item/plate,
|
||||
/obj/item/food/sandwich/peanut_butter_jelly,
|
||||
/turf/open/floor/iron/cafeteria,
|
||||
/area/station/service/kitchen)
|
||||
"vSu" = (
|
||||
/obj/structure/chair{
|
||||
dir = 8
|
||||
@@ -63438,19 +63440,6 @@
|
||||
/obj/effect/spawner/random/maintenance,
|
||||
/turf/open/misc/asteroid,
|
||||
/area/station/maintenance/hallway/abandoned_command)
|
||||
"vYZ" = (
|
||||
/obj/structure/closet/crate/secure{
|
||||
desc = "A secure crate containing various materials for building a customised test-site.";
|
||||
name = "Test Site Materials Crate";
|
||||
req_access = list("ordnance")
|
||||
},
|
||||
/obj/item/target/clown,
|
||||
/obj/item/target/clown,
|
||||
/obj/item/target/syndicate,
|
||||
/obj/item/target/alien,
|
||||
/obj/effect/decal/cleanable/dirt/dust,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/science/ordnance/testlab)
|
||||
"vZb" = (
|
||||
/obj/structure/cable,
|
||||
/obj/structure/table,
|
||||
@@ -65231,6 +65220,17 @@
|
||||
"wCR" = (
|
||||
/turf/closed/wall,
|
||||
/area/station/cargo/boutique)
|
||||
"wCV" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
dir = 4;
|
||||
id = "kitchenshutters";
|
||||
name = "Kitchen Shutters"
|
||||
},
|
||||
/obj/item/plate,
|
||||
/obj/item/food/sandwich/peanut_butter_jelly,
|
||||
/turf/open/floor/iron/cafeteria,
|
||||
/area/station/service/kitchen)
|
||||
"wCX" = (
|
||||
/obj/effect/spawner/structure/window,
|
||||
/turf/open/floor/plating,
|
||||
@@ -86183,7 +86183,7 @@ slY
|
||||
slY
|
||||
rST
|
||||
sgL
|
||||
lWl
|
||||
ikD
|
||||
kYZ
|
||||
msy
|
||||
vLP
|
||||
@@ -95972,9 +95972,9 @@ cNF
|
||||
jVM
|
||||
qpX
|
||||
qHm
|
||||
vKx
|
||||
wCV
|
||||
rJl
|
||||
vSr
|
||||
jGh
|
||||
vUG
|
||||
xmt
|
||||
ffX
|
||||
@@ -122203,8 +122203,8 @@ jLo
|
||||
xxn
|
||||
xFL
|
||||
dMn
|
||||
jAA
|
||||
vYZ
|
||||
sCb
|
||||
kmZ
|
||||
qei
|
||||
qZU
|
||||
jeG
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -2238,6 +2238,15 @@
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/starboard/fore)
|
||||
"aMK" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/food/sandwich/cheese/grilled{
|
||||
name = "idiot sandwich";
|
||||
pixel_y = 8
|
||||
},
|
||||
/obj/effect/turf_decal/tile/purple/fourcorners,
|
||||
/turf/open/floor/iron,
|
||||
/area/mine/living_quarters)
|
||||
"aML" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
|
||||
dir = 8
|
||||
@@ -9281,11 +9290,6 @@
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/station/security/prison/workout)
|
||||
"cPW" = (
|
||||
/obj/machinery/airalarm/directional/west,
|
||||
/obj/structure/closet/secure_closet/freezer/fridge/all_access,
|
||||
/turf/open/floor/iron/showroomfloor,
|
||||
/area/station/security/prison/mess)
|
||||
"cQb" = (
|
||||
/obj/machinery/light_switch/directional/north,
|
||||
/obj/machinery/vending/autodrobe/all_access,
|
||||
@@ -18239,10 +18243,6 @@
|
||||
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/departmental,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/maintenance/port/aft)
|
||||
"fIY" = (
|
||||
/obj/structure/closet/secure_closet/freezer/meat/all_access,
|
||||
/turf/open/floor/iron/showroomfloor,
|
||||
/area/station/security/prison/mess)
|
||||
"fJe" = (
|
||||
/obj/machinery/door/airlock/external{
|
||||
name = "Atmospherics External Airlock"
|
||||
@@ -23198,6 +23198,11 @@
|
||||
dir = 4
|
||||
},
|
||||
/area/station/service/chapel)
|
||||
"hrR" = (
|
||||
/obj/machinery/airalarm/directional/west,
|
||||
/obj/structure/closet/secure_closet/freezer/fridge/all_access,
|
||||
/turf/open/floor/iron/showroomfloor,
|
||||
/area/station/security/prison/mess)
|
||||
"hrZ" = (
|
||||
/obj/structure/chair/office/light{
|
||||
dir = 4
|
||||
@@ -24115,6 +24120,10 @@
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/station/hallway/primary/port)
|
||||
"hIn" = (
|
||||
/obj/structure/closet/secure_closet/freezer/meat/all_access,
|
||||
/turf/open/floor/iron/showroomfloor,
|
||||
/area/station/security/prison/mess)
|
||||
"hIA" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
|
||||
@@ -39896,15 +39905,6 @@
|
||||
/obj/item/clothing/gloves/latex/nitrile,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/medical/storage)
|
||||
"mMs" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/food/sandwich/cheese/grilled{
|
||||
name = "idiot sandwich";
|
||||
pixel_y = 8
|
||||
},
|
||||
/obj/effect/turf_decal/tile/purple/fourcorners,
|
||||
/turf/open/floor/iron,
|
||||
/area/mine/living_quarters)
|
||||
"mMM" = (
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/station/security/prison)
|
||||
@@ -103780,7 +103780,7 @@ lJS
|
||||
bol
|
||||
oSD
|
||||
ldH
|
||||
cPW
|
||||
hrR
|
||||
yaZ
|
||||
dNH
|
||||
xyU
|
||||
@@ -104039,7 +104039,7 @@ oSD
|
||||
ldH
|
||||
qiJ
|
||||
qTs
|
||||
fIY
|
||||
hIn
|
||||
hfv
|
||||
ldH
|
||||
pEX
|
||||
@@ -156545,7 +156545,7 @@ gjq
|
||||
gjq
|
||||
gjq
|
||||
bOz
|
||||
mMs
|
||||
aMK
|
||||
chQ
|
||||
vxd
|
||||
xuB
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
/obj/item/food/notasandwich : /obj/item/food/sandwich/notasandwich{@OLD}
|
||||
/obj/item/food/blt : /obj/item/food/sandwich/blt{@OLD}
|
||||
/obj/item/food/peanut_butter_jelly_sandwich : /obj/item/food/sandwich/peanut_butter_jelly{@OLD}
|
||||
/obj/item/food/peanut_butter_banana_sandwich : /obj/item/food/sandwich/peanut_banana_banana{@OLD}
|
||||
/obj/item/food/peanut_butter_banana_sandwich : /obj/item/food/sandwich/peanut_butter_banana{@OLD}
|
||||
/obj/item/food/philly_cheesesteak : /obj/item/food/sandwich/philly_cheesesteak{@OLD}
|
||||
/obj/item/food/toast_sandwich : /obj/item/food/sandwich/toast_sandwich{@OLD}
|
||||
/obj/item/food/death_sandwich : /obj/item/food/sandwich/death{@OLD}
|
||||
|
||||
Reference in New Issue
Block a user