Weekly Upstream Update PR

.github/workflows/size_labeling.yml

@@ -0,0 +1,11 @@
+name: Size-Based Labeling
+on: pull_request_target
+jobs:
+  size-label:
+    runs-on: ubuntu-latest
+    steps:
+      - name: size-label
+        uses: "pascalgn/[email protected]"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          IGNORED: "**/*.bundle.*\n**/*.chunk.*" # **/*.dmm\n

_std/defines/atom.dm

@@ -1,5 +1,7 @@
 //where did the contents of _setup.dm go? "gone, reduced to atom"
 
+#define isatom(A) (isloc(A))
+
 //temp_flags lol for atoms and im gonna be constantly adding and removing these
 //this doesn't entirely make sense, cause some other flags are temporary too! ok im runnign otu OF FUCKING SPACE
 #define SPACE_PUSHING 1 //used for removing us from mantapush list when we get deleted

_std/defines/component_defines.dm

@@ -87,6 +87,8 @@
 #define COMSIG_ITEM_ATTACK_POST "itm_atk_post"
 /// Just before an item is eaten
 #define COMSIG_ITEM_CONSUMED_PRE "itm_atk_consumed_pre"
+/// When an item is eaten
+#define COMSIG_ITEM_CONSUMED "itm_atk_consumed"
 /// After an item's been eaten, but there's still some left
 #define COMSIG_ITEM_CONSUMED_PARTIAL "itm_atk_consumed_partial"
 /// After we've consumed an item
@@ -207,4 +209,4 @@
 // ---- fullauto UI thingy signals ----
 #define COMSIG_FULLAUTO_MOUSEDOWN "fullauto_mousedown"
 #define COMSIG_FULLAUTO_MOUSEDRAG "fullauto_mousedrag"
-#define COMSIG_GUN_PROJECTILE_CHANGED "gun_proj_changed"
+#define COMSIG_GUN_PROJECTILE_CHANGED "gun_proj_changed"

_std/defines/item.dm

@@ -99,26 +99,7 @@
 #define ITEM_RARITY_MYTHIC 7
 
 // item comp defs
-// For COMSIG_ITEM_CONSUMED_PRE returns
-/// Turns out its edible
-#define THING_IS_EDIBLE		(1<<0)
-/// Needs a fork
-#define EATING_NEEDS_A_FORK					(1<<1)
-/// Needs a spoon
-#define EATING_NEEDS_A_SPOON				(1<<2)
-
-// on_bite defs
-/// Mob can be healed by this food-thing
-#define MOB_HEALTH_ABOVE_FOODHEAL_CUTOFF (1<<0)
-
-// mob health foodheal threshold checks
-/// The typical food-heal health cutoff, if the mob's current health is less than their max health divided by this, food wont heal them
-/// So for a mob with 100 max health, they'll be healed by food as long as their current health is above ~55 HP
-#define FOODHEAL_CUTOFF_DIVISOR 1.8
-/// Same as above, but if the mob has the survivalist trait.
-/// For the same 100 max health mob, they'll be healed by food until their current health is below 10 HP
-#define FOODHEAL_CUTOFF_DIVISOR_SURVIVALIST 10
-
+#define FORCE_EDIBILITY 1
 //item attack bitflags
 /// The pre-attack signal doesnt want the attack to continue, so don't
 #define ATTACK_PRE_DONT_ATTACK 1

_std/macros/ismob.dm

@@ -4,8 +4,6 @@
 
 //this is the home for checks of mob types
 
-/// Returns true if the given x is a mob
-#define ismob(x) istype(x, /mob)
 /// Returns true if the given x is an observer
 #define isobserver(x) istype(x, /mob/dead)
 /// Returns true if the given x is an observer and an admin
@@ -16,6 +14,7 @@
 
 #define iscarbon(x) istype(x, /mob/living/carbon)
 #define ismonkey(x) (istype(x, /mob/living/carbon/human) && istype(x:mutantrace, /datum/mutantrace/monkey))
+#define isnpc(x) istype(x, /mob/living/carbon/human/npc)
 #define isnpcmonkey(x) (istype(x,/mob/living/carbon/human/npc/monkey) && istype(x:mutantrace, /datum/mutantrace/monkey))
 #define ishuman(x) istype(x, /mob/living/carbon/human)
 #define iscow(x) (istype(x, /mob/living/carbon/human) && istype(x:mutantrace, /datum/mutantrace/cow))

assets/maps/prefabs/prefab_clown_nest.dmm

@@ -17,7 +17,7 @@
 "mM" = (/obj/item/material_piece/cloth/spidersilk{pixel_x = 3; pixel_y = 2},/turf/simulated/floor/plating/airless/asteroid,/area/prefab/clown_nest)
 "om" = (/turf/simulated/floor/airless/solar,/area/noGenerate)
 "oz" = (/turf/simulated/wall/asteroid{name_old = "hardened"},/area/prefab/clown_nest)
