mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-28 06:28:01 +01:00
removes var/ inside all procs (#19450)
* removes var/ inside all procs * . * ugh
This commit is contained in:
@@ -68,7 +68,7 @@ dizzy process - wiggles the client's pixel offset over time
|
||||
value of dizziness ranges from 0 to 1000
|
||||
below 100 is not dizzy
|
||||
*/
|
||||
/mob/proc/make_dizzy(var/amount)
|
||||
/mob/proc/make_dizzy(amount)
|
||||
if(amount < 0 && get_dizzy() == 0) // If removing, check if we're already empty!
|
||||
return
|
||||
var/datum/component/dizzy_shake/DC = LoadComponent(/datum/component/dizzy_shake);
|
||||
@@ -85,7 +85,7 @@ below 100 is not dizzy
|
||||
return max(DC.dizziness,0)
|
||||
|
||||
// Disabled on borgs
|
||||
/mob/living/silicon/make_dizzy(var/amount)
|
||||
/mob/living/silicon/make_dizzy(amount)
|
||||
return
|
||||
|
||||
/mob/living/silicon/get_dizzy()
|
||||
|
||||
@@ -69,7 +69,7 @@ jittery process - wiggles the mob's pixel offset over time
|
||||
value of jittery ranges from 0 to 1000
|
||||
below 100 is not jittery
|
||||
*/
|
||||
/mob/proc/make_jittery(var/amount)
|
||||
/mob/proc/make_jittery(amount)
|
||||
if(amount < 0 && get_jittery() == 0) // If removing, check if we're already empty!
|
||||
return
|
||||
var/datum/component/jittery_shake/JC = LoadComponent(/datum/component/jittery_shake);
|
||||
@@ -86,7 +86,7 @@ below 100 is not jittery
|
||||
return max(JC.jitteriness,0)
|
||||
|
||||
// Disabled on borgs
|
||||
/mob/living/silicon/make_jittery(var/amount)
|
||||
/mob/living/silicon/make_jittery(amount)
|
||||
return
|
||||
|
||||
/mob/living/silicon/get_jittery()
|
||||
|
||||
@@ -131,13 +131,13 @@ GLOBAL_LIST_EMPTY_TYPED(powerinstances, /datum/power/changeling)
|
||||
chem_charges = min(max(0, chem_charges+chem_recharge_rate), chem_storage)
|
||||
geneticdamage = max(0, geneticdamage-1)
|
||||
|
||||
/datum/component/antag/changeling/proc/GetDNA(var/dna_owner)
|
||||
/datum/component/antag/changeling/proc/GetDNA(dna_owner)
|
||||
for(var/datum/absorbed_dna/DNA in absorbed_dna)
|
||||
if(dna_owner == DNA.name)
|
||||
return DNA
|
||||
|
||||
//Former /mob procs
|
||||
/mob/proc/absorbDNA(var/datum/absorbed_dna/newDNA)
|
||||
/mob/proc/absorbDNA(datum/absorbed_dna/newDNA)
|
||||
var/datum/component/antag/changeling/comp = is_changeling(src)
|
||||
if(!comp)
|
||||
return
|
||||
@@ -223,7 +223,7 @@ GLOBAL_LIST_EMPTY_TYPED(powerinstances, /datum/power/changeling)
|
||||
|
||||
|
||||
//Helper proc. Does all the checks and stuff for us to avoid copypasta
|
||||
/mob/proc/changeling_power(var/required_chems=0, var/required_dna=0, var/max_genetic_damage=100, var/max_stat=0)
|
||||
/mob/proc/changeling_power(required_chems=0, required_dna=0, max_genetic_damage=100, max_stat=0)
|
||||
|
||||
if(!src.mind) return
|
||||
if(!isliving(src)) return
|
||||
@@ -252,7 +252,7 @@ GLOBAL_LIST_EMPTY_TYPED(powerinstances, /datum/power/changeling)
|
||||
return comp
|
||||
|
||||
//Used to dump the languages from the changeling datum into the actual mob.
|
||||
/mob/proc/changeling_update_languages(var/updated_languages)
|
||||
/mob/proc/changeling_update_languages(updated_languages)
|
||||
languages = list()
|
||||
for(var/language in updated_languages)
|
||||
languages += language
|
||||
@@ -277,7 +277,7 @@ GLOBAL_LIST_EMPTY_TYPED(powerinstances, /datum/power/changeling)
|
||||
return 1
|
||||
|
||||
//Handles the general sting code to reduce on copypasta (seeming as somebody decided to make SO MANY dumb abilities)
|
||||
/mob/proc/changeling_sting(var/required_chems=0, var/verb_path)
|
||||
/mob/proc/changeling_sting(required_chems=0, verb_path)
|
||||
var/datum/component/antag/changeling/comp = changeling_power(required_chems)
|
||||
if(!comp)
|
||||
return
|
||||
@@ -375,7 +375,7 @@ GLOBAL_LIST_EMPTY_TYPED(powerinstances, /datum/power/changeling)
|
||||
comp.power_panel.tgui_interact(src)
|
||||
|
||||
///Purchasing a power. Called by the Evolution Panel.
|
||||
/datum/component/antag/changeling/proc/purchasePower(var/mob/owner, var/Pname, var/remake_verbs = 1)
|
||||
/datum/component/antag/changeling/proc/purchasePower(mob/owner, Pname, remake_verbs = 1)
|
||||
|
||||
var/datum/power/changeling/Thepower = Pname
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
var/list/flavour_texts
|
||||
var/list/genMods
|
||||
|
||||
/datum/absorbed_dna/New(var/newName, var/newDNA, var/newSpecies, var/newLanguages, var/newIdentifying_Gender, var/list/newFlavour, var/list/newGenMods)
|
||||
/datum/absorbed_dna/New(newName, newDNA, newSpecies, newLanguages, newIdentifying_Gender, list/newFlavour, list/newGenMods)
|
||||
..()
|
||||
name = newName
|
||||
QDEL_SWAP(dna, newDNA)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
//This is a generic proc that should be called by other ling armor procs to equip them.
|
||||
/mob/proc/changeling_generic_armor(var/armor_type, var/helmet_type, var/boot_type, var/chem_cost)
|
||||
/mob/proc/changeling_generic_armor(armor_type, helmet_type, boot_type, chem_cost)
|
||||
|
||||
if(!ishuman(src))
|
||||
return 0
|
||||
@@ -52,7 +52,7 @@
|
||||
M.update_inv_shoes()
|
||||
return 1
|
||||
|
||||
/mob/proc/changeling_generic_equip_all_slots(var/list/stuff_to_equip, var/cost)
|
||||
/mob/proc/changeling_generic_equip_all_slots(list/stuff_to_equip, cost)
|
||||
var/datum/component/antag/changeling/changeling = changeling_power(cost,1,100,CONSCIOUS)
|
||||
if(!changeling)
|
||||
return
|
||||
@@ -231,7 +231,7 @@
|
||||
return success
|
||||
|
||||
//This is a generic proc that should be called by other ling weapon procs to equip them.
|
||||
/mob/proc/changeling_generic_weapon(var/weapon_type, var/make_sound = 1, var/cost = 20)
|
||||
/mob/proc/changeling_generic_weapon(weapon_type, make_sound = 1, cost = 20)
|
||||
var/datum/component/antag/changeling/changeling = changeling_power(cost,1,100,CONSCIOUS)
|
||||
if(!changeling)
|
||||
return
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
creator = null
|
||||
. = ..()
|
||||
|
||||
/obj/item/melee/changeling/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
|
||||
/obj/item/melee/changeling/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
|
||||
if(default_parry_check(user, attacker, damage_source) && prob(defend_chance))
|
||||
user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!"))
|
||||
playsound(src, 'sound/weapons/slash.ogg', 50, 1)
|
||||
|
||||
@@ -111,7 +111,7 @@
|
||||
var/T = get_turf(src)
|
||||
new /obj/effect/effect/sparks(T)
|
||||
|
||||
/obj/item/electric_hand/afterattack(var/atom/target, var/mob/living/carbon/human/user, proximity)
|
||||
/obj/item/electric_hand/afterattack(atom/target, mob/living/carbon/human/user, proximity)
|
||||
if(!target)
|
||||
return
|
||||
if(!proximity)
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
..()
|
||||
to_chat(user, span_notice("We discreetly shape our finger back to a less suspicious form."))
|
||||
|
||||
/obj/item/finger_lockpick/afterattack(var/atom/target, var/mob/living/user, proximity)
|
||||
/obj/item/finger_lockpick/afterattack(atom/target, mob/living/user, proximity)
|
||||
if(!target)
|
||||
return
|
||||
if(!proximity)
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
supply_conversion_value = REFINERYEXPORT_VALUE_RARE
|
||||
industrial_use = REFINERYEXPORT_REASON_MATSCI
|
||||
|
||||
/datum/reagent/epinephrine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
/datum/reagent/epinephrine/affect_blood(mob/living/carbon/M, alien, removed)
|
||||
if(alien == IS_DIONA)
|
||||
return
|
||||
M.add_chemical_effect(CE_SPEEDBOOST, 3)
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
/datum/modifier/changeling_camouflage/recursive
|
||||
must_walk = FALSE
|
||||
|
||||
/datum/modifier/changeling_camouflage/can_apply(var/mob/living/L, var/suppress_failure = FALSE)
|
||||
/datum/modifier/changeling_camouflage/can_apply(mob/living/L, suppress_failure = FALSE)
|
||||
comp = L.GetComponent(/datum/component/antag/changeling)
|
||||
if(!comp)
|
||||
return FALSE
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
return shim.linked_machine
|
||||
|
||||
/// deprecated, do not use
|
||||
/mob/proc/check_current_machine(var/obj/checking)
|
||||
/mob/proc/check_current_machine(obj/checking)
|
||||
var/datum/component/using_machine_shim/shim = GetComponent(/datum/component/using_machine_shim)
|
||||
if(!shim)
|
||||
return FALSE
|
||||
@@ -84,7 +84,7 @@
|
||||
qdel(shim)
|
||||
|
||||
/// deprecated, do not use
|
||||
/mob/proc/set_machine(var/obj/O)
|
||||
/mob/proc/set_machine(obj/O)
|
||||
var/datum/component/using_machine_shim/shim = GetComponent(/datum/component/using_machine_shim)
|
||||
if(shim)
|
||||
if(shim.linked_machine == O) // Already in use
|
||||
@@ -120,10 +120,10 @@
|
||||
in_use = is_in_use
|
||||
|
||||
/// deprecated, do not use
|
||||
/obj/machinery/CouldUseTopic(var/mob/user)
|
||||
/obj/machinery/CouldUseTopic(mob/user)
|
||||
..()
|
||||
user.set_machine(src)
|
||||
|
||||
/// deprecated, do not use
|
||||
/obj/machinery/CouldNotUseTopic(var/mob/user)
|
||||
/obj/machinery/CouldNotUseTopic(mob/user)
|
||||
user.unset_machine()
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
var/datum/reagents/reagents = null
|
||||
var/makes_gurgles = TRUE
|
||||
|
||||
/datum/component/hose_connector/Initialize(var/set_unique_name = null)
|
||||
/datum/component/hose_connector/Initialize(set_unique_name = null)
|
||||
carrier = parent
|
||||
reagents = new /datum/reagents(60, src)
|
||||
// Handle uniquely named connectors
|
||||
@@ -73,7 +73,7 @@
|
||||
return
|
||||
handle_pump(connected_to)
|
||||
|
||||
/datum/component/hose_connector/proc/handle_pump(var/datum/reagents/connected_to)
|
||||
/datum/component/hose_connector/proc/handle_pump(datum/reagents/connected_to)
|
||||
PROTECTED_PROC(TRUE)
|
||||
ASSERT(connected_to)
|
||||
// Drain our connector back into tank, and then fill it randomly. The hose handles swapping.
|
||||
@@ -88,7 +88,7 @@
|
||||
if(makes_gurgles && prob(5))
|
||||
carrier.visible_message(span_infoplain(span_bold("\The [carrier]") + " gurgles as it pumps fluid."))
|
||||
|
||||
/datum/component/hose_connector/proc/valid_connection(var/datum/component/hose_connector/C)
|
||||
/datum/component/hose_connector/proc/valid_connection(datum/component/hose_connector/C)
|
||||
if(istype(C))
|
||||
if(C.my_hose)
|
||||
return FALSE
|
||||
@@ -98,16 +98,16 @@
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
/datum/component/hose_connector/proc/disconnect_action(var/user)
|
||||
/datum/component/hose_connector/proc/disconnect_action(user)
|
||||
if(carrier.Adjacent(user))
|
||||
carrier.visible_message("[user] disconnects \the hose from \the [carrier].")
|
||||
my_hose.disconnect(user)
|
||||
QDEL_NULL(my_hose)
|
||||
|
||||
/datum/component/hose_connector/proc/connect(var/datum/hose/H = null)
|
||||
/datum/component/hose_connector/proc/connect(datum/hose/H = null)
|
||||
my_hose = H
|
||||
|
||||
/datum/component/hose_connector/proc/setup_hoses(var/datum/component/hose_connector/target, var/distancetonode, var/mob/user)
|
||||
/datum/component/hose_connector/proc/setup_hoses(datum/component/hose_connector/target, distancetonode, mob/user)
|
||||
if(!target || QDELETED(target))
|
||||
to_chat(user,span_danger("What you were connecting to has stopped existing! Ohno!"))
|
||||
return FALSE
|
||||
@@ -216,7 +216,7 @@
|
||||
name = "hose input"
|
||||
flow_direction = HOSE_INPUT
|
||||
|
||||
/datum/component/hose_connector/input/handle_pump(var/datum/reagents/connected_to)
|
||||
/datum/component/hose_connector/input/handle_pump(datum/reagents/connected_to)
|
||||
ASSERT(connected_to)
|
||||
reagents.trans_to_holder(connected_to, reagents.maximum_volume)
|
||||
|
||||
@@ -225,7 +225,7 @@
|
||||
name = "hose output"
|
||||
flow_direction = HOSE_OUTPUT
|
||||
|
||||
/datum/component/hose_connector/output/handle_pump(var/datum/reagents/connected_to)
|
||||
/datum/component/hose_connector/output/handle_pump(datum/reagents/connected_to)
|
||||
ASSERT(connected_to)
|
||||
connected_to.trans_to_holder(reagents, reagents.maximum_volume)
|
||||
|
||||
@@ -241,7 +241,7 @@
|
||||
return null
|
||||
return reagents // Ourselves, not our carrier
|
||||
|
||||
/datum/component/hose_connector/endless_source/handle_pump(var/datum/reagents/connected_to)
|
||||
/datum/component/hose_connector/endless_source/handle_pump(datum/reagents/connected_to)
|
||||
ASSERT(connected_to)
|
||||
connected_to.add_reagent(reagent_id,5)
|
||||
|
||||
@@ -259,7 +259,7 @@
|
||||
return null
|
||||
return reagents // Ourselves, not our carrier
|
||||
|
||||
/datum/component/hose_connector/endless_drain/handle_pump(var/datum/reagents/connected_to)
|
||||
/datum/component/hose_connector/endless_drain/handle_pump(datum/reagents/connected_to)
|
||||
ASSERT(connected_to)
|
||||
connected_to.clear_reagents()
|
||||
|
||||
@@ -279,7 +279,7 @@
|
||||
name = "Oil Storage"
|
||||
force_name = TRUE
|
||||
|
||||
/datum/component/hose_connector/input/fryer/handle_pump(var/datum/reagents/oil_reagents/connected_to)
|
||||
/datum/component/hose_connector/input/fryer/handle_pump(datum/reagents/oil_reagents/connected_to)
|
||||
ASSERT(connected_to)
|
||||
if(connected_to.total_volume >= connected_to.optimal_oil) //Don't overfill it.
|
||||
return
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
VAR_PRIVATE/initial_distance = HOSE_MAX_DISTANCE
|
||||
VAR_PRIVATE/datum/beam/current_beam = null
|
||||
|
||||
/datum/hose/proc/get_pairing(var/datum/component/hose_connector/target)
|
||||
/datum/hose/proc/get_pairing(datum/component/hose_connector/target)
|
||||
RETURN_TYPE(/datum/component/hose_connector)
|
||||
if(target)
|
||||
if(target == node1)
|
||||
@@ -29,7 +29,7 @@
|
||||
/datum/hose/proc/has_pairing()
|
||||
return (node1 && node2)
|
||||
|
||||
/datum/hose/proc/disconnect(var/mob/user = null)
|
||||
/datum/hose/proc/disconnect(mob/user = null)
|
||||
// Stop processing, we're disconnecting anyway
|
||||
STOP_PROCESSING(SSfastprocess, src)
|
||||
var/list/drop_locs = list()
|
||||
@@ -57,7 +57,7 @@
|
||||
initial_distance = 0
|
||||
update_beam()
|
||||
|
||||
/datum/hose/proc/set_hose(var/datum/component/hose_connector/target1, var/datum/component/hose_connector/target2, var/distancetonode)
|
||||
/datum/hose/proc/set_hose(datum/component/hose_connector/target1, datum/component/hose_connector/target2, distancetonode)
|
||||
if(target1 && target2)
|
||||
node1 = target1
|
||||
node2 = target2
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
. = ..()
|
||||
|
||||
// Succ command center
|
||||
/datum/component/hose_connector/inflation/proc/inflation_setup(var/mob/user,var/datum/component/hose_connector/other)
|
||||
/datum/component/hose_connector/inflation/proc/inflation_setup(mob/user,datum/component/hose_connector/other)
|
||||
if(!other || QDELETED(other))
|
||||
to_chat(user,span_danger("You couldn't connect the hose, as the connection stopped existing! Ohno!"))
|
||||
return FALSE
|
||||
@@ -109,7 +109,7 @@
|
||||
return human_owner.vessel // Suck blood
|
||||
return human_owner.bloodstr // Suck reagents from blood
|
||||
|
||||
/datum/component/hose_connector/inflation/handle_pump(var/datum/reagents/connected_to)
|
||||
/datum/component/hose_connector/inflation/handle_pump(datum/reagents/connected_to)
|
||||
ASSERT(connected_to)
|
||||
var/datum/component/hose_connector/other = get_pairing()
|
||||
var/rate = reagents.maximum_volume * 0.5
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
remembered = null
|
||||
return
|
||||
|
||||
/obj/item/stack/hose/afterattack(var/atom/target, var/mob/living/user, proximity, params)
|
||||
/obj/item/stack/hose/afterattack(atom/target, mob/living/user, proximity, params)
|
||||
if(!proximity)
|
||||
return
|
||||
if(in_use)
|
||||
|
||||
@@ -81,12 +81,12 @@
|
||||
UnregisterSignal(parents[parents.len], COMSIG_ATOM_ENTERING)
|
||||
|
||||
//Parent at top of heirarchy moved.
|
||||
/datum/component/recursive_move/proc/top_moved(var/atom/movable/am, var/atom/new_loc, var/atom/old_loc)
|
||||
/datum/component/recursive_move/proc/top_moved(atom/movable/am, atom/new_loc, atom/old_loc)
|
||||
SIGNAL_HANDLER
|
||||
SEND_SIGNAL(holder, COMSIG_MOVABLE_ATTEMPTED_MOVE, old_loc, new_loc)
|
||||
|
||||
//One of the parents other than the top parent moved.
|
||||
/datum/component/recursive_move/proc/heirarchy_changed(var/atom/old_loc, var/atom/movable/am, var/atom/new_loc)
|
||||
/datum/component/recursive_move/proc/heirarchy_changed(atom/old_loc, atom/movable/am, atom/new_loc)
|
||||
SIGNAL_HANDLER
|
||||
SEND_SIGNAL(holder, COMSIG_MOVABLE_ATTEMPTED_MOVE, old_loc, new_loc)
|
||||
//Rebuild our list of parents
|
||||
@@ -123,7 +123,7 @@
|
||||
name = "banana peel of testing"
|
||||
desc = "spams world log with debugging information"
|
||||
|
||||
/obj/item/bananapeel/test/proc/shmove(var/atom/source, var/atom/old_loc, var/atom/new_loc)
|
||||
/obj/item/bananapeel/test/proc/shmove(atom/source, atom/old_loc, atom/new_loc)
|
||||
SIGNAL_HANDLER
|
||||
world.log << "the [source] moved from [old_loc]([old_loc.x],[old_loc.y],[old_loc.z]) to [new_loc]([new_loc.x],[new_loc.y],[new_loc.z])"
|
||||
|
||||
|
||||
@@ -195,19 +195,19 @@
|
||||
return max_dark_energy
|
||||
|
||||
///Sets the shadekin's energy TO the given value.
|
||||
/datum/component/shadekin/proc/shadekin_set_energy(var/new_energy)
|
||||
/datum/component/shadekin/proc/shadekin_set_energy(new_energy)
|
||||
if(!isnum(new_energy))
|
||||
return
|
||||
dark_energy = CLAMP(new_energy, 0, max_dark_energy)
|
||||
|
||||
///Sets the shadekin's maximum energy.
|
||||
/datum/component/shadekin/proc/shadekin_set_max_energy(var/new_max_energy)
|
||||
/datum/component/shadekin/proc/shadekin_set_max_energy(new_max_energy)
|
||||
if(!isnum(new_max_energy))
|
||||
return //No.
|
||||
max_dark_energy = new_max_energy
|
||||
|
||||
///Adjusts the shadekin's energy by the given amount.
|
||||
/datum/component/shadekin/proc/shadekin_adjust_energy(var/amount)
|
||||
/datum/component/shadekin/proc/shadekin_adjust_energy(amount)
|
||||
if(!isnum(amount))
|
||||
return //No
|
||||
shadekin_set_energy(dark_energy + amount)
|
||||
@@ -224,7 +224,7 @@
|
||||
current_gains += nutrition_conversion_scaling
|
||||
return current_gains
|
||||
|
||||
/datum/component/shadekin/proc/attack_dephase(var/turf/T = null, atom/dephaser)
|
||||
/datum/component/shadekin/proc/attack_dephase(turf/T = null, atom/dephaser)
|
||||
// no assigned dephase-target, just use our own
|
||||
if(!T)
|
||||
T = get_turf(owner)
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
icon = 'icons/obj/Shadekin_powers.dmi'
|
||||
icon_state = "dark_maw_waiting"
|
||||
|
||||
/obj/effect/abstract/dark_maw/Initialize(mapload, var/mob/user, var/trigger_now = FALSE)
|
||||
/obj/effect/abstract/dark_maw/Initialize(mapload, mob/user, trigger_now = FALSE)
|
||||
. = ..()
|
||||
if(!isturf(loc))
|
||||
return INITIALIZE_HINT_QDEL
|
||||
@@ -143,7 +143,7 @@
|
||||
icon_state = "dark_maw_used"
|
||||
qdel(src)
|
||||
|
||||
/obj/effect/abstract/dark_maw/proc/triggered_by(var/mob/living/L, var/triggered_instantly = 0)
|
||||
/obj/effect/abstract/dark_maw/proc/triggered_by(mob/living/L, triggered_instantly = 0)
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
icon_state = "dark_maw_used"
|
||||
flick("dark_maw_tr", src)
|
||||
@@ -153,7 +153,7 @@
|
||||
to_chat(owner, span_warning("A dark maw you deployed has triggered!"))
|
||||
addtimer(CALLBACK(src, PROC_REF(do_trigger), L), 1 SECOND, TIMER_DELETE_ME)
|
||||
|
||||
/obj/effect/abstract/dark_maw/proc/do_trigger(var/mob/living/L)
|
||||
/obj/effect/abstract/dark_maw/proc/do_trigger(mob/living/L)
|
||||
var/will_vore = 1
|
||||
|
||||
if(!(target in owner) || !can_phase_vore(owner, L, TRUE))
|
||||
|
||||
+2
-2
@@ -190,11 +190,11 @@ GLOBAL_LIST_BOILERPLATE(all_darkportal_minions, /obj/structure/dark_portal/minio
|
||||
else
|
||||
to_chat(user, span_notice("You touch the portal, your hand able to pass through without harm."))
|
||||
|
||||
/obj/structure/dark_portal/proc/check_to_close(var/obj/structure/dark_portal/target)
|
||||
/obj/structure/dark_portal/proc/check_to_close(obj/structure/dark_portal/target)
|
||||
if(locked == target)
|
||||
close_portal()
|
||||
|
||||
/obj/structure/dark_portal/proc/check_to_close_desc(var/old_locked)
|
||||
/obj/structure/dark_portal/proc/check_to_close_desc(old_locked)
|
||||
if(locked == old_locked)
|
||||
close_portal()
|
||||
|
||||
|
||||
@@ -101,7 +101,7 @@
|
||||
else
|
||||
phase_out(T, SK)
|
||||
|
||||
/mob/living/proc/phase_in(var/turf/T, var/datum/component/shadekin/SK)
|
||||
/mob/living/proc/phase_in(turf/T, datum/component/shadekin/SK)
|
||||
//In case we're not passed args, do it ourself.
|
||||
if(!T)
|
||||
T = get_turf(src)
|
||||
@@ -156,7 +156,7 @@
|
||||
addtimer(CALLBACK(src, PROC_REF(shadekin_complete_phase_in), original_canmove, SK), SK.phase_time, TIMER_DELETE_ME)
|
||||
|
||||
|
||||
/mob/living/proc/shadekin_complete_phase_in(var/original_canmove, var/datum/component/shadekin/SK)
|
||||
/mob/living/proc/shadekin_complete_phase_in(original_canmove, datum/component/shadekin/SK)
|
||||
canmove = original_canmove
|
||||
alpha = initial(alpha)
|
||||
remove_modifiers_of_type(/datum/modifier/shadekin_phase_vision)
|
||||
@@ -212,7 +212,7 @@
|
||||
continue
|
||||
held_lights.flicker(SK.flicker_time, SK.flicker_color, TRUE)
|
||||
|
||||
/mob/living/proc/phase_out(var/turf/T)
|
||||
/mob/living/proc/phase_out(turf/T)
|
||||
var/datum/component/shadekin/SK = get_shadekin_component()
|
||||
if(!(SK.in_phase))
|
||||
// pre-change
|
||||
@@ -261,7 +261,7 @@
|
||||
addtimer(CALLBACK(src, PROC_REF(complete_phase_out), original_canmove, SK), SK.phase_time, TIMER_DELETE_ME)
|
||||
|
||||
|
||||
/mob/living/proc/complete_phase_out(original_canmove, var/datum/component/shadekin/SK)
|
||||
/mob/living/proc/complete_phase_out(original_canmove, datum/component/shadekin/SK)
|
||||
invisibility = INVISIBILITY_SHADEKIN
|
||||
see_invisible = INVISIBILITY_SHADEKIN
|
||||
see_invisible_default = INVISIBILITY_SHADEKIN // Allow seeing phased entities while phased.
|
||||
|
||||
@@ -56,11 +56,11 @@
|
||||
if(!owner.lying)
|
||||
owner.lay_down()
|
||||
|
||||
/datum/component/xenochimera/proc/set_revival_delay(var/time)
|
||||
/datum/component/xenochimera/proc/set_revival_delay(time)
|
||||
revive_ready = REVIVING_NOW
|
||||
revive_finished = (world.time + time SECONDS) // When do we finish reviving? Allows us to find out when we're done, called by the alert currently.
|
||||
|
||||
/datum/component/xenochimera/proc/trigger_revival(var/from_save_slot)
|
||||
/datum/component/xenochimera/proc/trigger_revival(from_save_slot)
|
||||
ASSERT(revival_record)
|
||||
if(owner.isSynthetic())
|
||||
revival_record.revive_xenochimera(owner,TRUE,from_save_slot)
|
||||
@@ -219,7 +219,7 @@
|
||||
// HUD update time
|
||||
update_xenochimera_hud(danger, feral_state)
|
||||
|
||||
/datum/component/xenochimera/proc/update_xenochimera_hud(var/danger, var/feral)
|
||||
/datum/component/xenochimera/proc/update_xenochimera_hud(danger, feral)
|
||||
if(owner.xenochimera_danger_display)
|
||||
owner.xenochimera_danger_display.invisibility = INVISIBILITY_NONE
|
||||
if(danger && feral)
|
||||
@@ -233,7 +233,7 @@
|
||||
|
||||
return
|
||||
|
||||
/datum/component/xenochimera/proc/go_feral(var/stress, var/cause)
|
||||
/datum/component/xenochimera/proc/go_feral(stress, cause)
|
||||
// Going feral due to hunger
|
||||
if(cause == "hunger")
|
||||
to_chat(owner,span_danger(span_large("Something in your mind flips, your instincts taking over, no longer able to fully comprehend your surroundings as survival becomes your primary concern - you must feed, survive, there is nothing else. Hunt. Eat. Hide. Repeat.")))
|
||||
@@ -438,7 +438,7 @@
|
||||
add_modifier(/datum/modifier/resleeving_sickness/chimera, sickness_duration)
|
||||
adjustBrainLoss(5) // if they're reviving from dead, they come back with 5 brainloss on top of whatever's unhealed.
|
||||
|
||||
/datum/component/xenochimera/proc/chimera_hatch(var/from_save_slot)
|
||||
/datum/component/xenochimera/proc/chimera_hatch(from_save_slot)
|
||||
if(!owner)
|
||||
return
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
/// Giving this to any locker will connect it to the network, allowing extra or none at any given point.
|
||||
/datum/component/bluespace_connection/permanent_network
|
||||
|
||||
/datum/component/bluespace_connection/Initialize(var/list/connections, exit_sound = 'sound/effects/clang.ogg', throw_range = 3, throw_range_x = 5, throw_range_y = 5)
|
||||
/datum/component/bluespace_connection/Initialize(list/connections, exit_sound = 'sound/effects/clang.ogg', throw_range = 3, throw_range_x = 5, throw_range_y = 5)
|
||||
assigned_closet = parent
|
||||
|
||||
if(!istype(assigned_closet, /obj/structure/closet)) // Might expand this in the future? For now, it only goes on closets.
|
||||
@@ -62,7 +62,7 @@
|
||||
playsound(exit_point, exit_sound, 50, TRUE)
|
||||
addtimer(CALLBACK(src, PROC_REF(exit_connection), exit_point, assigned_closet.contents), 1.3 SECONDS)
|
||||
|
||||
/datum/component/bluespace_connection/proc/exit_connection(var/atom/exit_point, var/list/contents)
|
||||
/datum/component/bluespace_connection/proc/exit_connection(atom/exit_point, list/contents)
|
||||
// Nope, must be closed.
|
||||
if(assigned_closet.opened)
|
||||
return
|
||||
@@ -102,11 +102,11 @@
|
||||
/datum/component/bluespace_connection/proc/throw_target()
|
||||
return get_offset_target_turf(get_turf(assigned_closet), rand(throw_range_x)-rand(throw_range_x), rand(throw_range_y)-rand(throw_range_y))
|
||||
|
||||
/datum/component/bluespace_connection/proc/add_exit(var/exit_point)
|
||||
/datum/component/bluespace_connection/proc/add_exit(exit_point)
|
||||
connections.Add(exit_point)
|
||||
return TRUE
|
||||
|
||||
/datum/component/bluespace_connection/proc/sever_connection(var/removed_exit)
|
||||
/datum/component/bluespace_connection/proc/sever_connection(removed_exit)
|
||||
connections -= removed_exit
|
||||
|
||||
do_sparks()
|
||||
|
||||
@@ -206,7 +206,7 @@
|
||||
|
||||
increase_discomfort()
|
||||
|
||||
/datum/component/crowd_detection/lonely/get_discomfort_message(var/current_discomfort)
|
||||
/datum/component/crowd_detection/lonely/get_discomfort_message(current_discomfort)
|
||||
if(current_discomfort >= warning_cap)
|
||||
human_parent.stuttering += 25
|
||||
return span_danger(span_bold(pick("Where are the others?", "Please, there has to be someone nearby!", "I don't want to be alone!","Please, anyone! I don't want to be alone!")))
|
||||
@@ -220,7 +220,7 @@
|
||||
return pick("Well.. No one is around you anymore...","Well.. You're alone now...","You suddenly feel alone...")
|
||||
. = ..()
|
||||
|
||||
/datum/component/crowd_detection/lonely/calm_discomfort(var/amount = 4, var/message)
|
||||
/datum/component/crowd_detection/lonely/calm_discomfort(amount = 4, message)
|
||||
if(!message && !get_calm())
|
||||
message = span_infoplain("The nearby company calms you down...")
|
||||
. = ..(amount, message)
|
||||
|
||||
@@ -249,7 +249,7 @@
|
||||
living_guy.accumulated_rads = CLAMP(living_guy.accumulated_rads, 0, RADIATION_CAP)
|
||||
return COMPONENT_BLOCK_LIVING_RADIATION
|
||||
|
||||
/datum/component/radiation_effects/proc/handle_irradiate_effect(var/mob/living/living_guy, var/effect, var/effecttype, var/blocked, var/check_protection, var/rad_protection)
|
||||
/datum/component/radiation_effects/proc/handle_irradiate_effect(mob/living/living_guy, effect, effecttype, blocked, check_protection, rad_protection)
|
||||
SIGNAL_HANDLER
|
||||
///If we're not contaminating, don't worry about this. Proceed like normal.
|
||||
if(!contamination || (contamination && living_guy.radiation < contamination_threshold))
|
||||
|
||||
@@ -335,7 +335,7 @@
|
||||
|
||||
return
|
||||
|
||||
/datum/component/omen/proc/check_roll(mob/living/unlucky_soul, var/obj/item/dice/the_dice, silent, result)
|
||||
/datum/component/omen/proc/check_roll(mob/living/unlucky_soul, obj/item/dice/the_dice, silent, result)
|
||||
SIGNAL_HANDLER
|
||||
if(prob(20 * luck_mod))
|
||||
//unlucky_soul.visible_message(span_danger("[unlucky_soul] rolls [the_dice] with it landing on the edge of [result] before tilting over!"), span_boldwarning("You feel dreadfully unlucky as you roll the dice!"))
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
slipping_dir = owner.dir
|
||||
RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(move_react))
|
||||
|
||||
/datum/component/turfslip/proc/start_slip(var/turf/simulated/start, var/is_dirt)
|
||||
/datum/component/turfslip/proc/start_slip(turf/simulated/start, is_dirt)
|
||||
var/slip_stun = 6
|
||||
var/floor_type = "wet"
|
||||
var/already_slipping = (slip_dist > 1)
|
||||
|
||||
Reference in New Issue
Block a user