Monkestation · dwasint · Oct 16, 2023 · Sep 18, 2023 · Sep 22, 2023 · Sep 24, 2023
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -84361,6 +84361,11 @@
 	},
 /turf/open/floor/iron,
 /area/station/commons/dorms)
+"uCq" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/loafer,
+/turf/open/floor/plating,
+/area/station/maintenance/department/security)
 "uCt" = (
 /obj/effect/spawner/random/structure/chair_maintenance{
 	dir = 1
@@ -151776,7 +151781,7 @@ adM
 uHP
 dth
 fws
-vHY
+uCq
 rYA
 vHY
 hie

diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -30106,6 +30106,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/mine/production)
+"jLk" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/spawner/random/loafer,
+/turf/open/floor/plating,
+/area/station/security/prison/safe)
 "jLl" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
 /obj/effect/turf_decal/siding/yellow{
@@ -170915,7 +170922,7 @@ wRa
 vVH
 nRO
 ulz
-ulz
+jLk
 ulz
 pNm
 eOz

diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -39676,6 +39676,10 @@
 /obj/machinery/duct,
 /turf/open/floor/plating,
 /area/station/maintenance/port/aft)
+"omE" = (
+/obj/effect/spawner/random/loafer,
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
 "omF" = (
 /obj/machinery/teleport/station,
 /obj/machinery/status_display/evac/directional/north,
@@ -90451,7 +90455,7 @@ aaa
 bxr
 jXu
 rOz
-sHu
+omE
 siY
 jXu
 aaa

diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
@@ -61887,6 +61887,7 @@
 /turf/open/floor/iron/white,
 /area/station/medical/storage)
 "sQY" = (
+/obj/effect/spawner/random/loafer,
 /turf/open/floor/iron/smooth,
 /area/station/maintenance/department/eva)
 "sQZ" = (

diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm
@@ -70,6 +70,9 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 /// Yes I know this is a stupid flag, no you can't take him from me
 #define DECAL_INIT_UPDATE_EXPERIENCED_1 (1<<20)
 
+/// Used for items that cannot be used directly to harm people with, ex. loafs
+#define CANNOT_ATTACK_WITH (1<<21)
+
 // Update flags for [/atom/proc/update_appearance]
 /// Update the atom's name
 #define UPDATE_NAME (1<<0)

diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm
@@ -219,7 +219,7 @@ SUBSYSTEM_DEF(throwing)
 	if (callback)
 		callback.Invoke()
 
-	if(!thrownthing.currently_z_moving) // I don't think you can zfall while thrown but hey, just in case.
+	if(!thrownthing?.currently_z_moving) // I don't think you can zfall while thrown but hey, just in case.
 		var/turf/T = get_turf(thrownthing)
 		T?.zFall(thrownthing)
 

diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm
@@ -310,7 +310,12 @@ Behavior that's still missing from this component that original food items had t
 
 	var/atom/owner = parent
 
-	if((feeder.istate & ISTATE_HARM))
+	var/obj/item/food/foodstuff
+
+	if(istype(owner, /obj/item/food))
+		foodstuff = owner
+
+	if((feeder.istate & ISTATE_HARM) && !(foodstuff?.force_feed_on_aggression)) //monkestation edit - add loafing
 		return
 
 	. = COMPONENT_CANCEL_ATTACK_CHAIN //Point of no return I suppose

diff --git a/code/game/objects/items/food/_food.dm b/code/game/objects/items/food/_food.dm
@@ -46,7 +46,8 @@
 	var/decomp_req_handle = FALSE
 	///Used to set custom decomposition times for food. Set to 0 to have it automatically set via the food's flags.
 	var/decomposition_time = 0
-
+	///If we want to still force feed food even on combat mode or harm intent - monkestation edit
+	var/force_feed_on_aggression = FALSE
 	///The food buffs the food has
 	var/food_buffs = STATUS_EFFECT_FOOD_STAM_MEDIUM
 

diff --git a/monkestation/code/modules/loafing/README.txt b/monkestation/code/modules/loafing/README.txt
@@ -0,0 +1,41 @@
+## Title: <!--Title of your addition-->
+
+<!-- uppercase, underscore_connected name of your module, that you use to mark files-->
+MODULE ID: LOAFING
+
+### Description:
+
+This module adds a loafing mechanic.
+
+<!-- Here, try to describe what your PR does, what features it provides and any other directly useful information -->
+
+### TG Proc/File Changes:
+
+changed /datum/component/edible/proc/TryToEat(mob/living/eater, mob/living/feeder) in edible.dm
+changed _food.dm
+
+
+<!-- If you had to edit, or append to any core procs in the process of making this PR, list them here. APPEND: Also, please include any files that you've changed. .DM files that is. -->
+
+### Defines:
+
+<!-- If you needed to add any defines, mention the files you added those defines in -->
+
+
+### Master file additions
+
+- N/A
+<!-- Any master file changes you've made to existing master files or if you've added a new master file. Please mark either as #NEW or #CHANGE -->
+
+### Included files that are not contained in this module:
+
+- N/A
+<!-- Likewise, be it a non-modular file or a modular one that's not contained within the folder belonging to this specific module, it should be mentioned here -->
+
+### Credits:
+
+<!-- Here go the credits to you, dear coder, and in case of collaborative work or ports, credits to the original source of the code -->
+<!-- Orignal Coders -->
+Code and sprites done by Lmenvs.  Concept from Goon.
+<!-- Orignal Coders -->
+