mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-27 06:00:23 +01:00
removes var/ inside all procs (#19450)
* removes var/ inside all procs * . * ugh
This commit is contained in:
@@ -84,7 +84,7 @@
|
||||
|
||||
stacks = MODIFIER_STACK_ALLOWED //You have somehow had the surgery done twice. Your brain is very, very fucked, but I won't say no.
|
||||
|
||||
/datum/modifier/franken_sickness/can_apply(var/mob/living/L)
|
||||
/datum/modifier/franken_sickness/can_apply(mob/living/L)
|
||||
if(!ishuman(L))
|
||||
return FALSE
|
||||
if(L.isSynthetic()) //Nonhumans and Machines cannot be Frankensteined, at this time.
|
||||
@@ -106,7 +106,7 @@
|
||||
|
||||
stacks = MODIFIER_STACK_ALLOWED
|
||||
|
||||
/datum/modifier/franken_recovery/can_apply(var/mob/living/L)
|
||||
/datum/modifier/franken_recovery/can_apply(mob/living/L)
|
||||
if(!ishuman(L))
|
||||
return FALSE
|
||||
if(L.isSynthetic()) //Nonhumans and Machines cannot be Frankensteined, at this time.
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
var/mutable_appearance/marked_underlay
|
||||
var/obj/item/kinetic_crusher/hammer_synced
|
||||
|
||||
/datum/modifier/crusher_mark/New(var/new_holder, var/new_origin)
|
||||
/datum/modifier/crusher_mark/New(new_holder, new_origin)
|
||||
. = ..()
|
||||
if(isliving(new_origin))
|
||||
var/mob/living/origin = new_origin
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
holder.vis_enabled -= VIS_GHOSTS
|
||||
holder.recalculate_vis()
|
||||
|
||||
/datum/modifier/feysight/can_apply(var/mob/living/L)
|
||||
/datum/modifier/feysight/can_apply(mob/living/L)
|
||||
if(L.stat)
|
||||
to_chat(L, span_warning("You can't be unconscious or dead to experience tranquility."))
|
||||
return FALSE
|
||||
|
||||
@@ -328,7 +328,7 @@ GLOBAL_LIST_INIT(redspace_areas, list(
|
||||
holder.vis_enabled -= VIS_GHOSTS
|
||||
holder.recalculate_vis()
|
||||
|
||||
/datum/modifier/redsight/can_apply(var/mob/living/L)
|
||||
/datum/modifier/redsight/can_apply(mob/living/L)
|
||||
if(L.stat)
|
||||
to_chat(L, span_warning("You can't be unconscious or dead to see the unknown."))
|
||||
return FALSE
|
||||
@@ -640,7 +640,7 @@ GLOBAL_LIST_INIT(redspace_areas, list(
|
||||
qdel(blade) //failed, sad.
|
||||
|
||||
//shamelessly stolen from changeling/armor.dm
|
||||
/datum/modifier/redspace_corruption/proc/equip_flesh_armor(var/armor_type, var/helmet_type, var/boot_type, var/glove_type)
|
||||
/datum/modifier/redspace_corruption/proc/equip_flesh_armor(armor_type, helmet_type, boot_type, glove_type)
|
||||
|
||||
var/mob/living/carbon/human/M = unfortunate_soul
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
|
||||
var/vision_flags // Vision flags to add to the mob. SEE_MOB, SEE_OBJ, etc.
|
||||
|
||||
/datum/modifier/New(var/new_holder, var/new_origin)
|
||||
/datum/modifier/New(new_holder, new_origin)
|
||||
holder = new_holder
|
||||
if(new_origin)
|
||||
origin = WEAKREF(new_origin)
|
||||
@@ -78,7 +78,7 @@
|
||||
|
||||
// Checks if the modifier should be allowed to be applied to the mob before attaching it.
|
||||
// Override for special criteria, e.g. forbidding robots from receiving it.
|
||||
/datum/modifier/proc/can_apply(var/mob/living/L, var/suppress_output = FALSE)
|
||||
/datum/modifier/proc/can_apply(mob/living/L, suppress_output = FALSE)
|
||||
return TRUE
|
||||
|
||||
// Checks to see if this datum should continue existing.
|
||||
@@ -86,7 +86,7 @@
|
||||
if(expire_at && expire_at < world.time) // Is our time up?
|
||||
src.expire()
|
||||
|
||||
/datum/modifier/proc/expire(var/silent = FALSE)
|
||||
/datum/modifier/proc/expire(silent = FALSE)
|
||||
if(on_expired_text && !silent)
|
||||
to_chat(holder, on_expired_text)
|
||||
on_expire()
|
||||
@@ -131,7 +131,7 @@
|
||||
// Third argument is the 'source' of the modifier, if it's from someone else. If null, it will default to the mob being applied to.
|
||||
// The SECONDS/MINUTES macro is very helpful for this. E.g. M.add_modifier(/datum/modifier/example, 5 MINUTES)
|
||||
// The fourth argument is a boolean to suppress failure messages, set it to true if the modifier is repeatedly applied (as chem-based modifiers are) to prevent chat-spam
|
||||
/mob/living/proc/add_modifier(var/modifier_type, var/expire_at = null, var/mob/living/origin = null, var/suppress_failure = FALSE)
|
||||
/mob/living/proc/add_modifier(modifier_type, expire_at = null, mob/living/origin = null, suppress_failure = FALSE)
|
||||
// First, check if the mob already has this modifier.
|
||||
for(var/datum/modifier/M in modifiers)
|
||||
if(ispath(modifier_type, M))
|
||||
@@ -170,33 +170,33 @@
|
||||
return mod
|
||||
|
||||
// Removes a specific instance of modifier
|
||||
/mob/living/proc/remove_specific_modifier(var/datum/modifier/M, var/silent = FALSE)
|
||||
/mob/living/proc/remove_specific_modifier(datum/modifier/M, silent = FALSE)
|
||||
M.expire(silent)
|
||||
|
||||
// Removes one modifier of a type
|
||||
/mob/living/proc/remove_a_modifier_of_type(var/modifier_type, var/silent = FALSE)
|
||||
/mob/living/proc/remove_a_modifier_of_type(modifier_type, silent = FALSE)
|
||||
for(var/datum/modifier/M in modifiers)
|
||||
if(ispath(M.type, modifier_type))
|
||||
M.expire(silent)
|
||||
break
|
||||
|
||||
// Removes all modifiers of a type
|
||||
/mob/living/proc/remove_modifiers_of_type(var/modifier_type, var/silent = FALSE)
|
||||
/mob/living/proc/remove_modifiers_of_type(modifier_type, silent = FALSE)
|
||||
for(var/datum/modifier/M in modifiers)
|
||||
if(ispath(M.type, modifier_type))
|
||||
M.expire(silent)
|
||||
|
||||
// Removes all modifiers, useful if the mob's being deleted
|
||||
/mob/living/proc/remove_all_modifiers(var/silent = FALSE)
|
||||
/mob/living/proc/remove_all_modifiers(silent = FALSE)
|
||||
for(var/datum/modifier/M in modifiers)
|
||||
M.expire(silent)
|
||||
|
||||
// Checks if the mob has a modifier type.
|
||||
/mob/living/proc/has_modifier_of_type(var/modifier_type)
|
||||
/mob/living/proc/has_modifier_of_type(modifier_type)
|
||||
return get_modifier_of_type(modifier_type) ? TRUE : FALSE
|
||||
|
||||
// Gets the first instance of a specific modifier type or subtype.
|
||||
/mob/living/proc/get_modifier_of_type(var/modifier_type)
|
||||
/mob/living/proc/get_modifier_of_type(modifier_type)
|
||||
for(var/datum/modifier/M in modifiers)
|
||||
if(istype(M, modifier_type))
|
||||
return M
|
||||
@@ -272,7 +272,7 @@
|
||||
|
||||
|
||||
// Helper to format multiplers (e.g. 1.4) to percentages (like '40%')
|
||||
/proc/multipler_to_percentage(var/multi, var/abs = FALSE)
|
||||
/proc/multipler_to_percentage(multi, abs = FALSE)
|
||||
if(abs)
|
||||
return "[abs( ((multi - 1) * 100) )]%"
|
||||
return "[((multi - 1) * 100)]%"
|
||||
|
||||
@@ -113,7 +113,7 @@ the artifact triggers the rage.
|
||||
var/mob/living/carbon/human/H = holder
|
||||
H.shock_stage = last_shock_stage
|
||||
|
||||
/datum/modifier/berserk/can_apply(var/mob/living/L, var/suppress_failure = FALSE)
|
||||
/datum/modifier/berserk/can_apply(mob/living/L, suppress_failure = FALSE)
|
||||
if(L.stat)
|
||||
if(!suppress_failure)
|
||||
to_chat(L, span_warning("You can't be unconscious or dead to berserk."))
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
else
|
||||
adjust_fear(-fear_decay_rate)
|
||||
|
||||
/datum/modifier/trait/phobia/proc/adjust_fear(var/amount)
|
||||
/datum/modifier/trait/phobia/proc/adjust_fear(amount)
|
||||
var/last_fear = current_fear
|
||||
current_fear = between(0, current_fear + amount, max_fear)
|
||||
|
||||
@@ -595,7 +595,7 @@
|
||||
return list()
|
||||
|
||||
|
||||
/datum/modifier/trait/phobia/xenophobia/proc/make_message(var/mob/living/L)
|
||||
/datum/modifier/trait/phobia/xenophobia/proc/make_message(mob/living/L)
|
||||
return "Someone forgot to override this output message."
|
||||
|
||||
|
||||
@@ -618,7 +618,7 @@
|
||||
xenos += H
|
||||
return xenos
|
||||
|
||||
/datum/modifier/trait/phobia/xenophobia/generic/make_message(var/mob/living/carbon/human/H)
|
||||
/datum/modifier/trait/phobia/xenophobia/generic/make_message(mob/living/carbon/human/H)
|
||||
// Do special responses first if possible.
|
||||
// if(H.stat == DEAD)
|
||||
// return pick( list("Unsurprising to see a weak and inferior [H.species.name] fail to survive.", "If that [H.species.name] were a [holder.species.name], this wouldn't've have happened.") )
|
||||
@@ -655,7 +655,7 @@
|
||||
humans += H
|
||||
return humans
|
||||
|
||||
/datum/modifier/trait/phobia/xenophobia/human/make_message(var/mob/living/carbon/human/H)
|
||||
/datum/modifier/trait/phobia/xenophobia/human/make_message(mob/living/carbon/human/H)
|
||||
// Do special responses first if possible.
|
||||
|
||||
// Generic responses if none of the above apply.
|
||||
@@ -684,7 +684,7 @@
|
||||
skrell += H
|
||||
return skrell
|
||||
|
||||
/datum/modifier/trait/phobia/xenophobia/skrell/make_message(var/mob/living/carbon/human/H)
|
||||
/datum/modifier/trait/phobia/xenophobia/skrell/make_message(mob/living/carbon/human/H)
|
||||
// Do special responses first if possible.
|
||||
|
||||
// Generic responses if none of the above apply.
|
||||
|
||||
@@ -156,7 +156,7 @@
|
||||
on_expired_text = span_notice("The blaze of hunger inside you has been snuffed.")
|
||||
stacks = MODIFIER_STACK_EXTEND
|
||||
|
||||
/datum/modifier/gluttonyregeneration/can_apply(var/mob/living/L)
|
||||
/datum/modifier/gluttonyregeneration/can_apply(mob/living/L)
|
||||
if(L.stat == DEAD)
|
||||
to_chat(L, span_warning("You can't be dead to consume."))
|
||||
return FALSE
|
||||
|
||||
Reference in New Issue
Block a user