Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

You can now put food on plates, and plate no longer materialize out of nowhere as you cook #57770

Merged
merged 14 commits into from Mar 26, 2021
Merged

You can now put food on plates, and plate no longer materialize out of nowhere as you cook #57770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5e6603d
All plates removed.
Krysonism Mar 16, 2021
2aa317d
done
Mar 16, 2021
89bf6c3
vendor
Mar 16, 2021
6b5feb9
Merge branch 'realmaster' into noplate
Mar 16, 2021
7ec4106
sanity checks, plate size.
Mar 16, 2021
29e8388
f
Mar 16, 2021
7679209
map memes
Mar 16, 2021
acd7252
Update code/modules/food_and_drinks/plate.dm
Mar 17, 2021
48c2880
Merge branch 'realmaster' into noplate
Mar 20, 2021
92a2bd0
Merge branch 'realmaster' into noplate
Mar 25, 2021
1bbd5e3
fix for anturk
Mar 25, 2021
9ebcbb0
No English plates (#46)
Krysonism Mar 25, 2021
d0c66cb
no meat
Mar 25, 2021
08eab33
Merge remote-tracking branch 'origin/noplate' into noplate
Mar 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/turf/open/floor/iron/freezer,
/area/ruin/powered/gluttony)
"j" = (
/obj/item/trash/plate,
/obj/item/plate,
/turf/open/floor/iron/freezer,
/area/ruin/powered/gluttony)
"l" = (
Expand Down Expand Up @@ -72,7 +72,7 @@
/turf/open/floor/iron/freezer,
/area/ruin/powered/gluttony)
"z" = (
/obj/item/trash/plate,
/obj/item/plate,
/obj/machinery/light/small{
dir = 8
},
Expand Down
8 changes: 4 additions & 4 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
},
/area/ruin/unpowered)
"o" = (
/obj/item/trash/plate,
/obj/item/plate,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
initial_gas_mix = "LAVALAND_ATMOS"
Expand Down Expand Up @@ -160,7 +160,7 @@
/area/ruin/unpowered)
"y" = (
/obj/structure/table/wood,
/obj/item/trash/plate,
/obj/item/plate,
/turf/open/floor/wood{
initial_gas_mix = "LAVALAND_ATMOS"
},
Expand All @@ -175,7 +175,7 @@
/area/ruin/unpowered)
"A" = (
/obj/structure/table/wood,
/obj/item/trash/plate,
/obj/item/plate,
/obj/item/kitchen/fork,
/turf/open/floor/wood{
initial_gas_mix = "LAVALAND_ATMOS"
Expand All @@ -193,7 +193,7 @@
"D" = (
/obj/structure/table/wood,
/obj/item/food/pizzaslice/margherita,
/obj/item/trash/plate,
/obj/item/plate,
/turf/open/floor/wood{
initial_gas_mix = "LAVALAND_ATMOS"
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/derelict2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@
/obj/item/candle{
pixel_y = 5
},
/obj/item/trash/plate{
/obj/item/plate{
pixel_x = 10
},
/obj/item/trash/plate{
/obj/item/plate{
pixel_x = -10
},
/turf/open/floor/iron,
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/SpaceRuins/derelict6.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
/turf/open/floor/iron/airless,
/area/ruin/unpowered)
"aN" = (
/obj/item/trash/plate,
/obj/item/plate,
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
Expand Down Expand Up @@ -272,7 +272,7 @@
/area/ruin/unpowered)
"aV" = (
/obj/structure/table/wood,
/obj/item/trash/plate,
/obj/item/plate,
/turf/open/floor/plating/airless{
icon_state = "platingdmg3"
},
Expand Down Expand Up @@ -346,7 +346,7 @@
},
/area/ruin/unpowered)
"bj" = (
/obj/item/trash/plate,
/obj/item/plate,
/obj/effect/decal/remains/human,
/turf/open/floor/iron/airless/cafeteria,
/area/ruin/unpowered)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/oldstation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3588,7 +3588,7 @@
"iM" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
/obj/item/trash/plate,
/obj/item/plate,
/obj/item/kitchen/fork,
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/ancientstation/kitchen)
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomZLevels/caves.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1950,7 +1950,7 @@
},
/area/awaymission/caves/bmp_asteroid/level_two)
"gl" = (
/obj/item/trash/plate,
/obj/item/plate,
/turf/open/floor/iron,
/area/awaymission/caves/bmp_asteroid)
"gm" = (
Expand Down Expand Up @@ -2010,7 +2010,7 @@
"gx" = (
/obj/structure/table,
/obj/item/kitchen/fork,
/obj/item/trash/plate,
/obj/item/plate,
/turf/open/floor/iron,
/area/awaymission/caves/bmp_asteroid)
"gy" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomZLevels/moonoutpost19.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = 32
},
/obj/item/trash/plate,
/obj/item/plate,
/obj/item/cigbutt,
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
Expand Down Expand Up @@ -4019,7 +4019,7 @@
/area/awaymission/moonoutpost19/arrivals)
"iB" = (
/obj/structure/table,
/obj/item/trash/plate,
/obj/item/plate,
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
Expand Down Expand Up @@ -5042,7 +5042,7 @@
/area/awaymission/moonoutpost19/arrivals)
"kM" = (
/obj/structure/closet/crate/bin,
/obj/item/trash/plate,
/obj/item/plate,
/obj/item/food/badrecipe,
/turf/open/floor/iron/cafeteria{
dir = 5
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomZLevels/undergroundoutpost45.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3925,7 +3925,7 @@
/area/awaymission/undergroundoutpost45/research)
"il" = (
/obj/structure/table,
/obj/item/trash/plate,
/obj/item/plate,
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/IceBoxStation/IceBoxStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3871,7 +3871,7 @@
dir = 8;
pixel_x = 27
},
/obj/item/trash/plate,
/obj/item/plate,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"amI" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
/area/mine/laborcamp)
"aG" = (
/obj/structure/table,
/obj/item/trash/plate,
/obj/item/plate,
/obj/item/kitchen/fork,
/turf/open/floor/iron,
/area/mine/laborcamp)
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/MetaStation/MetaStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60713,7 +60713,7 @@
pixel_x = 7;
pixel_y = 6
},
/obj/item/trash/plate{
/obj/item/plate{
pixel_x = -9
},
/obj/item/storage/box/donkpockets{
Expand Down Expand Up @@ -79637,7 +79637,7 @@
/area/command/heads_quarters/hop)
"wQf" = (
/obj/structure/table,
/obj/item/trash/plate,
/obj/item/plate,
/obj/item/candle,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/radio{
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/Mining/Lavaland.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
/area/mine/laborcamp)
"aG" = (
/obj/structure/table,
/obj/item/trash/plate,
/obj/item/plate,
/obj/item/kitchen/fork,
/turf/open/floor/iron,
/area/mine/laborcamp)
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/tramstation/tramstation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6203,7 +6203,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
/obj/item/trash/plate,
/obj/item/plate,
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 8
},
Expand Down Expand Up @@ -49740,7 +49740,7 @@
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/aisat_interior)
"nZW" = (
/obj/item/trash/plate,
/obj/item/plate,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/maintenance/port/fore)
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/emergency_monastery.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2440,7 +2440,7 @@
/area/shuttle/escape)
"An" = (
/obj/structure/table/wood,
/obj/item/trash/plate,
/obj/item/plate,
/obj/item/kitchen/fork,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
Expand Down Expand Up @@ -3213,7 +3213,7 @@
/area/shuttle/escape)
"Kp" = (
/obj/structure/table,
/obj/item/trash/plate,
/obj/item/plate,
/obj/item/kitchen/fork,
/turf/open/floor/plating/asteroid,
/area/shuttle/escape)
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/ruin_caravan_victim.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@
pixel_x = 6;
pixel_y = 6
},
/obj/item/trash/plate{
/obj/item/plate{
pixel_x = -5;
pixel_y = -3
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/whiteship_box.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/table,
/obj/item/trash/plate{
/obj/item/plate{
pixel_x = 6
},
/obj/item/kitchen/fork{
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/whiteship_delta.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,7 @@
"bJ" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/table,
/obj/item/trash/plate{
/obj/item/plate{
pixel_x = 12
},
/obj/item/kitchen/fork{
Expand Down
10 changes: 5 additions & 5 deletions _maps/shuttles/whiteship_meta.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,22 +1104,22 @@
"bN" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/table,
/obj/item/trash/plate{
/obj/item/plate{
pixel_x = -6;
pixel_y = -2
},
/obj/item/trash/plate{
/obj/item/plate{
pixel_x = -6
},
/obj/item/trash/plate{
/obj/item/plate{
pixel_x = -6;
pixel_y = 2
},
/obj/item/trash/plate{
/obj/item/plate{
pixel_x = -6;
pixel_y = 4
},
/obj/item/trash/plate{
/obj/item/plate{
pixel_x = -6;
pixel_y = 6
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/templates/holodeck_petpark.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
/turf/open/floor/holofloor/grass,
/area/template_noop)
"S" = (
/obj/item/trash/plate,
/obj/item/plate,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 1
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/layers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@
#define HUD_LAYER 42
#define HUD_RENDER_TARGET "HUD_PLANE"
#define ABOVE_HUD_PLANE 43
#define ABOVE_HUD_LAYER 43
#define ABOVE_HUD_RENDER_TARGET "ABOVE_HUD_PLANE"
#define RADIAL_LAYER 43

#define SPLASHSCREEN_LAYER 54
#define SPLASHSCREEN_PLANE 54
Expand Down
2 changes: 0 additions & 2 deletions code/_globalvars/lists/maintenance_loot.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto c
/obj/item/trash/chips = 1,
/obj/item/trash/popcorn = 1,
/obj/item/trash/sosjerky = 1,
/obj/item/trash/plate = 1,
/obj/item/trash/pistachios = 1,

/obj/item/poster/random_contraband = 1,
Expand Down Expand Up @@ -339,7 +338,6 @@ GLOBAL_LIST_INIT(ratking_trash, list(//Garbage: used by the regal rat mob when s
/obj/item/trash/candy,
/obj/item/trash/chips,
/obj/item/trash/pistachios,
/obj/item/trash/plate,
/obj/item/trash/popcorn,
/obj/item/trash/raisins,
/obj/item/trash/sosjerky,
Expand Down
1 change: 0 additions & 1 deletion code/_onclick/hud/blob_overmind.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@
blobpwrdisplay.icon_state = "block"
blobpwrdisplay.screen_loc = ui_health
blobpwrdisplay.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
blobpwrdisplay.layer = ABOVE_HUD_LAYER
blobpwrdisplay.plane = ABOVE_HUD_PLANE
blobpwrdisplay.hud = src
infodisplay += blobpwrdisplay
Expand Down
5 changes: 1 addition & 4 deletions code/_onclick/hud/radial.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ GLOBAL_LIST_EMPTY(radial_menus)

/atom/movable/screen/radial
icon = 'icons/hud/radial.dmi'
layer = ABOVE_HUD_LAYER
plane = ABOVE_HUD_PLANE
var/datum/radial_menu/parent

Expand Down Expand Up @@ -220,7 +219,6 @@ GLOBAL_LIST_EMPTY(radial_menus)
var/datum/radial_menu_choice/choice_datum = choice_datums[choice_id]
if (choice_datum.info)
var/obj/effect/abstract/info/info_button = new(E, choice_datum.info)
info_button.layer = ABOVE_HUD_LAYER
E.vis_contents += info_button

/datum/radial_menu/New()
Expand Down Expand Up @@ -262,7 +260,6 @@ GLOBAL_LIST_EMPTY(radial_menus)

var/mutable_appearance/MA = new /mutable_appearance(to_extract_from)
if(MA)
MA.layer = ABOVE_HUD_LAYER
MA.appearance_flags |= RESET_TRANSFORM
return MA

Expand All @@ -279,7 +276,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
return
current_user = M.client
//Blank
menu_holder = image(icon='icons/effects/effects.dmi',loc=anchor,icon_state="nothing",layer = ABOVE_HUD_LAYER)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stuff that set that layer didn't really care about value but about having same arbitrary static layer for everything since appearances of contents can have literally anything in there. Removing it can cause issues.

menu_holder = image(icon='icons/effects/effects.dmi',loc=anchor,icon_state="nothing", layer = RADIAL_LAYER)
menu_holder.plane = ABOVE_HUD_PLANE
menu_holder.appearance_flags |= KEEP_APART|RESET_ALPHA|RESET_COLOR|RESET_TRANSFORM
menu_holder.vis_contents += elements + close_button
Expand Down
1 change: 0 additions & 1 deletion code/_onclick/hud/robot.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@
A.screen_loc = "CENTER[x]:16,SOUTH+[y]:7"
else
A.screen_loc = "CENTER+[x]:16,SOUTH+[y]:7"
A.layer = ABOVE_HUD_LAYER
A.plane = ABOVE_HUD_PLANE

x++
Expand Down