-"oS" = (/obj/decal/cleanable/vomit/spiders,/obj/item/reagent_containers/food/snacks/ingredient/meat/mysterymeat{icon = 'icons/effects/blood.dmi'; icon_state = "gibhead"; name = "grody thing"},/obj/item/reagent_containers/food/drinks/milk/cluwnespider{pixel_x = 4; pixel_y = 4},/turf/simulated/floor/plating/airless/asteroid,/area/prefab/clown_nest)
+"oS" = (/obj/decal/cleanable/vomit/spiders,/obj/item/reagent_containers/food/snacks/ingredient/meat/mysterymeat{icon = 'icons/effects/blood.dmi'; icon_state = "gibhead"; name = "grody thing"},/obj/item/reagent_containers/food/drinks/milk/clownspider{pixel_x = 4; pixel_y = 4},/turf/simulated/floor/plating/airless/asteroid,/area/prefab/clown_nest)
 "pG" = (/obj/decal/cleanable/dirt/dirt3,/turf/simulated/floor/plating/airless/asteroid,/area/prefab/clown_nest)
 "rg" = (/obj/item/clothing/gloves/latex/pink{pixel_x = 3; pixel_y = 3},/obj/item/reagent_containers/food/drinks/milk/clownspider{layer = 2; pixel_x = -2; pixel_y = 5},/turf/simulated/floor/plating/airless/asteroid,/area/prefab/clown_nest)
 "rj" = (/obj/wingrille_spawn/auto/tuff,/turf/simulated/floor/airless/plating,/area/prefab/clown_nest)

assets/maps/prefabs/prefab_water_beetrader.dmm

@@ -1,40 +1,40 @@
 "a" = (/turf/unsimulated/wall/setpieces/hive,/area/bee_trader)
 "b" = (/turf/variableTurf/clear,/area/space)
-"c" = (/obj/item/cigbutt,/obj/item/cigbutt{pixel_x = -6; pixel_y = 8},/obj/table/wood/auto,/obj/item/reagent_containers/food/snacks/ice_cream/random,/obj/machinery/light/incandescent/warm{icon_state = "tube1"; dir = 1},/turf/simulated/floor/specialroom/cafeteria,/area/bee_trader)
+"c" = (/obj/item/cigbutt,/obj/item/cigbutt{pixel_x = -6; pixel_y = 8},/obj/table/wood/auto,/obj/item/reagent_containers/food/snacks/ice_cream/random,/obj/machinery/light/incandescent/warm{dir = 1; icon_state = "tube1"},/turf/simulated/floor/specialroom/cafeteria,/area/bee_trader)
 "d" = (/obj/table/wood/auto,/obj/item/reagent_containers/food/snacks/breadloaf/corn/sweet/honey,/obj/item/reagent_containers/food/snacks/breadloaf/honeywheat{pixel_x = -2; pixel_y = 4},/obj/item/reagent_containers/food/snacks/cake/cream{pixel_y = 4},/turf/simulated/floor/specialroom/cafeteria,/area/bee_trader)
 "e" = (/obj/storage/crate/freezer,/obj/item/reagent_containers/food/snacks/beefood{pixel_x = 3; pixel_y = -3},/obj/item/reagent_containers/food/snacks/beefood,/obj/item/reagent_containers/food/snacks/beefood{pixel_x = -2; pixel_y = 2},/obj/item/reagent_containers/food/snacks/ingredient/royal_jelly,/obj/item/reagent_containers/food/snacks/ingredient/royal_jelly{pixel_x = 4; pixel_y = 2},/obj/item/reagent_containers/food/snacks/ingredient/honey{pixel_x = 3; pixel_y = -3},/obj/item/reagent_containers/food/snacks/ingredient/honey,/turf/simulated/floor/specialroom/cafeteria,/area/bee_trader)
 "f" = (/turf/simulated/floor/specialroom/cafeteria,/area/bee_trader)
 "g" = (/obj/table/wood/auto,/obj/item/reagent_containers/food/snacks/goldfish_cracker{pixel_x = 2; pixel_y = -2},/obj/item/reagent_containers/food/snacks/goldfish_cracker,/obj/item/reagent_containers/food/snacks/cereal_box/honey{pixel_x = -4; pixel_y = 4},/turf/simulated/floor/specialroom/cafeteria,/area/bee_trader)
 "h" = (/obj/table/wood/auto,/obj/machinery/computer/security/wooden_tv{desc = "These channels seem to mostly be about robuddies. What is this, some kind of reality show?"; name = "Television"; network = "Zeta"; pixel_x = 0; pixel_y = 4},/turf/simulated/floor/specialroom/cafeteria,/area/bee_trader)
 "i" = (/obj/reagent_dispensers/beerkeg,/turf/simulated/floor/specialroom/cafeteria,/area/bee_trader)
