diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm index a0287dafa90..45e5b16df04 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm @@ -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" = ( @@ -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 }, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm index 404814b640a..b484f4eb53c 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm @@ -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" @@ -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" }, @@ -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" @@ -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" }, diff --git a/_maps/RandomRuins/SpaceRuins/derelict2.dmm b/_maps/RandomRuins/SpaceRuins/derelict2.dmm index d383381c0fa..60467ad1bf2 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict2.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict2.dmm @@ -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, diff --git a/_maps/RandomRuins/SpaceRuins/derelict6.dmm b/_maps/RandomRuins/SpaceRuins/derelict6.dmm index fd3b8ba5117..28eaa726f60 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict6.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict6.dmm @@ -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 @@ -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" }, @@ -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) diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 1ee645027bd..c8bf674115b 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -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) diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm index 17786fe38a5..90dbb61ec09 100644 --- a/_maps/RandomZLevels/caves.dmm +++ b/_maps/RandomZLevels/caves.dmm @@ -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" = ( @@ -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" = ( diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index a8c56d2d331..e7ebeb34eed 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -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{ @@ -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 @@ -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 diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index 40e34b64f20..0582be4cc58 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -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 diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index d54bd33b356..eb54daea5ea 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -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" = ( diff --git a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm index 8fef2a78c23..1f7e32bf3db 100644 --- a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm +++ b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm @@ -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) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 116288c5f34..c0516e949ca 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -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{ @@ -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{ diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index d1c97a93e91..9189a11165e 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -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) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index ebc9ce453ac..7d07d7e975a 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -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 }, @@ -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) diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm index d2db3699ab1..03670bcb4dc 100644 --- a/_maps/shuttles/emergency_monastery.dmm +++ b/_maps/shuttles/emergency_monastery.dmm @@ -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) @@ -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) diff --git a/_maps/shuttles/ruin_caravan_victim.dmm b/_maps/shuttles/ruin_caravan_victim.dmm index 258f7cddf8d..a99b74e842e 100644 --- a/_maps/shuttles/ruin_caravan_victim.dmm +++ b/_maps/shuttles/ruin_caravan_victim.dmm @@ -552,7 +552,7 @@ pixel_x = 6; pixel_y = 6 }, -/obj/item/trash/plate{ +/obj/item/plate{ pixel_x = -5; pixel_y = -3 }, diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm index 13190630ad2..cd8473bfe71 100644 --- a/_maps/shuttles/whiteship_box.dmm +++ b/_maps/shuttles/whiteship_box.dmm @@ -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{ diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm index 61495acd491..cdd516b1a47 100644 --- a/_maps/shuttles/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship_delta.dmm @@ -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{ diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index 63c4a6f3f3a..25b355931d9 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -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 }, diff --git a/_maps/templates/holodeck_petpark.dmm b/_maps/templates/holodeck_petpark.dmm index 598001722fc..19f0c95de1b 100644 --- a/_maps/templates/holodeck_petpark.dmm +++ b/_maps/templates/holodeck_petpark.dmm @@ -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 diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index ccc6ee8f9c0..540b7e2135b 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -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 diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index f35d0e7075c..3466ae709b6 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -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, @@ -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, diff --git a/code/_onclick/hud/blob_overmind.dm b/code/_onclick/hud/blob_overmind.dm index d0a15386701..5af4f278788 100644 --- a/code/_onclick/hud/blob_overmind.dm +++ b/code/_onclick/hud/blob_overmind.dm @@ -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 diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm index f84d38eb479..828ecb23568 100644 --- a/code/_onclick/hud/radial.dm +++ b/code/_onclick/hud/radial.dm @@ -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 @@ -222,7 +221,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() @@ -264,7 +262,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 @@ -281,7 +278,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) + 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 diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index d140db11f0e..2ba77eb0fe9 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -240,7 +240,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++ diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index b328f683e8a..259075915e5 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -241,7 +241,6 @@ /atom/movable/screen/close name = "close" - layer = ABOVE_HUD_LAYER plane = ABOVE_HUD_PLANE icon_state = "backpack_close" @@ -529,7 +528,6 @@ mouse_opacity = MOUSE_OPACITY_TRANSPARENT alpha = 128 anchored = TRUE - layer = ABOVE_HUD_LAYER plane = ABOVE_HUD_PLANE /atom/movable/screen/zone_sel/MouseExited(location, control, params) @@ -735,7 +733,6 @@ icon_state = "" mouse_opacity = MOUSE_OPACITY_TRANSPARENT screen_loc = ui_combo - layer = ABOVE_HUD_LAYER var/timerid /atom/movable/screen/combo/proc/clear_streak() diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 959c8a71577..5f6a0f28b5d 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -90,7 +90,6 @@ item_flags = NOBLUDGEON | ABSTRACT | DROPDEL //inhand_icon_state = null w_class = WEIGHT_CLASS_GIGANTIC - layer = ABOVE_HUD_LAYER plane = ABOVE_HUD_PLANE ///Object focused / selected by the TK user diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm index b19c849df07..fac59475e69 100644 --- a/code/datums/components/storage/storage.dm +++ b/code/datums/components/storage/storage.dm @@ -355,7 +355,6 @@ ND.sample_object.mouse_opacity = MOUSE_OPACITY_OPAQUE ND.sample_object.screen_loc = "[cx]:[screen_pixel_x],[cy]:[screen_pixel_y]" ND.sample_object.maptext = MAPTEXT("[(ND.number > 1)? "[ND.number]" : ""]") - ND.sample_object.layer = ABOVE_HUD_LAYER ND.sample_object.plane = ABOVE_HUD_PLANE cx++ if(cx - screen_start_x >= cols) @@ -371,7 +370,6 @@ O.mouse_opacity = MOUSE_OPACITY_OPAQUE //This is here so storage items that spawn with contents correctly have the "click around item to equip" O.screen_loc = "[cx]:[screen_pixel_x],[cy]:[screen_pixel_y]" O.maptext = "" - O.layer = ABOVE_HUD_LAYER O.plane = ABOVE_HUD_PLANE cx++ if(cx - screen_start_x >= cols) @@ -441,7 +439,6 @@ if(QDELETED(O)) continue O.screen_loc = "[cx],[cy]" - O.layer = ABOVE_HUD_LAYER O.plane = ABOVE_HUD_PLANE cx++ if(cx > mx) diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index bf091b98706..5849dae81cb 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -145,7 +145,6 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) P.wear_suit.plane = initial(P.wear_suit.plane) P.wear_suit = null P.wear_suit = new/obj/item/clothing/suit/space(P) - P.wear_suit.layer = ABOVE_HUD_LAYER P.wear_suit.plane = ABOVE_HUD_PLANE P.update_inv_wear_suit() if(P.head) @@ -154,7 +153,6 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) P.head.plane = initial(P.head.plane) P.head = null P.head = new/obj/item/clothing/head/helmet/space(P) - P.head.layer = ABOVE_HUD_LAYER P.head.plane = ABOVE_HUD_PLANE P.update_inv_head() if(P.wear_mask) @@ -163,7 +161,6 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) P.wear_mask.plane = initial(P.wear_mask.plane) P.wear_mask = null P.wear_mask = new/obj/item/clothing/mask/gas(P) - P.wear_mask.layer = ABOVE_HUD_LAYER P.wear_mask.plane = ABOVE_HUD_PLANE P.update_inv_wear_mask() if(P.back) @@ -172,7 +169,6 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) P.back.plane = initial(P.back.plane) P.back = null P.back = new/obj/item/tank/jetpack/oxygen(P) - P.back.layer = ABOVE_HUD_LAYER P.back.plane = ABOVE_HUD_PLANE P.update_inv_back() P.internal = P.back diff --git a/code/game/machinery/dish_drive.dm b/code/game/machinery/dish_drive.dm index 6efd684daac..d987b45fc3f 100644 --- a/code/game/machinery/dish_drive.dm +++ b/code/game/machinery/dish_drive.dm @@ -10,16 +10,14 @@ density = FALSE circuit = /obj/item/circuitboard/machine/dish_drive pass_flags = PASSTABLE - var/list/collectable_items = list(/obj/item/trash/waffles, //SKYRAT EDIT CHANGE: NO STATIC! - /obj/item/trash/plate, + var/list/collectable_items = list(/obj/item/trash/waffles,//SKYRAT EDIT CHANGE: NO STATIC! /obj/item/trash/tray, /obj/item/reagent_containers/glass/bowl, /obj/item/reagent_containers/food/drinks/drinkingglass, /obj/item/kitchen/fork, /obj/item/shard, /obj/item/broken_bottle) - var/list/disposable_items = list(/obj/item/trash/waffles, //SKYRAT EDIT CHANGE: NO STATIC! - /obj/item/trash/plate, + var/list/disposable_items = list(/obj/item/trash/waffles,//SKYRAT EDIT CHANGE: NO STATIC! /obj/item/trash/tray, /obj/item/shard, /obj/item/broken_bottle) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 765dbeb644d..15d05b30183 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -204,7 +204,6 @@ /obj/item/trash/chips = 1, /obj/item/food/deadmouse = 1, /obj/item/trash/pistachios = 1, - /obj/item/trash/plate = 1, /obj/item/trash/popcorn = 1, /obj/item/trash/raisins = 1, /obj/item/trash/sosjerky = 1, diff --git a/code/game/objects/items/food/cake.dm b/code/game/objects/items/food/cake.dm index a1b9a3225eb..fda6af3c055 100644 --- a/code/game/objects/items/food/cake.dm +++ b/code/game/objects/items/food/cake.dm @@ -12,7 +12,6 @@ /obj/item/food/cakeslice icon = 'icons/obj/food/piecake.dmi' - trash_type = /obj/item/trash/plate food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1) tastes = list("cake" = 1) foodtypes = GRAIN | DAIRY diff --git a/code/game/objects/items/food/egg.dm b/code/game/objects/items/food/egg.dm index 689e0282e43..b534d8c0f25 100644 --- a/code/game/objects/items/food/egg.dm +++ b/code/game/objects/items/food/egg.dm @@ -107,7 +107,6 @@ name = "omelette du fromage" desc = "That's all you can say!" icon_state = "omelette" - trash_type = /obj/item/trash/plate food_reagents = list(/datum/reagent/consumable/nutriment/protein = 10, /datum/reagent/consumable/nutriment/vitamin = 3) bite_consumption = 1 w_class = WEIGHT_CLASS_SMALL @@ -138,7 +137,6 @@ desc = "There is only one egg on this, how rude." icon_state = "benedict" food_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment = 3) - trash_type = /obj/item/trash/plate w_class = WEIGHT_CLASS_SMALL tastes = list("egg" = 1, "bacon" = 1, "bun" = 1) foodtypes = MEAT | BREAKFAST | GRAIN @@ -151,4 +149,4 @@ food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/nutriment/vitamin = 1) tastes = list("custard" = 1) foodtypes = MEAT | VEGETABLES - + diff --git a/code/game/objects/items/food/meat.dm b/code/game/objects/items/food/meat.dm index 571db672fc1..cb1b2cde282 100644 --- a/code/game/objects/items/food/meat.dm +++ b/code/game/objects/items/food/meat.dm @@ -7,7 +7,6 @@ name = "\improper Cuban carp" desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!" icon_state = "cubancarp" - trash_type = /obj/item/trash/plate bite_consumption = 3 food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/capsaicin = 1, /datum/reagent/consumable/nutriment/vitamin = 4) tastes = list("fish" = 4, "batter" = 1, "hot peppers" = 1) @@ -106,7 +105,6 @@ name = "corned beef and cabbage" desc = "Now you can feel like a real tourist vacationing in Ireland." icon_state = "cornedbeef" - trash_type = /obj/item/trash/plate food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 4) tastes = list("meat" = 1, "cabbage" = 1) foodtypes = MEAT | VEGETABLES @@ -116,7 +114,6 @@ name = "Filet migrawr" desc = "Because eating bear wasn't manly enough." icon_state = "bearsteak" - trash_type = /obj/item/trash/plate food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 9, /datum/reagent/consumable/ethanol/manly_dorf = 5) tastes = list("meat" = 1, "salmon" = 1) foodtypes = MEAT | ALCOHOL @@ -405,7 +402,6 @@ name = "stewed soy meat" desc = "Even non-vegetarians will LOVE this!" icon_state = "stewedsoymeat" - trash_type = /obj/item/trash/plate food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 2) tastes = list("soy" = 1, "vegetables" = 1) eatverbs = list("slurp","sip","inhale","drink") @@ -419,7 +415,6 @@ name = "boiled spider leg" desc = "A giant spider's leg that's still twitching after being cooked. Gross!" icon_state = "spiderlegcooked" - trash_type = /obj/item/trash/plate food_reagents = list(/datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/consumable/capsaicin = 4, /datum/reagent/consumable/nutriment/vitamin = 2) tastes = list("hot peppers" = 1, "cobwebs" = 1) foodtypes = MEAT @@ -430,7 +425,6 @@ name = "green eggs and ham" desc = "Would you eat them on a train? Would you eat them on a plane? Would you eat them on a state of the art corporate deathtrap floating through space?" icon_state = "spidereggsham" - trash_type = /obj/item/trash/plate food_reagents = list(/datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/nutriment/vitamin = 3) bite_consumption = 4 tastes = list("meat" = 1, "the colour green" = 1) @@ -922,7 +916,7 @@ desc = "A piece of hot spicy meat." icon_state = "meatsteak" food_reagents = list(/datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/nutriment/vitamin = 1) - trash_type = /obj/item/trash/plate + foodtypes = MEAT tastes = list("meat" = 1) burns_on_grill = TRUE @@ -1207,7 +1201,7 @@ food_reagents = list(/datum/reagent/consumable/nutriment/protein = 16, /datum/reagent/consumable/nutriment/vitamin = 4) tastes = list("beef" = 3, "sour cream" = 1, "salt" = 1, "pepper" = 1) foodtypes = MEAT | VEGETABLES | DAIRY - trash_type = /obj/item/trash/plate + w_class = WEIGHT_CLASS_SMALL //basic ingredients, but a lot of them. just covering costs here venue_value = FOOD_PRICE_NORMAL @@ -1232,7 +1226,6 @@ food_reagents = list(/datum/reagent/consumable/nutriment/protein = 7, /datum/reagent/consumable/nutriment/vitamin = 2) tastes = list("beef" = 3, "mushrooms" = 1, "pancetta" = 1) foodtypes = MEAT | VEGETABLES | GRAIN - trash_type = /obj/item/trash/plate w_class = WEIGHT_CLASS_SMALL venue_value = FOOD_PRICE_NORMAL @@ -1243,6 +1236,5 @@ food_reagents = list(/datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/nutriment/vitamin = 4) tastes = list("sausage" = 1, "bacon" = 1, "egg" = 1, "tomato" = 1, "mushrooms" = 1, "bread" = 1, "beans" = 1) foodtypes = MEAT | VEGETABLES | GRAIN | BREAKFAST - trash_type = /obj/item/trash/plate w_class = WEIGHT_CLASS_SMALL venue_value = FOOD_PRICE_EXOTIC diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index 7fe4defef23..8e9df6a1049 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -116,7 +116,7 @@ name = "space fries" desc = "AKA: French Fries, Freedom Fries, etc." icon_state = "fries" - trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment = 4) tastes = list("fries" = 3, "salt" = 1) foodtypes = VEGETABLES | GRAIN | FRIED @@ -144,7 +144,7 @@ name = "soy dope" desc = "Dope from a soy." icon_state = "soydope" - trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 1) tastes = list("soy" = 1) foodtypes = VEGETABLES @@ -154,7 +154,7 @@ name = "cheesy fries" desc = "Fries. Covered in cheese. Duh." icon_state = "cheesyfries" - trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2) tastes = list("fries" = 3, "cheese" = 1) foodtypes = VEGETABLES | GRAIN | DAIRY @@ -185,7 +185,7 @@ name = "carrot fries" desc = "Tasty fries from fresh Carrots." icon_state = "carrotfries" - trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/medicine/oculine = 3, /datum/reagent/consumable/nutriment/vitamin = 2) tastes = list("carrots" = 3, "salt" = 1) foodtypes = VEGETABLES @@ -210,7 +210,7 @@ desc = "It is only wafer thin." icon_state = "mint" bite_consumption = 1 - trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/toxin/minttoxin = 2) foodtypes = TOXIC | SUGAR w_class = WEIGHT_CLASS_TINY @@ -283,7 +283,7 @@ name = "eggplant parmigiana" desc = "The only good recipe for eggplant." icon_state = "eggplantparm" - trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 4) tastes = list("eggplant" = 3, "cheese" = 1) foodtypes = VEGETABLES | DAIRY @@ -344,7 +344,7 @@ name = "yaki imo" desc = "Made with roasted sweet potatoes!" icon_state = "yakiimo" - trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 4) tastes = list("sweet potato" = 1) foodtypes = GRAIN | VEGETABLES | SUGAR @@ -354,7 +354,7 @@ name = "roast parsnip" desc = "Sweet and crunchy." icon_state = "roastparsnip" - trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 4) tastes = list("parsnip" = 1) foodtypes = VEGETABLES diff --git a/code/game/objects/items/food/pie.dm b/code/game/objects/items/food/pie.dm index 042eb7107e1..633259ee6d2 100644 --- a/code/game/objects/items/food/pie.dm +++ b/code/game/objects/items/food/pie.dm @@ -1,6 +1,6 @@ /obj/item/food/pie icon = 'icons/obj/food/piecake.dmi' - trash_type = /obj/item/trash/plate + bite_consumption = 3 w_class = WEIGHT_CLASS_NORMAL max_volume = 80 @@ -12,7 +12,7 @@ /obj/item/food/pieslice name = "pie slice" icon = 'icons/obj/food/piecake.dmi' - trash_type = /obj/item/trash/plate + w_class = WEIGHT_CLASS_TINY food_reagents = list(/datum/reagent/consumable/nutriment = 2) tastes = list("pie" = 1, "uncertainty" = 1) diff --git a/code/game/objects/items/food/sandwichtoast.dm b/code/game/objects/items/food/sandwichtoast.dm index 32bde33b49b..258224bb97c 100644 --- a/code/game/objects/items/food/sandwichtoast.dm +++ b/code/game/objects/items/food/sandwichtoast.dm @@ -3,7 +3,7 @@ desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud." icon = 'icons/obj/food/burgerbread.dmi' icon_state = "sandwich" - trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 7, /datum/reagent/consumable/nutriment/vitamin = 1) tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1) foodtypes = GRAIN | VEGETABLES @@ -14,7 +14,7 @@ desc = "A warm, melty sandwich that goes perfectly with tomato soup." 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/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/carbon = 4) tastes = list("toast" = 2, "cheese" = 3, "butter" = 1) foodtypes = GRAIN @@ -26,7 +26,6 @@ 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 @@ -41,7 +40,7 @@ desc = "You wish you had some peanut butter to go with this..." icon = 'icons/obj/food/burgerbread.dmi' icon_state = "jellysandwich" - trash_type = /obj/item/trash/plate + bite_consumption = 3 tastes = list("bread" = 1, "jelly" = 1) foodtypes = GRAIN @@ -60,7 +59,7 @@ desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache." icon = 'icons/obj/food/burgerbread.dmi' icon_state = "notasandwich" - trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 10) tastes = list("nothing suspicious" = 1) foodtypes = GRAIN | GROSS @@ -71,7 +70,7 @@ desc = "A slice of toast covered with delicious jam." icon = 'icons/obj/food/burgerbread.dmi' icon_state = "jellytoast" - trash_type = /obj/item/trash/plate + bite_consumption = 3 tastes = list("toast" = 1, "jelly" = 1) foodtypes = GRAIN | BREAKFAST diff --git a/code/game/objects/items/food/spaghetti.dm b/code/game/objects/items/food/spaghetti.dm index 525b7b7a5f1..83e03c55ac5 100644 --- a/code/game/objects/items/food/spaghetti.dm +++ b/code/game/objects/items/food/spaghetti.dm @@ -22,7 +22,7 @@ name = "boiled spaghetti" desc = "A plain dish of noodles, this needs more ingredients." icon_state = "spaghettiboiled" - trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1) microwaved_type = null @@ -34,7 +34,7 @@ name = "spaghetti" desc = "Spaghetti and crushed tomatoes. Just like your abusive father used to make!" icon_state = "pastatomato" - trash_type = /obj/item/trash/plate + bite_consumption = 4 food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 4) microwaved_type = null @@ -45,7 +45,7 @@ name = "copypasta" desc = "You probably shouldn't try this, you always hear people talking about how bad it is..." icon_state = "copypasta" - trash_type = /obj/item/trash/plate + bite_consumption = 4 food_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/consumable/tomatojuice = 20, /datum/reagent/consumable/nutriment/vitamin = 8) microwaved_type = null @@ -56,7 +56,7 @@ name = "spaghetti and meatballs" desc = "Now that's a nic'e meatball!" icon_state = "meatballspaghetti" - trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 10, /datum/reagent/consumable/nutriment/vitamin = 2) microwaved_type = null tastes = list("pasta" = 1, "meat" = 1) @@ -66,7 +66,7 @@ name = "spesslaw" desc = "A lawyers favourite." icon_state = "spesslaw" - trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 20, /datum/reagent/consumable/nutriment/vitamin = 3) microwaved_type = null tastes = list("pasta" = 1, "meat" = 1) @@ -75,7 +75,7 @@ name = "chow mein" desc = "A nice mix of noodles and fried vegetables." icon_state = "chowmein" - trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 6) microwaved_type = null tastes = list("noodle" = 1, "tomato" = 1) @@ -94,7 +94,7 @@ name = "butter noodles" desc = "Noodles covered in savory butter. Simple and slippery, but delicious." icon_state = "butternoodles" - trash_type = /obj/item/trash/plate + food_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/nutriment/vitamin = 2) microwaved_type = null tastes = list("noodle" = 1, "butter" = 1) diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index e922244a7a2..be4adb376eb 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -61,11 +61,6 @@ name = "waffles tray" icon_state = "waffles" -/obj/item/trash/plate - name = "plate" - icon_state = "plate" - resistance_flags = NONE - /obj/item/trash/pistachios name = "pistachios pack" icon_state = "pistachios_pack" diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm index c7ad0fd35f9..def92834c46 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm @@ -266,7 +266,7 @@ user.visible_message("[user] unwelded the vent.", "You unweld the vent.", "You hear welding.") welded = FALSE update_appearance() - pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) + pipe_vision_img = image(src, loc, dir = dir) pipe_vision_img.plane = ABOVE_HUD_PLANE investigate_log("was [welded ? "welded shut" : "unwelded"] by [key_name(user)]", INVESTIGATE_ATMOS) add_fingerprint(user) @@ -293,7 +293,7 @@ user.visible_message("[user] furiously claws at [src]!", "You manage to clear away the stuff blocking the vent.", "You hear loud scraping noises.") welded = FALSE update_appearance() - pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) + pipe_vision_img = image(src, loc, dir = dir) pipe_vision_img.plane = ABOVE_HUD_PLANE playsound(loc, 'sound/weapons/bladeslice.ogg', 100, TRUE) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index f31f82aedc4..9bf8756d740 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -279,7 +279,7 @@ user.visible_message("[user] unwelds the scrubber.", "You unweld the scrubber.", "You hear welding.") welded = FALSE update_appearance() - pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) + pipe_vision_img = image(src, loc, dir = dir) pipe_vision_img.plane = ABOVE_HUD_PLANE investigate_log("was [welded ? "welded shut" : "unwelded"] by [key_name(user)]", INVESTIGATE_ATMOS) add_fingerprint(user) @@ -302,7 +302,7 @@ user.visible_message("[user] furiously claws at [src]!", "You manage to clear away the stuff blocking the scrubber.", "You hear loud scraping noises.") welded = FALSE update_appearance() - pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) + pipe_vision_img = image(src, loc,dir = dir) pipe_vision_img.plane = ABOVE_HUD_PLANE playsound(loc, 'sound/weapons/bladeslice.ogg', 100, TRUE) diff --git a/code/modules/buildmode/buttons.dm b/code/modules/buildmode/buttons.dm index 1ac5451bd38..b968858c5a2 100644 --- a/code/modules/buildmode/buttons.dm +++ b/code/modules/buildmode/buttons.dm @@ -1,8 +1,7 @@ /atom/movable/screen/buildmode icon = 'icons/misc/buildmode.dmi' var/datum/buildmode/bd - // If we don't do this, we get occluded by item action buttons - layer = ABOVE_HUD_LAYER + /atom/movable/screen/buildmode/New(bld) bd = bld @@ -23,7 +22,7 @@ bd.toggle_modeswitch() else if(LAZYACCESS(modifiers, RIGHT_CLICK)) bd.mode.change_settings(usr.client) - + update_appearance() return 1 diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 78b16ce3442..f63777503d5 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -1236,7 +1236,6 @@ GLOBAL_LIST_INIT(hallucination_list, list( slots_free += ui_storage2 if(slots_free.len) halitem.screen_loc = pick(slots_free) - halitem.layer = ABOVE_HUD_LAYER halitem.plane = ABOVE_HUD_PLANE switch(rand(1,6)) if(1) //revolver diff --git a/code/modules/food_and_drinks/plate.dm b/code/modules/food_and_drinks/plate.dm new file mode 100644 index 00000000000..6d70729e934 --- /dev/null +++ b/code/modules/food_and_drinks/plate.dm @@ -0,0 +1,62 @@ +/obj/item/plate + name = "plate" + desc = "Holds food, powerful. Good for morale when you're not eating your spaghetti off of a desk." + icon = 'icons/obj/kitchen.dmi' + icon_state = "plate" + w_class = WEIGHT_CLASS_BULKY //No backpack. + ///How many things fit on this plate? + var/max_items = 8 + ///The offset from side to side the food items can have on the plate + var/max_x_offset = 4 + ///The max height offset the food can reach on the plate + var/max_height_offset = 5 + ///Offset of where the click is calculated from, due to how food is positioned in their DMIs. + var/placement_offset = -12 + + +/obj/item/plate/attackby(obj/item/I, mob/user, params) + if(!IS_EDIBLE(I)) + to_chat(user, "[src] is made for food, and food alone!") + return + if(contents.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)) + I.pixel_x = clamp(text2num(LAZYACCESS(modifiers, ICON_X)) - 16, -max_x_offset, max_x_offset) + I.pixel_y = min(text2num(LAZYACCESS(modifiers, ICON_Y)) + placement_offset, max_height_offset) + to_chat(user, "You place [I] on [src].") + AddToPlate(I, user) + update_appearance() + else + return ..() + +/obj/item/plate/pre_attack(atom/A, mob/living/user, params) + if(!iscarbon(A)) + return + if(!contents.len) + return + var/obj/item/object_to_eat = contents[1] + A.attackby(object_to_eat, user) + return TRUE //No normal attack + +///This proc adds the food to viscontents and makes sure it can deregister if this changes. +/obj/item/plate/proc/AddToPlate(obj/item/item_to_plate, mob/user) + vis_contents += item_to_plate + item_to_plate.flags_1 |= IS_ONTOP_1 + RegisterSignal(item_to_plate, COMSIG_MOVABLE_MOVED, .proc/ItemMoved) + RegisterSignal(item_to_plate, COMSIG_PARENT_QDELETING, .proc/ItemMoved) + +///This proc cleans up any signals on the item when it is removed from a plate, and ensures it has the correct state again. +/obj/item/plate/proc/ItemRemovedFromPlate(obj/item/removed_item) + removed_item.flags_1 &= ~IS_ONTOP_1 + vis_contents -= removed_item + UnregisterSignal(removed_item, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) + +///This proc is called by signals that remove the food from the plate. +/obj/item/plate/proc/ItemMoved(obj/item/moved_item, atom/OldLoc, Dir, Forced) + SIGNAL_HANDLER + ItemRemovedFromPlate(moved_item) diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 67e062c05be..c25d64fc236 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -162,7 +162,6 @@ dropItemToGround(get_item_for_held_index(hand_index), force = TRUE) I.forceMove(src) held_items[hand_index] = I - I.layer = ABOVE_HUD_LAYER I.plane = ABOVE_HUD_PLANE I.equipped(src, ITEM_SLOT_HANDS) if(QDELETED(I)) // this is here because some ABSTRACT items like slappers and circle hands could be moved from hand to hand then delete, which meant you'd have a null in your hand until you cleared it (say, by dropping it) diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm index 396af139c9a..3434737f091 100644 --- a/code/modules/mob/living/carbon/inventory.dm +++ b/code/modules/mob/living/carbon/inventory.dm @@ -45,7 +45,6 @@ if(observe.client) observe.client.screen -= I I.forceMove(src) - I.layer = ABOVE_HUD_LAYER I.plane = ABOVE_HUD_PLANE I.appearance_flags |= NO_CLIENT_COLOR var/not_handled = FALSE diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index 039b72bd76e..771ef47fec5 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -66,7 +66,6 @@ held_items[module_num] = item_module item_module.equipped(src, ITEM_SLOT_HANDS) item_module.mouse_opacity = initial(item_module.mouse_opacity) - item_module.layer = ABOVE_HUD_LAYER item_module.plane = ABOVE_HUD_PLANE item_module.forceMove(src) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm index f560043a0df..b204d01ed7c 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm @@ -59,7 +59,6 @@ I.screen_loc = null // will get moved if inventory is visible I.forceMove(src) - I.layer = ABOVE_HUD_LAYER I.plane = ABOVE_HUD_PLANE switch(slot) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm b/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm index 268c8f6333a..f6cef5d60a1 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm @@ -35,7 +35,6 @@ hands_overlays += r_hand_overlay if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD) - r_hand.layer = ABOVE_HUD_LAYER r_hand.plane = ABOVE_HUD_PLANE r_hand.screen_loc = ui_hand_position(get_held_index_of_item(r_hand)) client.screen |= r_hand @@ -48,7 +47,6 @@ hands_overlays += l_hand_overlay if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD) - l_hand.layer = ABOVE_HUD_LAYER l_hand.plane = ABOVE_HUD_PLANE l_hand.screen_loc = ui_hand_position(get_held_index_of_item(l_hand)) client.screen |= l_hand diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 609232c8d42..b522cf5a42c 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -305,7 +305,6 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians I.screen_loc = null // will get moved if inventory is visible I.forceMove(src) I.equipped(src, slot) - I.layer = ABOVE_HUD_LAYER I.plane = ABOVE_HUD_PLANE /mob/living/simple_animal/hostile/guardian/proc/apply_overlay(cache_index) @@ -328,7 +327,6 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians hands_overlays += r_hand.build_worn_icon(default_layer = GUARDIAN_HANDS_LAYER, default_icon_file = r_hand.righthand_file, isinhands = TRUE) if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD) - r_hand.layer = ABOVE_HUD_LAYER r_hand.plane = ABOVE_HUD_PLANE r_hand.screen_loc = ui_hand_position(get_held_index_of_item(r_hand)) client.screen |= r_hand @@ -337,7 +335,6 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians hands_overlays += l_hand.build_worn_icon(default_layer = GUARDIAN_HANDS_LAYER, default_icon_file = l_hand.lefthand_file, isinhands = TRUE) if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD) - l_hand.layer = ABOVE_HUD_LAYER l_hand.plane = ABOVE_HUD_PLANE l_hand.screen_loc = ui_hand_position(get_held_index_of_item(l_hand)) client.screen |= l_hand diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index f840a9d6f36..c82c99b67bd 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -675,7 +675,6 @@ if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD) for(var/obj/item/I in held_items) var/index = get_held_index_of_item(I) - I.layer = ABOVE_HUD_LAYER I.plane = ABOVE_HUD_PLANE I.screen_loc = ui_hand_position(index) client.screen |= I diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm index 4adf7dbe5a4..032c767c24e 100644 --- a/code/modules/mob/living/ventcrawling.dm +++ b/code/modules/mob/living/ventcrawling.dm @@ -31,7 +31,7 @@ return if(ventcrawl_target.welded) to_chat(src, "You can't crawl around a welded vent!") - return + return if(vent_movement & VENTCRAWL_ENTRANCE_ALLOWED) //Handle the exit here @@ -68,12 +68,12 @@ return ..() /** - * Everything related to pipe vision on ventcrawling is handled by update_pipe_vision(). + * Everything related to pipe vision on ventcrawling is handled by update_pipe_vision(). * Called on exit, entrance, and pipenet differences (e.g. moving to a new pipenet). * One important thing to note however is that the movement of the client's eye is handled by the relaymove() proc in /obj/machinery/atmospherics. * We move first and then call update. Dont flip this around */ -/mob/living/proc/update_pipe_vision() +/mob/living/proc/update_pipe_vision() // Take the pipe images from the client if (!isnull(client)) for(var/image/current_image in pipes_shown) @@ -100,7 +100,7 @@ continue if(!pipenet_part.pipe_vision_img) - pipenet_part.pipe_vision_img = image(pipenet_part, pipenet_part.loc, layer = ABOVE_HUD_LAYER, dir = pipenet_part.dir) + pipenet_part.pipe_vision_img = image(pipenet_part, pipenet_part.loc, dir = pipenet_part.dir) pipenet_part.pipe_vision_img.plane = ABOVE_HUD_PLANE client.images += pipenet_part.pipe_vision_img pipes_shown += pipenet_part.pipe_vision_img diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm index fb3ba814747..c0ff9daf7e3 100644 --- a/code/modules/vending/drinnerware.dm +++ b/code/modules/vending/drinnerware.dm @@ -17,7 +17,8 @@ /obj/item/clothing/suit/apron/chef = 2, /obj/item/kitchen/rollingpin = 2, /obj/item/kitchen/knife = 2, - /obj/item/book/granter/crafting_recipe/cooking_sweets_101 = 2 + /obj/item/book/granter/crafting_recipe/cooking_sweets_101 = 2, + /obj/item/plate = 10 ) contraband = list( /obj/item/kitchen/rollingpin = 2, diff --git a/icons/obj/food/burgerbread.dmi b/icons/obj/food/burgerbread.dmi index 6b69b92595f..8e3019d192d 100644 Binary files a/icons/obj/food/burgerbread.dmi and b/icons/obj/food/burgerbread.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 13a19ca09fc..bbb0137291f 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/food/piecake.dmi b/icons/obj/food/piecake.dmi index c05ec3381fd..45d3fcecb72 100644 Binary files a/icons/obj/food/piecake.dmi and b/icons/obj/food/piecake.dmi differ diff --git a/icons/obj/food/pizzaspaghetti.dmi b/icons/obj/food/pizzaspaghetti.dmi index 29fd37da9cd..39fda74c97d 100644 Binary files a/icons/obj/food/pizzaspaghetti.dmi and b/icons/obj/food/pizzaspaghetti.dmi differ diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index e1a940783ee..a5eedd53cc5 100644 Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ diff --git a/modular_skyrat/master_files/code/_globalvars/maint_loot_trash.dm b/modular_skyrat/master_files/code/_globalvars/maint_loot_trash.dm index 07eb7d9f358..cb2350a5bcf 100644 --- a/modular_skyrat/master_files/code/_globalvars/maint_loot_trash.dm +++ b/modular_skyrat/master_files/code/_globalvars/maint_loot_trash.dm @@ -34,7 +34,6 @@ GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto c /obj/item/trash/chips = 50, /obj/item/trash/energybar = 50, /obj/item/trash/pistachios = 50, - /obj/item/trash/plate = 50, /obj/item/trash/popcorn = 50, /obj/item/trash/raisins = 50, /obj/item/trash/semki = 50, diff --git a/modular_skyrat/master_files/code/_globalvars/~maint_loot.dm b/modular_skyrat/master_files/code/_globalvars/~maint_loot.dm index e82276f598e..c927676e6b2 100644 --- a/modular_skyrat/master_files/code/_globalvars/~maint_loot.dm +++ b/modular_skyrat/master_files/code/_globalvars/~maint_loot.dm @@ -12,7 +12,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, diff --git a/tgstation.dme b/tgstation.dme index b404ce43b92..ce2aab89bfc 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2157,6 +2157,7 @@ #include "code\modules\flufftext\Hallucination.dm" #include "code\modules\food_and_drinks\food.dm" #include "code\modules\food_and_drinks\pizzabox.dm" +#include "code\modules\food_and_drinks\plate.dm" #include "code\modules\food_and_drinks\drinks\drinks.dm" #include "code\modules\food_and_drinks\drinks\drinks\bottle.dm" #include "code\modules\food_and_drinks\drinks\drinks\drinkingglass.dm"