cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-02-09 23:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed the sleep damage eye blur effect

Browse Source 
woo! yippie
(also renamed some of my older comments)
This commit is contained in:
Sonoida
2023-04-06 20:55:08 +02:00
parent 090cf0780b
commit f303300f6e
15 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
View File

@@ -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

2
code/modules/awaymissions/corpse.dm
View File

@@ -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

2
code/modules/client/preferences.dm
View File

@@ -946,7 +946,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "<b>Color:</b></a><BR>"
dat += "<span style='border: 1px solid #161616; background-color: #[features["belly_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=belly_color;task=input'>Change</a><br>"
dat += "<b>Hide on Round-Start:</b><a style='display:block;width:50px' href='?_src_=prefs;preference=hide_belly'>[features["hide_belly"] == 1 ? "Yes" : "No"]</a>"
dat += "<b>Inflation (Climax With):</b><a style='display:block;width:50px' href='?_src_=prefs;preference=inflatable_belly'>[features["inflatable_belly"] == 1 ? "Yes" : "No"]</a>"
dat += "<b>Manual belly size change (Found in Climax menu):</b><a style='display:block;width:50px' href='?_src_=prefs;preference=inflatable_belly'>[features["inflatable_belly"] == 1 ? "Yes" : "No"]</a>"
dat += "</td>"

2
code/modules/events/heart_attack.dm
View File

@@ -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()

2
code/modules/events/spontaneous_appendicitis.dm
View File

@@ -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

2
code/modules/food_and_drinks/food/snacks_pastry.dm
View File

@@ -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"

1
code/modules/mob/living/carbon/carbon_defines.dm
View File

@@ -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"

2
code/modules/mob/living/carbon/human/human.dm
View File

@@ -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)

6
code/modules/mob/living/damage_procs.dm
View File

@@ -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)