From f303300f6eee02a180ffcddbb1ec437bead8d5c2 Mon Sep 17 00:00:00 2001 From: Sonoida Date: Thu, 6 Apr 2023 20:55:08 +0200 Subject: [PATCH] fixed the sleep damage eye blur effect woo! yippie (also renamed some of my older comments) --- .../reagents/chemistry/reagents/consumable_reagents.dm | 2 +- GainStation13/code/obj/weapons/fatoray.dm | 4 ++-- code/__DEFINES/combat.dm | 8 ++++---- code/datums/weather/weather_types/radiation_storm.dm | 2 +- code/game/area/areas/ruins/space.dm | 2 +- code/modules/antagonists/nukeop/equipment/nuclearbomb.dm | 2 +- code/modules/awaymissions/corpse.dm | 2 +- code/modules/client/preferences.dm | 2 +- code/modules/events/heart_attack.dm | 2 +- code/modules/events/spontaneous_appendicitis.dm | 2 +- code/modules/food_and_drinks/food/snacks_pastry.dm | 2 +- code/modules/mob/living/carbon/carbon_defines.dm | 1 - code/modules/mob/living/carbon/human/human.dm | 2 +- code/modules/mob/living/damage_procs.dm | 6 +----- modular_citadel/code/modules/client/loadout/head.dm | 2 +- 15 files changed, 18 insertions(+), 23 deletions(-) diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm index c4d8bacd..b931888a 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm @@ -70,7 +70,7 @@ to_chat(M,"You feel substantially bloated...") if(M.reagents.get_reagent_amount(/datum/reagent/consumable/flatulose) > 3) to_chat(M,"You feel pretty gassy...") - M.emote(pick("brap","fart")) + M.emote(pick("brap","fart")) // we gotta categorize this into "slob" category or something later! - GDLW2 ..() else return ..() diff --git a/GainStation13/code/obj/weapons/fatoray.dm b/GainStation13/code/obj/weapons/fatoray.dm index bdf15991..8876532c 100644 --- a/GainStation13/code/obj/weapons/fatoray.dm +++ b/GainStation13/code/obj/weapons/fatoray.dm @@ -39,7 +39,7 @@ /obj/item/gun/energy/fatoray/cannon name = "Fatoray Cannon" desc = "An energy gun that fattens up anyone it hits. This version functions as a glass cannon of some sorts. It cannot be recharged." - icon = 'GainStation13/icons/obj/fatoray.dmi' /// REPLACE THESE LATER WITH UNIQUE SPRITES - Sono + icon = 'GainStation13/icons/obj/fatoray.dmi' icon_state = "fatoray_cannon" recoil = 3 can_charge = 0 @@ -73,7 +73,7 @@ /obj/item/gun/energy/fatoray/weak name = "Basic Fatoray" desc = "An energy gun that fattens up anyone it hits. This version is considerably weaker than its original counterpart, the technology behind it seemingly still not perfected." - icon = 'GainStation13/icons/obj/fatoray.dmi' /// REPLACE THESE LATER WITH UNIQUE SPRITES - Sono + icon = 'GainStation13/icons/obj/fatoray.dmi' icon_state = "fatoray_weak" pin = null ammo_type = list(/obj/item/ammo_casing/energy/fattening/weak) diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 8f21bd85..9de2e282 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -19,16 +19,16 @@ #define SHAME (1<<4) #define MANUAL_SUICIDE (1<<5) //suicide_act will do the actual killing. -#define EFFECT_STUN "stun" -#define EFFECT_KNOCKDOWN "knockdown" +#define EFFECT_STUN "stun" +#define EFFECT_KNOCKDOWN "knockdown" #define EFFECT_UNCONSCIOUS "unconscious" #define EFFECT_IRRADIATE "irradiate" #define EFFECT_STUTTER "stutter" #define EFFECT_SLUR "slur" -#define EFFECT_BURPSLUR "burpslur" //GS13 - uncontrolled burp effect -#define EFFECT_EYE_BLUR "eye_blur" +#define EFFECT_EYE_BLUR "eye_blur" #define EFFECT_DROWSY "drowsy" #define EFFECT_JITTER "jitter" +#define EFFECT_BURPSLUR "burpslur" //GS13 - uncontrolled burp effect //Bitflags defining which status effects could be or are inflicted on a mob #define CANSTUN (1<<0) diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm index 9f283a4d..27c5d77e 100644 --- a/code/datums/weather/weather_types/radiation_storm.dm +++ b/code/datums/weather/weather_types/radiation_storm.dm @@ -66,4 +66,4 @@ -// GS13 tweak: Removed radstorms due to how disruptive they were to QoL and RP quality - Sono +// GS13 tweak: Removed radstorms due to how disruptive they were to QoL and RP quality - GLDW diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index 1090781e..7480d9d6 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -471,7 +471,7 @@ //GS13 RUINS AND OTHER EXCLUSIVE AREAS -//We should probably move this to our own file later - Sono +//We should probably move this to our own file later - GLDW /area/crew_quarters/fitness/sauna name = "Saunas" diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index 2ad009cd..d941c570 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -663,7 +663,7 @@ This is here to make the tiles around the station mininuke change when it's arme if(istype(loneop)) loneop.weight += 1 // if(loneop.weight % 5 == 0) - // message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].") // Commenting this out because it's a fucking pain for the admins - Sono + // message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].") // Commenting this out because it's a fucking pain for the admins - GLDW log_game("[src] is stationary for too long in [loc_name(newturf)], and has increased the weight of the Lone Operative event to [loneop.weight].") else lastlocation = newturf diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 1e839d0c..8a448af4 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -749,5 +749,5 @@ /obj/effect/mob_spawn/human/feeders_den/victim/special(mob/living/carbon/human/new_spawn) ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT) -/obj/effect/mob_spawn/proc/startfat(mob/M) //move this somewhere else later when we're cleaning up our content - Sono +/obj/effect/mob_spawn/proc/startfat(mob/M) //move this somewhere else later when we're cleaning up our content - GLDW return diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 63886e75..de4ad41f 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -946,7 +946,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Color:
" dat += "    Change
" dat += "Hide on Round-Start:[features["hide_belly"] == 1 ? "Yes" : "No"]" - dat += "Inflation (Climax With):[features["inflatable_belly"] == 1 ? "Yes" : "No"]" + dat += "Manual belly size change (Found in Climax menu):[features["inflatable_belly"] == 1 ? "Yes" : "No"]" dat += "" diff --git a/code/modules/events/heart_attack.dm b/code/modules/events/heart_attack.dm index 163bb87b..41b0365d 100644 --- a/code/modules/events/heart_attack.dm +++ b/code/modules/events/heart_attack.dm @@ -5,7 +5,7 @@ max_occurrences = 0 min_players = 400 // To avoid shafting lowpop - // Made the event impossible to come across to bolster server's RP quality a bit - Sono + // Made the event impossible to come across to bolster server's RP quality a bit - GLDW /datum/round_event/heart_attack/start() var/list/heart_attack_contestants = list() diff --git a/code/modules/events/spontaneous_appendicitis.dm b/code/modules/events/spontaneous_appendicitis.dm index b332afc4..4a07991c 100644 --- a/code/modules/events/spontaneous_appendicitis.dm +++ b/code/modules/events/spontaneous_appendicitis.dm @@ -6,7 +6,7 @@ earliest_start = 900 MINUTES min_players = 100 - // I made the event practically impossible, as an RP tweak - Sono + // I made the event practically impossible, as an RP tweak - GLDW /datum/round_event/spontaneous_appendicitis fakeable = FALSE diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index 2820bd2a..0dcc85fd 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -751,7 +751,7 @@ tastes = list("pastry" = 1, "sweetness" = 1) foodtype = GRAIN | SUGAR -#define PANCAKE_MAX_STACK 20 //Doubled the stacking size. Snack away, snacksters! - Sono +#define PANCAKE_MAX_STACK 20 //Doubled the stacking size. Snack away, snacksters! - GLDW /obj/item/reagent_containers/food/snacks/pancakes name = "pancake" diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 563f7dd8..f5b00200 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -64,4 +64,3 @@ var/drunkenness = 0 //Overall drunkenness - check handle_alcohol() in life.dm for effects - var/burpyness = 0 // GS13 - dumb name, I know. Trying to keep it closely related to "drunkenness" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 3aeedfb9..3af6fa10 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -812,7 +812,7 @@ remove_all_embedded_objects() set_heartattack(FALSE) drunkenness = 0 - burpyness = 0 //GS13 - lil GS13 addition + burpslurring = 0 //GS13 for(var/datum/mutation/human/HM in dna.mutations) if(HM.quality != POSITIVE) dna.remove_mutation(HM.name) diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index dd54990c..60ba3cb7 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -94,8 +94,6 @@ radiation += max(effect * hit_percent, 0) if(EFFECT_SLUR) slurring = max(slurring,(effect * hit_percent)) - if(EFFECT_BURPSLUR) - burpslurring = max(burpslurring,(effect * hit_percent)) //GS13 if(EFFECT_STUTTER) if((status_flags & CANSTUN) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) // stun is usually associated with stutter stuttering = max(stuttering,(effect * hit_percent)) @@ -109,7 +107,7 @@ return 1 -/mob/living/proc/apply_effects(stun = 0, knockdown = 0, unconscious = 0, irradiate = 0, slur = 0, burpslur = 0, stutter = 0, eyeblur = 0, drowsy = 0, blocked = FALSE, stamina = 0, jitter = 0, kd_stamoverride, kd_stammax) +/mob/living/proc/apply_effects(stun = 0, knockdown = 0, unconscious = 0, irradiate = 0, slur = 0, stutter = 0, eyeblur = 0, drowsy = 0, blocked = FALSE, stamina = 0, jitter = 0, kd_stamoverride, kd_stammax) if(blocked >= 100) return 0 if(stun) @@ -122,8 +120,6 @@ apply_effect(irradiate, EFFECT_IRRADIATE, blocked) if(slur) apply_effect(slur, EFFECT_SLUR, blocked) - if(burpslur) - apply_effect(burpslur, EFFECT_BURPSLUR, blocked) //GS13 if(stutter) apply_effect(stutter, EFFECT_STUTTER, blocked) if(eyeblur) diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index 58b9aa62..5b0ea454 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -13,7 +13,7 @@ category = SLOT_HEAD path = /obj/item/clothing/head/beret/black -/datum/gear/rose //GS13: added bunch of flowers :) - Sono +/datum/gear/rose //GS13: added bunch of flowers :) - GLDW name = "Rose" category = SLOT_HEAD path = /obj/item/grown/rose