cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-23 13:06:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

various lil additions and fixes

Browse Source 
- new trait: lipolifier immunity (WIP version, possibly breaks corn oil gains)
- new event: lipolifier vent clog (WIP)
- removed cum vent clog events
- finished working on fatbeam (new sprites)
This commit is contained in:
GDLW
2022-11-07 17:38:56 +01:00
parent cd0fbc2148
commit 46a27d6291
9 changed files with 52 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm
+3 -2
View File
@@ -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 ..()
code/__DEFINES/traits.dm
+1
View File
@@ -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
code/datums/traits/neutral.dm
+11 -1
View File
@@ -127,6 +127,16 @@
lose_text = "<span class='notice'>You don't feel as prudish as before.</span>"
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 = "<span class='notice'>You feel less prone to sudden weight gain.</span>"
lose_text = "<span class='notice'>You don't feel that resistant to gaining sudden weight anymore.</span>"
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)
species.disliked_food = initial(species.disliked_food)
code/modules/events/vent_clog.dm
+27 -47
View File
@@ -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")
code/modules/projectiles/guns/misc/fatbeam.dm
+2 -9
View File
@@ -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
code/modules/reagents/chemistry/reagents/food_reagents.dm
+7 -1
View File
@@ -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
icons/effects/beam.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 124 KiB

After

Width:  |  Height:  |  Size: 123 KiB

icons/obj/fatbeam.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

modular_citadel/code/datums/status_effects/chems.dm
+1 -1
View File
@@ -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))