-"j" = (/obj/item/cigbutt,/obj/item/cigbutt{pixel_x = -4; pixel_y = 4},/obj/item/cigbutt{pixel_y = 8},/obj/stool/chair/couch{icon_state = "chair_couch-brown"; dir = 9},/turf/simulated/floor/specialroom/cafeteria,/area/bee_trader)
-"k" = (/obj/stool/chair/couch{icon_state = "chair_couch-brown"; dir = 5},/turf/simulated/floor/specialroom/cafeteria,/area/bee_trader)
+"j" = (/obj/item/cigbutt,/obj/item/cigbutt{pixel_x = -4; pixel_y = 4},/obj/item/cigbutt{pixel_y = 8},/obj/stool/chair/couch{dir = 9; icon_state = "chair_couch-brown"},/turf/simulated/floor/specialroom/cafeteria,/area/bee_trader)
+"k" = (/obj/stool/chair/couch{dir = 5; icon_state = "chair_couch-brown"},/turf/simulated/floor/specialroom/cafeteria,/area/bee_trader)
 "l" = (/turf/simulated/wall/false_wall/hive,/area/bee_trader)
-"m" = (/obj/stool/chair/couch{icon_state = "chair_couch-brown"; dir = 8},/obj/machinery/light/incandescent/warm{icon_state = "tube1"; dir = 1},/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)
-"n" = (/obj/stool/chair/couch{icon_state = "chair_couch-brown"; dir = 4},/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)
+"m" = (/obj/stool/chair/couch{dir = 8; icon_state = "chair_couch-brown"},/obj/machinery/light/incandescent/warm{dir = 1; icon_state = "tube1"},/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)
+"n" = (/obj/stool/chair/couch{dir = 4; icon_state = "chair_couch-brown"},/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)
 "o" = (/obj/wingrille_spawn/auto,/turf/simulated/floor/white,/area/bee_trader)
 "p" = (/obj/shrub,/turf/simulated/floor/white,/area/bee_trader)
 "q" = (/obj/submachine/ATM{pixel_x = -32; pixel_y = 0},/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)
 "r" = (/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)
 "s" = (/turf/simulated/floor/white,/area/bee_trader)
-"t" = (/obj/machinery/light/incandescent/warm{icon_state = "tube1"; dir = 1},/turf/simulated/floor/white,/area/bee_trader)
-"u" = (/obj/item/paper{info = "gone fishin! -bombini"; name = "sweet, sticky note"},/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)
-"v" = (/turf/simulated/floor/stairs/medical/wide{icon_state = "medstairs_wide"; dir = 4},/area/bee_trader)
+"t" = (/obj/machinery/light/incandescent/warm{dir = 1; icon_state = "tube1"},/turf/simulated/floor/white,/area/bee_trader)
+"u" = (/obj/npc/trader/bee{dir = 4},/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)
+"v" = (/turf/simulated/floor/stairs/medical/wide{dir = 4; icon_state = "medstairs_wide"},/area/bee_trader)
 "w" = (/turf/variableTurf/clear,/area/noGenerate)
 "x" = (/obj/critter/domestic_bee,/turf/simulated/floor/white,/area/bee_trader)
 "y" = (/obj/machinery/drainage/big,/turf/simulated/floor/white,/area/bee_trader)
 "z" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/floor/white,/area/bee_trader)
-"A" = (/obj/decal/fakeobjects/cargopad,/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)
-"B" = (/turf/simulated/floor/stairs/medical/wide/other{icon_state = "medstairs2_wide"; dir = 4},/area/bee_trader)
+"A" = (/obj/decal/fakeobjects/cargopad,/obj/marker/supplymarker,/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)
+"B" = (/turf/simulated/floor/stairs/medical/wide/other{dir = 4; icon_state = "medstairs2_wide"},/area/bee_trader)
 "C" = (/obj/machinery/light/incandescent/warm,/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)
 "D" = (/obj/machinery/light/incandescent/warm,/turf/simulated/floor/white,/area/bee_trader)
 "E" = (/obj/critter/domestic_bee/buddy,/turf/simulated/floor/white,/area/bee_trader)
-"F" = (/obj/stool/chair/comfy{icon_state = "chair_comfy"; dir = 4},/obj/critter/domestic_bee/overbee,/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)
+"F" = (/obj/stool/chair/comfy{dir = 4; icon_state = "chair_comfy"},/obj/critter/domestic_bee/overbee,/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)
 "G" = (/obj/table/wood/auto,/obj/shrub{dir = 2; icon = 'icons/obj/stationobjs.dmi'; icon_state = "plant_small"; layer = 3; pixel_y = 18},/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)
 "H" = (/obj/table/auto,/obj/item/reagent_containers/food/snacks/ingredient/egg/bee/moon{pixel_y = 6},/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)
 "I" = (/obj/table/auto,/obj/item/device/camera_viewer,/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)
 "J" = (/obj/decal/fakeobjects{anchored = 1; density = 1; desc = "An older biopod for the creation of space bee eggs."; icon = 'icons/obj/cloning.dmi'; icon_state = "pod_0"; name = "egg generator pod"},/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)
-"K" = (/obj/stool/chair/office{icon_state = "office_chair"; dir = 1},/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)
+"K" = (/obj/stool/chair/office{dir = 1; icon_state = "office_chair"},/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)
 "L" = (/obj/table/auto,/obj/item/record/honey,/obj/machinery/light/incandescent/warm,/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)
 "M" = (/obj/item/device/gps{identifier = "BEE1"},/turf/simulated/floor{icon_state = "hive"},/area/bee_trader)