diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm
index e9c185d0..04ece117 100644
--- a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm
+++ b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm
@@ -10,5 +10,6 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
/datum/reagent/consumable/lipoifier/on_mob_life(mob/living/carbon/M)
- M.fatness = M.fatness + 10
- return ..()
+ if(M && !HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
+ M.fatness = M.fatness + 10
+ return ..()
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index 06b569f1..2ccde7b3 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -176,6 +176,7 @@
#define TRAIT_PHOTOGRAPHER "photographer"
#define TRAIT_MUSICIAN "musician"
#define TRAIT_CROCRIN_IMMUNE "crocin_immune"
+#define TRAIT_LIPOIFIER_IMMUNE "lipoifier_immune"
#define TRAIT_NYMPHO "nymphomania"
#define TRAIT_DISTANT "headpat_hater"
//#define TRAIT_FLUID_LEAK "leaky_fluids" removed because milk snail trails are not okay
diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm
index 337c4b43..e344db06 100644
--- a/code/datums/traits/neutral.dm
+++ b/code/datums/traits/neutral.dm
@@ -127,6 +127,16 @@
lose_text = "You don't feel as prudish as before."
medical_record_text = "Patient exhibits a special gene that makes them immune to Crocin and Hexacrocin."
+/datum/quirk/lipoifier_immunity
+ name = "Lipoifier Immunity"
+ desc = "Your body is mostly immune to widening properties of Lipoifier chemical and its cheaper alternative."
+ mob_trait = TRAIT_LIPOIFIER_IMMUNE
+ value = 0
+ category = CATEGORY_SEXUAL
+ gain_text = "You feel less prone to sudden weight gain."
+ lose_text = "You don't feel that resistant to gaining sudden weight anymore."
+ medical_record_text = "Patient exhibits a special gene that makes them immune to Lipoifier and Corn Oil."
+
/datum/quirk/assblastusa
name = "Buns of Steel"
desc = "You've never skipped ass day. With this trait, you are completely immune to all forms of ass slapping and anyone who tries to slap your rock hard ass usually gets a broken hand."
@@ -206,4 +216,4 @@
var/mob/living/carbon/human/H = quirk_holder
if(H)
var/datum/species/species = H.dna.species
- species.disliked_food = initial(species.disliked_food)
\ No newline at end of file
+ species.disliked_food = initial(species.disliked_food)
diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm
index 91c7204c..5698fd87 100644
--- a/code/modules/events/vent_clog.dm
+++ b/code/modules/events/vent_clog.dm
@@ -13,7 +13,8 @@
var/list/vents = list()
var/randomProbability = 1
var/reagentsAmount = 100
- var/list/saferChems = list(
+ var/list/saferChems = list(
+ /datum/reagent/consumable/lipoifier,
/datum/reagent/water,
/datum/reagent/carbon,
/datum/reagent/consumable/flour,
@@ -130,6 +131,31 @@
typepath = /datum/round_event/vent_clog/beer
max_occurrences = 0
+// WIP, gonna use it later once I fix ingredients not popping into smoke
+
+// /datum/round_event_control/vent_clog/lipoifier
+// name = "Clogged Vents: Lipoifier"
+// typepath = /datum/round_event/vent_clog/lipoifier
+// weight = 5
+// max_occurrences = 0
+// min_players = 5
+
+// /datum/round_event/vent_clog/lipoifier/start()
+// for(var/obj/machinery/atmospherics/components/unary/vent in vents)
+// if(vent && vent.loc && !vent.welded)
+// var/datum/reagents/R = new/datum/reagents(1000)
+// R.my_atom = vent
+// R.add_reagent(/datum/reagent/consumable/lipoifier, reagentsAmount)
+
+// var/datum/effect_system/foam_spread/foam = new
+// foam.set_up(200, get_turf(vent), R)
+// foam.start()
+// CHECK_TICK
+
+// /datum/round_event/vent_clog/lipoifier
+// reagentsAmount = 20
+
+
/datum/round_event/vent_clog/beer
reagentsAmount = 100
@@ -138,22 +164,6 @@
typepath = /datum/round_event/vent_clog/plasma_decon
max_occurrences = 0
-/datum/round_event_control/vent_clog/female
- name = "Clogged Vents; Girlcum"
- typepath = /datum/round_event/vent_clog/female
- max_occurrences = 0
-
-/datum/round_event/vent_clog/female
- reagentsAmount = 100
-
-/datum/round_event_control/vent_clog/male
- name = "Clogged Vents: Semen"
- typepath = /datum/round_event/vent_clog/male
- max_occurrences = 0
-
-/datum/round_event/vent_clog/male
- reagentsAmount = 100
-
/datum/round_event/vent_clog/beer/announce()
priority_announce("The scrubbers network is experiencing an unexpected surge of pressurized beer. Some ejection of contents may occur.", "Atmospherics alert")
@@ -169,36 +179,6 @@
foam.start()
CHECK_TICK
-/datum/round_event/vent_clog/male/announce()
- priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejaculation of contents may occur.", "Atmospherics alert")
-
-/datum/round_event/vent_clog/male/start()
- for(var/obj/machinery/atmospherics/components/unary/vent in vents)
- if(vent && vent.loc && !vent.welded)
- var/datum/reagents/R = new/datum/reagents(1000)
- R.my_atom = vent
- R.add_reagent(/datum/reagent/consumable/semen, reagentsAmount)
-
- var/datum/effect_system/foam_spread/foam = new
- foam.set_up(200, get_turf(vent), R)
- foam.start()
- CHECK_TICK
-
-/datum/round_event/vent_clog/female/announce()
- priority_announce("The scrubbers network is experiencing a backpressure squirt. Some ejection of contents may occur.", "Atmospherics alert")
-
-/datum/round_event/vent_clog/female/start()
- for(var/obj/machinery/atmospherics/components/unary/vent in vents)
- if(vent && vent.loc && !vent.welded)
- var/datum/reagents/R = new/datum/reagents(1000)
- R.my_atom = vent
- R.add_reagent(/datum/reagent/consumable/femcum, reagentsAmount)
-
- var/datum/effect_system/foam_spread/foam = new
- foam.set_up(200, get_turf(vent), R)
- foam.start()
- CHECK_TICK
-
/datum/round_event/vent_clog/plasma_decon/announce()
priority_announce("We are deploying an experimental plasma decontamination system. Please stand away from the vents and do not breathe the smoke that comes out.", "Central Command Update")
diff --git a/code/modules/projectiles/guns/misc/fatbeam.dm b/code/modules/projectiles/guns/misc/fatbeam.dm
index db1a2c8d..e7f6e783 100644
--- a/code/modules/projectiles/guns/misc/fatbeam.dm
+++ b/code/modules/projectiles/guns/misc/fatbeam.dm
@@ -1,6 +1,6 @@
/obj/item/gun/fatbeam
name = "Fatbeam Gun"
- desc = "New invention of GATO's most degenerate engineers."
+ desc = "New invention of this sector's most degenerate engineers."
icon = 'icons/obj/fatbeam.dmi'
icon_state = "chronogun"
item_state = "chronogun"
@@ -114,7 +114,7 @@
/obj/item/gun/fatbeam/proc/on_beam_tick(var/mob/living/target)
if(target.health != target.maxHealth)
new /obj/effect/temp_visual/heal(get_turf(target), "#FFC2F8")
- target.nutrition += 100
+ target.nutrition += 50
return
/obj/item/gun/fatbeam/proc/on_beam_release(var/mob/living/target)
@@ -123,10 +123,3 @@
/obj/effect/ebeam/medical
name = "fattening beam"
-//////////////////////////////Mech Version///////////////////////////////
-/obj/item/gun/fatbeam/mech
- mounted = 1
-
-/obj/item/gun/fatbeam/mech/Initialize()
- . = ..()
- STOP_PROCESSING(SSobj, src) //Mech mediguns do not process until installed, and are controlled by the holder obj
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index b5384f8a..8c5ac828 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -448,11 +448,17 @@
/datum/reagent/consumable/cornoil
name = "Corn Oil"
description = "An oil derived from various types of corn."
- nutriment_factor = 20 * REAGENTS_METABOLISM
value = 4
color = "#302000" // rgb: 48, 32, 0
taste_description = "slime"
+/datum/reagent/consumable/sprinkles/on_mob_life(mob/living/carbon/M)
+ if(M && !HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
+ target.nutrition += 20 * REAGENTS_METABOLISM
+ else:
+ target.nutrition += 1
+ ..()
+
/datum/reagent/consumable/cornoil/reaction_turf(turf/open/T, reac_volume)
if (!istype(T))
return
diff --git a/icons/effects/beam.dmi b/icons/effects/beam.dmi
index 509be330..4b589afc 100644
Binary files a/icons/effects/beam.dmi and b/icons/effects/beam.dmi differ
diff --git a/icons/obj/fatbeam.dmi b/icons/obj/fatbeam.dmi
index c7105bde..60e2d3e3 100644
Binary files a/icons/obj/fatbeam.dmi and b/icons/obj/fatbeam.dmi differ
diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm
index a35a5f50..3474a465 100644
--- a/modular_citadel/code/datums/status_effects/chems.dm
+++ b/modular_citadel/code/datums/status_effects/chems.dm
@@ -720,7 +720,7 @@
deltaResist *= 0.75
if (owner.reagents.has_reagent(/datum/reagent/drug/aphrodisiacplus))
deltaResist *= 0.5
-
+
//Antag resistance
//cultists are already brainwashed by their god
if(iscultist(owner))