[MIRROR] Cleanup up all instances of using var/ definitions in proc parameters. (#240)

* Cleanup up all instances of using var/ definitions in proc parameters. (#52728)

* var/list cleanup

* The rest of the owl

* plushvar bad

* Can't follow my own advice.

* Cleanup up all instances of using var/ definitions in proc parameters.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
This commit is contained in:
SkyratBot
2020-08-07 18:26:21 +01:00
committed by GitHub
co-authored by Timberpoes
parent 2156012137
commit ee324ab3c2
179 changed files with 359 additions and 359 deletions
+3 -3
View File
@@ -33,7 +33,7 @@
Sink(1)
//Get a node up to its right position in the heap
/datum/heap/proc/Swim(var/index)
/datum/heap/proc/Swim(index)
var/parent = round(index * 0.5)
while(parent > 0 && (call(cmp)(L[index],L[parent]) > 0))
@@ -42,7 +42,7 @@
parent = round(index * 0.5)
//Get a node down to its right position in the heap
/datum/heap/proc/Sink(var/index)
/datum/heap/proc/Sink(index)
var/g_child = GetGreaterChild(index)
while(g_child > 0 && (call(cmp)(L[index],L[g_child]) < 0))
@@ -52,7 +52,7 @@
//Returns the greater (relative to the comparison proc) of a node children
//or 0 if there's no child
/datum/heap/proc/GetGreaterChild(var/index)
/datum/heap/proc/GetGreaterChild(index)
if(index * 2 > L.len)
return 0
+1 -1
View File
@@ -293,7 +293,7 @@
return A && A.type == source.type ? A : null
//Icon smoothing helpers
/proc/smooth_zlevel(var/zlevel, now = FALSE)
/proc/smooth_zlevel(zlevel, now = FALSE)
var/list/away_turfs = block(locate(1, 1, zlevel), locate(world.maxx, world.maxy, zlevel))
for(var/V in away_turfs)
var/turf/T = V
+4 -4
View File
@@ -241,7 +241,7 @@ GLOBAL_LIST_EMPTY(species_list)
return ..()
///Timed action involving one mob user. Target is optional.
/proc/do_after(mob/user, var/delay, needhand = TRUE, atom/target = null, progress = TRUE, datum/callback/extra_checks = null)
/proc/do_after(mob/user, delay, needhand = TRUE, atom/target = null, progress = TRUE, datum/callback/extra_checks = null)
if(!user)
return FALSE
var/atom/Tloc = null
@@ -562,7 +562,7 @@ GLOBAL_LIST_EMPTY(species_list)
. += R
//Returns a list of AI's
/proc/active_ais(check_mind=FALSE, var/z = null)
/proc/active_ais(check_mind=FALSE, z = null)
. = list()
for(var/mob/living/silicon/ai/A in GLOB.alive_mob_list)
if(A.stat == DEAD)
@@ -578,7 +578,7 @@ GLOBAL_LIST_EMPTY(species_list)
return .
//Find an active ai with the least borgs. VERBOSE PROCNAME HUH!
/proc/select_active_ai_with_fewest_borgs(var/z)
/proc/select_active_ai_with_fewest_borgs(z)
var/mob/living/silicon/ai/selected
var/list/active = active_ais(FALSE, z)
for(var/mob/living/silicon/ai/A in active)
@@ -596,7 +596,7 @@ GLOBAL_LIST_EMPTY(species_list)
. = pick(borgs)
return .
/proc/select_active_ai(mob/user, var/z = null)
/proc/select_active_ai(mob/user, z = null)
var/list/ais = active_ais(FALSE, z)
if(ais.len)
if(user)
+2 -2
View File
@@ -1,6 +1,6 @@
/proc/overwrite_field_if_available(datum/data/record/base, datum/data/record/other, var/field_name)
/proc/overwrite_field_if_available(datum/data/record/base, datum/data/record/other, field_name)
if(other.fields[field_name])
base.fields[field_name] = other.fields[field_name]
+1 -1
View File
@@ -858,7 +858,7 @@ GLOBAL_LIST_INIT(binary, list("0","1"))
catch
return
/proc/num2loadingbar(percent as num, var/numSquares = 20, var/reverse = FALSE)
/proc/num2loadingbar(percent as num, numSquares = 20, reverse = FALSE)
var/loadstring = ""
for (var/i in 1 to numSquares)
var/limit = reverse ? numSquares - percent*numSquares : percent*numSquares
+1 -1
View File
@@ -1,4 +1,4 @@
/proc/make_types_fancy(var/list/types)
/proc/make_types_fancy(list/types)
if (ispath(types))
types = list(types)
. = list()
+5 -5
View File
@@ -419,7 +419,7 @@ Turf and target are separate in case you want to teleport some distance from a t
Gets all contents of contents and returns them all in a list.
*/
/atom/proc/GetAllContents(var/T, ignore_flag_1)
/atom/proc/GetAllContents(T, ignore_flag_1)
var/list/processing_list = list(src)
if(T)
. = list()
@@ -821,7 +821,7 @@ B --><-- A
// eg: center_image(I, 32,32)
// eg2: center_image(I, 96,96)
/proc/center_image(var/image/I, x_dimension = 0, y_dimension = 0)
/proc/center_image(image/I, x_dimension = 0, y_dimension = 0)
if(!I)
return
@@ -978,7 +978,7 @@ B --><-- A
return L
/atom/proc/contains(var/atom/A)
/atom/proc/contains(atom/A)
if(!A)
return 0
for(var/atom/location = A.loc, location, location = location.loc)
@@ -1141,7 +1141,7 @@ GLOBAL_REAL_VAR(list/stack_trace_storage)
pixel_x = initialpixelx
pixel_y = initialpixely
/proc/weightclass2text(var/w_class)
/proc/weightclass2text(w_class)
switch(w_class)
if(WEIGHT_CLASS_TINY)
. = "tiny"
@@ -1464,7 +1464,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
for(var/i in L)
if(condition.Invoke(i))
. |= i
/proc/generate_items_inside(list/items_list,var/where_to)
/proc/generate_items_inside(list/items_list,where_to)
for(var/each_item in items_list)
for(var/i in 1 to items_list[each_item])
new each_item(where_to)
+1 -1
View File
@@ -366,7 +366,7 @@ GLOBAL_LIST_EMPTY(the_station_areas)
maprotate()
SSvote.initiate_vote("map", "automatic map rotation")
/datum/controller/subsystem/mapping/proc/changemap(var/datum/map_config/VM)
/datum/controller/subsystem/mapping/proc/changemap(datum/map_config/VM)
if(!VM.MakeNextMap())
next_map_config = load_map_config(default_to_box = TRUE)
message_admins("Failed to set new map with next_map.json for [VM.map_name]! Using default as backup!")
+1 -1
View File
@@ -130,7 +130,7 @@ SUBSYSTEM_DEF(pai)
/datum/controller/subsystem/pai/proc/spam_again()
ghost_spam = FALSE
/datum/controller/subsystem/pai/proc/check_ready(var/datum/pai_candidate/C)
/datum/controller/subsystem/pai/proc/check_ready(datum/pai_candidate/C)
if(!C.ready)
return FALSE
for(var/mob/dead/observer/O in GLOB.player_list)
+1 -1
View File
@@ -18,7 +18,7 @@ SUBSYSTEM_DEF(pathfinder)
var/free
var/list/flow
/datum/flowcache/New(var/n)
/datum/flowcache/New(n)
. = ..()
lcount = n
run = 0
+2 -2
View File
@@ -159,7 +159,7 @@
close()
//designed as a drop in replacement for alert(); functions the same. (outside of needing User specified)
/proc/tgalert(var/mob/User, Message, Title, Button1="Ok", Button2, Button3, StealFocus = 1, Timeout = 6000)
/proc/tgalert(mob/User, Message, Title, Button1="Ok", Button2, Button3, StealFocus = 1, Timeout = 6000)
if (!User)
User = usr
switch(askuser(User, Message, Title, Button1, Button2, Button3, StealFocus, Timeout))
@@ -171,7 +171,7 @@
return Button3
//Same shit, but it returns the button number, could at some point support unlimited button amounts.
/proc/askuser(var/mob/User,Message, Title, Button1="Ok", Button2, Button3, StealFocus = 1, Timeout = 6000)
/proc/askuser(mob/User,Message, Title, Button1="Ok", Button2, Button3, StealFocus = 1, Timeout = 6000)
if (!istype(User))
if (istype(User, /client/))
var/client/C = User
+1 -1
View File
@@ -187,7 +187,7 @@ Behavior that's still missing from this component that original food items had t
return TRUE
///Check foodtypes to see if we should send a moodlet
/datum/component/edible/proc/checkLiked(var/fraction, mob/M)
/datum/component/edible/proc/checkLiked(fraction, mob/M)
if(last_check_time + 50 > world.time)
return FALSE
if(!ishuman(M))
+7 -7
View File
@@ -104,7 +104,7 @@
user.put_in_active_hand(I)
/// Proc specifically for inserting items, returns the amount of materials entered.
/datum/component/material_container/proc/insert_item(obj/item/I, var/multiplier = 1, stack_amt)
/datum/component/material_container/proc/insert_item(obj/item/I, multiplier = 1, stack_amt)
if(QDELETED(I))
return FALSE
@@ -128,7 +128,7 @@
return primary_mat
/// For inserting an amount of material
/datum/component/material_container/proc/insert_amount_mat(amt, var/datum/material/mat)
/datum/component/material_container/proc/insert_amount_mat(amt, datum/material/mat)
if(!istype(mat))
mat = SSmaterials.GetMaterialRef(mat)
if(amt > 0 && has_space(amt))
@@ -143,7 +143,7 @@
return FALSE
/// Uses an amount of a specific material, effectively removing it.
/datum/component/material_container/proc/use_amount_mat(amt, var/datum/material/mat)
/datum/component/material_container/proc/use_amount_mat(amt, datum/material/mat)
if(!istype(mat))
mat = SSmaterials.GetMaterialRef(mat)
var/amount = materials[mat]
@@ -155,7 +155,7 @@
return FALSE
/// Proc for transfering materials to another container.
/datum/component/material_container/proc/transer_amt_to(var/datum/component/material_container/T, amt, var/datum/material/mat)
/datum/component/material_container/proc/transer_amt_to(datum/component/material_container/T, amt, datum/material/mat)
if(!istype(mat))
mat = SSmaterials.GetMaterialRef(mat)
if((amt==0)||(!T)||(!mat))
@@ -207,7 +207,7 @@
return total_amount_save - total_amount
/// For spawning mineral sheets at a specific location. Used by machines to output sheets.
/datum/component/material_container/proc/retrieve_sheets(sheet_amt, var/datum/material/M, target = null)
/datum/component/material_container/proc/retrieve_sheets(sheet_amt, datum/material/M, target = null)
if(!M.sheet_type)
return 0 //Add greyscale sheet handling here later
if(sheet_amt <= 0)
@@ -275,7 +275,7 @@
/// Returns TRUE if you have enough of the specified material.
/datum/component/material_container/proc/has_enough_of_material(var/datum/material/req_mat, amount, multiplier=1)
/datum/component/material_container/proc/has_enough_of_material(datum/material/req_mat, amount, multiplier=1)
if(!materials[req_mat]) //Do we have the resource?
return FALSE //Can't afford it
var/amount_required = amount * multiplier
@@ -314,7 +314,7 @@
return material_amount
/// Returns the amount of a specific material in this container.
/datum/component/material_container/proc/get_material_amount(var/datum/material/mat)
/datum/component/material_container/proc/get_material_amount(datum/material/mat)
if(!istype(mat))
mat = SSmaterials.GetMaterialRef(mat)
return(materials[mat])
+2 -2
View File
@@ -27,7 +27,7 @@
RegisterSignal(parent, COMSIG_OBJ_ATTEMPT_CHARGE, .proc/attempt_charge)
RegisterSignal(parent, COMSIG_OBJ_ATTEMPT_CHARGE_CHANGE, .proc/change_cost)
/datum/component/payment/proc/attempt_charge(datum/source, atom/movable/target, var/extra_fees = 0)
/datum/component/payment/proc/attempt_charge(datum/source, atom/movable/target, extra_fees = 0)
if(!cost) //In case a free variant of anything is made it'll skip charging anyone.
return
if(!ismob(target))
@@ -65,7 +65,7 @@
card.registered_account.bank_card_talk("[cost] credits deducted from your account.")
playsound(src, 'sound/effects/cashregister.ogg', 20, TRUE)
/datum/component/payment/proc/change_cost(datum/source, var/new_cost)
/datum/component/payment/proc/change_cost(datum/source, new_cost)
if(!isnum(new_cost))
CRASH("change_cost called with variable new_cost as not a number.")
cost = new_cost
+1 -1
View File
@@ -15,7 +15,7 @@
/datum/component/pricetag/proc/Unwrapped()
qdel(src) //Once it leaves it's wrapped container, the object in question should lose it's pricetag component.
/datum/component/pricetag/proc/split_profit(var/item_value)
/datum/component/pricetag/proc/split_profit(item_value)
var/price = item_value
if(price)
var/adjusted_value = price*(profit_ratio/100)
+1 -1
View File
@@ -68,7 +68,7 @@
addtimer(CALLBACK(src, .proc/burn_parent, fakefire, user), min(amount * 0.35 SECONDS, 20 SECONDS))
UnregisterFromParent()
/datum/component/thermite/proc/burn_parent(var/datum/fakefire, mob/user)
/datum/component/thermite/proc/burn_parent(datum/fakefire, mob/user)
var/turf/master = parent
if(!QDELETED(fakefire))
qdel(fakefire)
+2 -2
View File
@@ -41,12 +41,12 @@
SSdisease.active_diseases.Remove(src)
//add this disease if the host does not already have too many
/datum/disease/proc/try_infect(var/mob/living/infectee, make_copy = TRUE)
/datum/disease/proc/try_infect(mob/living/infectee, make_copy = TRUE)
infect(infectee, make_copy)
return TRUE
//add the disease with no checks
/datum/disease/proc/infect(var/mob/living/infectee, make_copy = TRUE)
/datum/disease/proc/infect(mob/living/infectee, make_copy = TRUE)
var/datum/disease/D = make_copy ? Copy() : src
infectee.diseases += D
D.affected_mob = infectee
+2 -2
View File
@@ -85,7 +85,7 @@
S.End(src)
return ..()
/datum/disease/advance/try_infect(var/mob/living/infectee, make_copy = TRUE)
/datum/disease/advance/try_infect(mob/living/infectee, make_copy = TRUE)
//see if we are more transmittable than enough diseases to replace them
//diseases replaced in this way do not confer immunity
var/list/advance_diseases = list()
@@ -392,7 +392,7 @@
*/
// Mix a list of advance diseases and return the mixed result.
/proc/Advance_Mix(var/list/D_list)
/proc/Advance_Mix(list/D_list)
var/list/diseases = list()
for(var/datum/disease/advance/A in D_list)
@@ -38,7 +38,7 @@ Bonus
symptom_delay_min = 20
symptom_delay_max = 45
/datum/symptom/narcolepsy/Activate(var/datum/disease/advance/A)
/datum/symptom/narcolepsy/Activate(datum/disease/advance/A)
var/mob/living/M = A.affected_mob
switch(A.stage)
if(1)
@@ -27,7 +27,7 @@
if(A.properties["transmittable"] >= 8) //purge alcohol
purge_alcohol = TRUE
/datum/symptom/mind_restoration/Activate(var/datum/disease/advance/A)
/datum/symptom/mind_restoration/Activate(datum/disease/advance/A)
if(!..())
return
var/mob/living/M = A.affected_mob
+1 -1
View File
@@ -75,7 +75,7 @@
new_mob.real_name = new_mob.name
qdel(affected_mob)
/datum/disease/transformation/proc/replace_banned_player(var/mob/living/new_mob) // This can run well after the mob has been transferred, so need a handle on the new mob to kill it if needed.
/datum/disease/transformation/proc/replace_banned_player(mob/living/new_mob) // This can run well after the mob has been transferred, so need a handle on the new mob to kill it if needed.
set waitfor = FALSE
var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [affected_mob.name]?", bantype, null, bantype, 50, affected_mob)
+1 -1
View File
@@ -101,7 +101,7 @@ Simple datum which is instanced once per type and is used for every object of sa
I.pickup_sound = item_sound_override
I.drop_sound = item_sound_override
/datum/material/proc/on_applied_turf(var/turf/T, amount, material_flags)
/datum/material/proc/on_applied_turf(turf/T, amount, material_flags)
if(isopenturf(T))
if(!turf_sound_override)
return
+3 -3
View File
@@ -12,7 +12,7 @@
default /datum/recipe/ procs does not rely on this parameter.
*
* Functions you need:
* /datum/recipe/proc/make(var/obj/container as obj)
* /datum/recipe/proc/make(obj/container as obj)
* Creates result inside container,
* deletes prerequisite reagents,
* transfers reagents from prerequisite objects,
@@ -25,10 +25,10 @@
*
*
* Functions you do not need to call directly but could:
* /datum/recipe/proc/check_reagents(var/datum/reagents/avail_reagents)
* /datum/recipe/proc/check_reagents(datum/reagents/avail_reagents)
* //1=precisely, 0=insufficiently, -1=superfluous
*
* /datum/recipe/proc/check_items(var/obj/container as obj)
* /datum/recipe/proc/check_items(obj/container as obj)
* //1=precisely, 0=insufficiently, -1=superfluous
*
* */
+5 -5
View File
@@ -16,7 +16,7 @@ GLOBAL_LIST_INIT(skill_types, subtypesof(/datum/skill))
/datum/skill/proc/get_skill_modifier(modifier, level)
return modifiers[modifier][level] //Levels range from 1 (None) to 7 (Legendary)
/**
* new: sets up some lists.
* new: sets up some lists.
*
*Can't happen in the datum's definition because these lists are not constant expressions
*/
@@ -47,12 +47,12 @@ GLOBAL_LIST_INIT(skill_types, subtypesof(/datum/skill))
* * new_level - The newly gained level. Can check the actual level to give different messages at different levels, see defines in skills.dm
* * old_level - Similar to the above, but the level you had before levelling up.
*/
/datum/skill/proc/level_gained(var/datum/mind/mind, new_level, old_level)//just for announcements (doesn't go off if the xp gain is silent)
/datum/skill/proc/level_gained(datum/mind/mind, new_level, old_level)//just for announcements (doesn't go off if the xp gain is silent)
to_chat(mind.current, levelUpMessages[new_level]) //new_level will be a value from 1 to 6, so we get appropriate message from the 6-element levelUpMessages list
/**
* level_lost: See level_gained, same idea but fires on skill level-down
*/
/datum/skill/proc/level_lost(var/datum/mind/mind, new_level, old_level)
/datum/skill/proc/level_lost(datum/mind/mind, new_level, old_level)
to_chat(mind.current, levelDownMessages[old_level]) //old_level will be a value from 1 to 6, so we get appropriate message from the 6-element levelUpMessages list
/**
@@ -63,10 +63,10 @@ GLOBAL_LIST_INIT(skill_types, subtypesof(/datum/skill))
* * mind - The mind that you'll want to send messages and rewards to
* * new_level - The current level of the user. Used to check if it meets the requirements for a reward
*/
/datum/skill/proc/try_skill_reward(var/datum/mind/mind, new_level)
/datum/skill/proc/try_skill_reward(datum/mind/mind, new_level)
if (new_level != SKILL_LEVEL_LEGENDARY)
return
if (!ispath(skill_cape_path))
if (!ispath(skill_cape_path))
to_chat(mind.current, "<span class='nicegreen'>My legendary [name] skill is quite impressive, though it seems the Professional [title] Association doesn't have any status symbols to commemorate my abilities with. I should let Centcom know of this travesty, maybe they can do something about it.</span>")
return
if (LAZYFIND(mind.skills_rewarded, src.type))
+1 -1
View File
@@ -13,7 +13,7 @@
Asserts are to avoid the inevitable infinite loops
*/
/area/holodeck/powered(var/chan)
/area/holodeck/powered(chan)
if(!requires_power)
return 1
if(always_unpowered)
+1 -1
View File
@@ -1473,5 +1473,5 @@
*
* Use this if an atom needs to attempt to charge another atom.
*/
/atom/proc/attempt_charge(var/atom/sender, var/atom/target, var/extra_fees = 0)
/atom/proc/attempt_charge(atom/sender, atom/target, extra_fees = 0)
return SEND_SIGNAL(sender, COMSIG_OBJ_ATTEMPT_CHARGE, target, extra_fees)
+3 -3
View File
@@ -5,7 +5,7 @@
Note that walkie-talkie, intercoms and headsets handle transmission using nonstandard way.
procs:
add_object(obj/device as obj, var/new_frequency as num, var/filter as text|null = null)
add_object(obj/device as obj, new_frequency as num, filter as text|null = null)
Adds listening object.
parameters:
device - device receiving signals, must have proc receive_signal (see description below).
@@ -30,7 +30,7 @@
radio_frequency is a global object maintaining list of devices that listening specific frequency.
procs:
post_signal(obj/source as obj|null, datum/signal/signal, var/filter as text|null = null, var/range as num|null = null)
post_signal(obj/source as obj|null, datum/signal/signal, filter as text|null = null, range as num|null = null)
Sends signal to all devices that wants such signal.
parameters:
source - object, emitted signal. Usually, devices will not receive their own signals.
@@ -38,7 +38,7 @@
filter - described above.
range - radius of regular byond's square circle on that z-level. null means everywhere, on all z-levels.
obj/proc/receive_signal(datum/signal/signal, var/receive_method as num, var/receive_param)
obj/proc/receive_signal(datum/signal/signal, receive_method as num, receive_param)
Handler from received signals. By default does nothing. Define your own for your object.
Avoid of sending signals directly from this proc, use spawn(0). Do not use sleep() here please.
parameters:
@@ -145,7 +145,7 @@
/// Checks for revhead loss conditions and other antag datums.
/datum/dynamic_ruleset/latejoin/provocateur/proc/check_eligible(var/datum/mind/M)
/datum/dynamic_ruleset/latejoin/provocateur/proc/check_eligible(datum/mind/M)
var/turf/T = get_turf(M.current)
if(!considered_afk(M) && considered_alive(M) && is_station_level(T.z) && !M.antag_datums?.len && !HAS_TRAIT(M, TRAIT_MINDSHIELD))
return TRUE
@@ -63,7 +63,7 @@
// Or autotator someone
// IMPORTANT, since /datum/dynamic_ruleset/midround may accept candidates from both living, dead, and even antag players, you need to manually check whether there are enough candidates
// (see /datum/dynamic_ruleset/midround/autotraitor/ready(var/forced = FALSE) for example)
// (see /datum/dynamic_ruleset/midround/autotraitor/ready(forced = FALSE) for example)
/datum/dynamic_ruleset/midround/ready(forced = FALSE)
if (!forced)
var/job_check = 0
@@ -459,7 +459,7 @@
return RULESET_STOP_PROCESSING
/// Checks for revhead loss conditions and other antag datums.
/datum/dynamic_ruleset/roundstart/revs/proc/check_eligible(var/datum/mind/M)
/datum/dynamic_ruleset/roundstart/revs/proc/check_eligible(datum/mind/M)
var/turf/T = get_turf(M.current)
if(!considered_afk(M) && considered_alive(M) && is_station_level(T.z) && !M.antag_datums?.len && !HAS_TRAIT(M, TRAIT_MINDSHIELD))
return TRUE
+1 -1
View File
@@ -11,7 +11,7 @@ GLOBAL_LIST(admin_objective_list) //Prefilled admin assignable objective list
var/completed = 0 //currently only used for custom objectives.
var/martyr_compatible = 0 //If the objective is compatible with martyr objective, i.e. if you can still do it while dead.
/datum/objective/New(var/text)
/datum/objective/New(text)
if(text)
explanation_text = text
+2 -2
View File
@@ -25,7 +25,7 @@
var/doorname = "airlock"
/datum/airlock_maker/New(var/atom/target_loc)
/datum/airlock_maker/New(atom/target_loc)
linked = new(target_loc)
linked.maker = src
linked.set_anchored(FALSE)
@@ -70,7 +70,7 @@
dat += "</table><hr><a href='?src=[REF(src)];done'>Finalize Airlock Construction</a> | <a href='?src=[REF(src)];cancel'>Cancel and Destroy Airlock</a>"
usr << browse(dat,"window=airlockmaker")
/datum/airlock_maker/Topic(var/href,var/list/href_list)
/datum/airlock_maker/Topic(href,list/href_list)
if(!usr)
return
if(!src || !linked || !linked.loc)
+1 -1
View File
@@ -178,7 +178,7 @@ GLOBAL_LIST_EMPTY(request_list)
///the account of the request fulfiller.
var/list/applicants = list()
/datum/station_request/New(var/owned, var/newvalue, var/newdescription, var/reqnum, var/own_account)
/datum/station_request/New(owned, newvalue, newdescription, reqnum, own_account)
. = ..()
owner = owned
value = newvalue
+1 -1
View File
@@ -1424,7 +1424,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
//Add Random/Specific crewmember
/obj/machinery/computer/arcade/orion_trail/proc/add_crewmember(var/specific = "")
/obj/machinery/computer/arcade/orion_trail/proc/add_crewmember(specific = "")
var/newcrew = ""
if(specific)
newcrew = specific
+1 -1
View File
@@ -340,7 +340,7 @@
return data
/obj/machinery/computer/scan_consolenew/ui_act(action, var/list/params)
/obj/machinery/computer/scan_consolenew/ui_act(action, list/params)
if(..())
return TRUE
+4 -4
View File
@@ -328,7 +328,7 @@
#undef DISCO_INFENO_RANGE
/obj/machinery/jukebox/disco/proc/dance(var/mob/living/M) //Show your moves
/obj/machinery/jukebox/disco/proc/dance(mob/living/M) //Show your moves
set waitfor = FALSE
switch(rand(0,9))
if(0 to 1)
@@ -349,7 +349,7 @@
if(dir == WEST)
emote("flip")
/obj/machinery/jukebox/disco/proc/dance3(var/mob/living/M)
/obj/machinery/jukebox/disco/proc/dance3(mob/living/M)
var/matrix/initial_matrix = matrix(M.transform)
for (var/i in 1 to 75)
if (!M)
@@ -396,7 +396,7 @@
sleep(1)
M.lying_fix()
/obj/machinery/jukebox/disco/proc/dance4(var/mob/living/M)
/obj/machinery/jukebox/disco/proc/dance4(mob/living/M)
var/speed = rand(1,3)
set waitfor = 0
var/time = 30
@@ -408,7 +408,7 @@
NS.set_resting(!NS.resting, TRUE)
time--
/obj/machinery/jukebox/disco/proc/dance5(var/mob/living/M)
/obj/machinery/jukebox/disco/proc/dance5(mob/living/M)
animate(M, transform = matrix(180, MATRIX_ROTATE), time = 1, loop = 0)
var/matrix/initial_matrix = matrix(M.transform)
for (var/i in 1 to 60)
+1 -1
View File
@@ -199,7 +199,7 @@
. = ..()
. += "<span class='notice'>Its channel ID is '[id]'.</span>"
/obj/item/wallframe/flasher/after_attach(var/obj/O)
/obj/item/wallframe/flasher/after_attach(obj/O)
..()
var/obj/machinery/flasher/F = O
F.id = id
+1 -1
View File
@@ -75,7 +75,7 @@
GLOB.deliverybeacontags -= location
GLOB.wayfindingbeacons -= src
/obj/machinery/navbeacon/proc/glob_lists_register(var/init=FALSE)
/obj/machinery/navbeacon/proc/glob_lists_register(init=FALSE)
if(!init)
glob_lists_deregister()
if(codes["patrol"])
@@ -112,7 +112,7 @@
if(!has_cover)
INVOKE_ASYNC(src, .proc/popUp)
/obj/machinery/porta_turret/proc/toggle_on(var/set_to)
/obj/machinery/porta_turret/proc/toggle_on(set_to)
var/current = on
if (!isnull(set_to))
on = set_to
+2 -2
View File
@@ -45,7 +45,7 @@
shield.forceMove(loc)
shield.dir = dir
/obj/mecha/combat/durand/forceMove(var/turf/T)
/obj/mecha/combat/durand/forceMove(turf/T)
. = ..()
shield.forceMove(T)
@@ -72,7 +72,7 @@
/**Checks if defense mode is enabled, and if the attacker is standing in an area covered by the shield.
Expects a turf. Returns true if the attack should be blocked, false if not.*/
/obj/mecha/combat/durand/proc/defense_check(var/turf/aloc)
/obj/mecha/combat/durand/proc/defense_check(turf/aloc)
if (!defense_mode || !shield || shield.switching)
return FALSE
. = FALSE
@@ -301,7 +301,7 @@
return 1000 //making magic
/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/proc/GET_MUTATION_POWER_channel(var/area/A)
/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/proc/GET_MUTATION_POWER_channel(area/A)
var/pow_chan
if(A)
for(var/c in use_channels)
@@ -408,7 +408,7 @@
if(result)
send_byjax(chassis.occupant,"exosuit.browser","[REF(src)]",src.get_equip_info())
/obj/item/mecha_parts/mecha_equipment/generator/proc/load_fuel(var/obj/item/stack/sheet/P)
/obj/item/mecha_parts/mecha_equipment/generator/proc/load_fuel(obj/item/stack/sheet/P)
if(P.type == fuel.type && P.amount > 0)
var/to_load = max(max_fuel - fuel.amount*MINERAL_MATERIAL_AMOUNT,0)
if(to_load)
@@ -529,13 +529,13 @@
/obj/item/mecha_parts/mecha_equipment/thrusters/get_equip_info()
return "[..()] \[<a href='?src=[REF(src)];mode=0'>Enable</a>|<a href='?src=[REF(src)];mode=1'>Disable</a>\]"
/obj/item/mecha_parts/mecha_equipment/thrusters/proc/thrust(var/movement_dir)
/obj/item/mecha_parts/mecha_equipment/thrusters/proc/thrust(movement_dir)
if(!chassis)
return FALSE
generate_effect(movement_dir)
return TRUE //This parent should never exist in-game outside admeme use, so why not let it be a creative thruster?
/obj/item/mecha_parts/mecha_equipment/thrusters/proc/generate_effect(var/movement_dir)
/obj/item/mecha_parts/mecha_equipment/thrusters/proc/generate_effect(movement_dir)
var/obj/effect/particle_effect/E = new effect_type(get_turf(chassis))
E.dir = turn(movement_dir, 180)
step(E, turn(movement_dir, 180))
@@ -554,7 +554,7 @@
return FALSE
. = ..()
/obj/item/mecha_parts/mecha_equipment/thrusters/gas/thrust(var/movement_dir)
/obj/item/mecha_parts/mecha_equipment/thrusters/gas/thrust(movement_dir)
if(!chassis || !chassis.internal_tank)
return FALSE
var/moles = chassis.internal_tank.air_contents.total_moles()
@@ -574,7 +574,7 @@
salvageable = FALSE
effect_type = /obj/effect/particle_effect/ion_trails
/obj/item/mecha_parts/mecha_equipment/thrusters/ion/thrust(var/movement_dir)
/obj/item/mecha_parts/mecha_equipment/thrusters/ion/thrust(movement_dir)
if(!chassis)
return FALSE
if(chassis.use_power(chassis.step_energy_drain))
@@ -328,7 +328,7 @@
/obj/item/mecha_parts/mecha_equipment/rcd/do_after_cooldown(var/atom/target)
/obj/item/mecha_parts/mecha_equipment/rcd/do_after_cooldown(atom/target)
. = ..()
/obj/item/mecha_parts/mecha_equipment/rcd/Topic(href,href_list)
+3 -3
View File
@@ -379,7 +379,7 @@
return 1
//used for projectile initilisation (priming flashbang) and additional logging
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/proc/proj_init(var/obj/O)
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/proc/proj_init(obj/O)
return
@@ -397,7 +397,7 @@
var/det_time = 20
ammo_type = "flashbang"
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/proj_init(var/obj/item/grenade/flashbang/F)
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/proj_init(obj/item/grenade/flashbang/F)
var/turf/T = get_turf(src)
message_admins("[ADMIN_LOOKUPFLW(chassis.occupant)] fired a [src] in [ADMIN_VERBOSEJMP(T)]")
log_game("[key_name(chassis.occupant)] fired a [src] in [AREACOORD(T)]")
@@ -450,7 +450,7 @@
return 1
return 0
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/mousetrap_mortar/proj_init(var/obj/item/assembly/mousetrap/armed/M)
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/mousetrap_mortar/proj_init(obj/item/assembly/mousetrap/armed/M)
M.secured = 1
+3 -3
View File
@@ -110,7 +110,7 @@
* * D - Design datum to get information on.
* * categories - Boolean, whether or not to parse snowflake categories into the part information list.
*/
/obj/machinery/mecha_part_fabricator/proc/output_part_info(datum/design/D, var/categories = FALSE)
/obj/machinery/mecha_part_fabricator/proc/output_part_info(datum/design/D, categories = FALSE)
var/cost = list()
for(var/c in D.materials)
var/datum/material/M = c
@@ -442,7 +442,7 @@
* * resource - Material datum reference to the resource to calculate the cost of.
* * roundto - Rounding value for round() proc
*/
/obj/machinery/mecha_part_fabricator/proc/get_resource_cost_w_coeff(datum/design/D, var/datum/material/resource, roundto = 1)
/obj/machinery/mecha_part_fabricator/proc/get_resource_cost_w_coeff(datum/design/D, datum/material/resource, roundto = 1)
return round(D.materials[resource]*component_coeff, roundto)
/**
@@ -526,7 +526,7 @@
return data
/obj/machinery/mecha_part_fabricator/ui_act(action, var/list/params)
/obj/machinery/mecha_part_fabricator/ui_act(action, list/params)
if(..())
return TRUE
+6 -6
View File
@@ -240,7 +240,7 @@
return internal_tank
///Adds a cell, for use in Map-spawned mechs, Nuke Ops mechs, and admin-spawned mechs. Mechs built by hand will replace this.
/obj/mecha/proc/add_cell(var/obj/item/stock_parts/cell/C=null)
/obj/mecha/proc/add_cell(obj/item/stock_parts/cell/C=null)
QDEL_NULL(cell)
if(C)
C.forceMove(src)
@@ -249,7 +249,7 @@
cell = new /obj/item/stock_parts/cell/high/plus(src)
///Adds a scanning module, for use in Map-spawned mechs, Nuke Ops mechs, and admin-spawned mechs. Mechs built by hand will replace this.
/obj/mecha/proc/add_scanmod(var/obj/item/stock_parts/scanning_module/sm=null)
/obj/mecha/proc/add_scanmod(obj/item/stock_parts/scanning_module/sm=null)
QDEL_NULL(scanmod)
if(sm)
sm.forceMove(src)
@@ -258,7 +258,7 @@
scanmod = new /obj/item/stock_parts/scanning_module(src)
///Adds a capacitor, for use in Map-spawned mechs, Nuke Ops mechs, and admin-spawned mechs. Mechs built by hand will replace this.
/obj/mecha/proc/add_capacitor(var/obj/item/stock_parts/capacitor/cap=null)
/obj/mecha/proc/add_capacitor(obj/item/stock_parts/capacitor/cap=null)
QDEL_NULL(capacitor)
if(cap)
cap.forceMove(src)
@@ -549,7 +549,7 @@
occupant_message("<span class='warning'>Air port connection has been severed!</span>")
log_message("Lost connection to gas port.", LOG_MECHA)
/obj/mecha/Process_Spacemove(var/movement_dir = 0)
/obj/mecha/Process_Spacemove(movement_dir = 0)
. = ..()
if(.)
return TRUE
@@ -648,7 +648,7 @@
play_stepsound()
step_silent = FALSE
/obj/mecha/Bump(var/atom/obstacle)
/obj/mecha/Bump(atom/obstacle)
if(phasing && get_charge() >= phasing_energy_drain && !throwing)
if(!can_move)
return
@@ -1149,7 +1149,7 @@ GLOBAL_VAR_INIT(year_integer, text2num(year)) // = 2013???
////// Ammo stuff /////
///////////////////////
/obj/mecha/proc/ammo_resupply(var/obj/item/mecha_ammo/A, mob/user,var/fail_chat_override = FALSE)
/obj/mecha/proc/ammo_resupply(obj/item/mecha_ammo/A, mob/user,fail_chat_override = FALSE)
if(!A.rounds)
if(!fail_chat_override)
to_chat(user, "<span class='warning'>This box of ammo is empty!</span>")
+1 -1
View File
@@ -549,7 +549,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
attack_self(user)
///This proc determines if and at what an object will reflect energy projectiles if it's in l_hand,r_hand or wear_suit
/obj/item/proc/IsReflect(var/def_zone)
/obj/item/proc/IsReflect(def_zone)
return FALSE
/obj/item/proc/eyestab(mob/living/carbon/M, mob/living/carbon/user)
+4 -4
View File
@@ -24,16 +24,16 @@ AI MODULES
var/bypass_law_amt_check = 0
custom_materials = list(/datum/material/gold = 50)
/obj/item/ai_module/examine(var/mob/user as mob)
/obj/item/ai_module/examine(mob/user as mob)
. = ..()
if(Adjacent(user))
show_laws(user)
/obj/item/ai_module/attack_self(var/mob/user as mob)
/obj/item/ai_module/attack_self(mob/user as mob)
..()
show_laws(user)
/obj/item/ai_module/proc/show_laws(var/mob/user as mob)
/obj/item/ai_module/proc/show_laws(mob/user as mob)
if(laws.len)
to_chat(user, "<B>Programmed Law[(laws.len > 1) ? "s" : ""]:</B>")
for(var/law in laws)
@@ -364,7 +364,7 @@ AI MODULES
law_id = "asimov"
var/subject = "human being"
/obj/item/ai_module/core/full/asimov/attack_self(var/mob/user as mob)
/obj/item/ai_module/core/full/asimov/attack_self(mob/user as mob)
var/targName = stripped_input(user, "Please enter a new subject that asimov is concerned with.", "Asimov to whom?", subject, MAX_NAME_LEN)
if(!targName)
return
+1 -1
View File
@@ -788,7 +788,7 @@ RLD
to_chat(user, "<span class='notice'>You change RLD's mode to 'Deconstruct'.</span>")
/obj/item/construction/rld/proc/checkdupes(var/target)
/obj/item/construction/rld/proc/checkdupes(target)
. = list()
var/turf/checking = get_turf(target)
for(var/obj/machinery/light/dupe in checking)
+1 -1
View File
@@ -55,7 +55,7 @@
qdel(src)
/obj/item/wallframe/proc/after_attach(var/obj/O)
/obj/item/wallframe/proc/after_attach(obj/O)
transfer_fingerprints_to(O)
/obj/item/wallframe/attackby(obj/item/W, mob/user, params)
+2 -2
View File
@@ -14,14 +14,14 @@
if(iscarbon(loc))
Insert(loc)
/obj/item/organ/body_egg/Insert(var/mob/living/carbon/M, special = 0)
/obj/item/organ/body_egg/Insert(mob/living/carbon/M, special = 0)
..()
ADD_TRAIT(owner, TRAIT_XENO_HOST, TRAIT_GENERIC)
ADD_TRAIT(owner, TRAIT_XENO_IMMUNE, "xeno immune")
owner.med_hud_set_status()
INVOKE_ASYNC(src, .proc/AddInfectionImages, owner)
/obj/item/organ/body_egg/Remove(var/mob/living/carbon/M, special = 0)
/obj/item/organ/body_egg/Remove(mob/living/carbon/M, special = 0)
if(owner)
REMOVE_TRAIT(owner, TRAIT_XENO_HOST, TRAIT_GENERIC)
REMOVE_TRAIT(owner, TRAIT_XENO_IMMUNE, "xeno immune")
+1 -1
View File
@@ -350,7 +350,7 @@
visible_message("<span class='notice'>[src] snap back into [defib].</span>")
snap_back()
/obj/item/shockpaddles/proc/recharge(var/time)
/obj/item/shockpaddles/proc/recharge(time)
if(req_defib || !time)
return
cooldown = TRUE
@@ -298,7 +298,7 @@
break
src.updateSelfDialog()
/obj/item/camera_bug/proc/same_z_level(var/obj/machinery/camera/C)
/obj/item/camera_bug/proc/same_z_level(obj/machinery/camera/C)
var/turf/T_cam = get_turf(C)
var/turf/T_bug = get_turf(loc)
if(!T_bug || T_cam.z != T_bug.z)
@@ -178,7 +178,7 @@
playsound(src.loc, 'sound/machines/ding.ogg', 50, TRUE)
return new_bulbs
/obj/item/lightreplacer/proc/Charge(var/mob/user)
/obj/item/lightreplacer/proc/Charge(mob/user)
charge += 1
if(charge > 3)
AddUses(1)
@@ -3,7 +3,7 @@
desc = "Made by Nerd. Co's infiltration and surveillance department. Upon closer inspection, there's a small screen in each lens."
var/obj/item/spy_bug/linked_bug
/obj/item/clothing/glasses/regular/spy/proc/show_to_user(var/mob/user)//this is the meat of it. most of the map_popup usage is in this.
/obj/item/clothing/glasses/regular/spy/proc/show_to_user(mob/user)//this is the meat of it. most of the map_popup usage is in this.
if(!user)
return
if(!user.client)
+1 -1
View File
@@ -229,7 +229,7 @@
return
EmptyExtinguisher(user)
/obj/item/extinguisher/proc/EmptyExtinguisher(var/mob/user)
/obj/item/extinguisher/proc/EmptyExtinguisher(mob/user)
if(loc == user && reagents.total_volume)
reagents.clear_reagents()
+4 -4
View File
@@ -392,7 +392,7 @@
attack_verb = list("rent")
squeak_override = list('sound/magic/demon_attack1.ogg'=1)
/obj/item/toy/plush/plushvar
/obj/item/toy/plush/ratplush
name = "\improper Ratvar plushie"
desc = "An adorable plushie of the clockwork justiciar himself with new and improved spring arm action."
icon_state = "plushvar"
@@ -400,7 +400,7 @@
var/obj/item/toy/plush/narplush/clash_target
gender = MALE //he's a boy, right?
/obj/item/toy/plush/plushvar/Moved()
/obj/item/toy/plush/ratplush/Moved()
. = ..()
if(clash_target)
return
@@ -408,7 +408,7 @@
if(P && istype(P.loc, /turf/open) && !P.clashing)
clash_of_the_plushies(P)
/obj/item/toy/plush/plushvar/proc/clash_of_the_plushies(obj/item/toy/plush/narplush/P)
/obj/item/toy/plush/ratplush/proc/clash_of_the_plushies(obj/item/toy/plush/narplush/P)
clash_target = P
P.clashing = TRUE
say("YOU.")
@@ -489,7 +489,7 @@
/obj/item/toy/plush/narplush/Moved()
. = ..()
var/obj/item/toy/plush/plushvar/P = locate() in range(1, src)
var/obj/item/toy/plush/ratplush/P = locate() in range(1, src)
if(P && istype(P.loc, /turf/open) && !P.clash_target && !clashing)
P.clash_of_the_plushies(src)
+2 -2
View File
@@ -171,7 +171,7 @@
/obj/item/watertank/janitor/make_noz()
return new /obj/item/reagent_containers/spray/mister/janitor(src)
/obj/item/reagent_containers/spray/mister/janitor/attack_self(var/mob/user)
/obj/item/reagent_containers/spray/mister/janitor/attack_self(mob/user)
amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10)
to_chat(user, "<span class='notice'>You [amount_per_transfer_from_this == 10 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.</span>")
@@ -376,7 +376,7 @@
turn_on()
//Todo : cache these.
/obj/item/reagent_containers/chemtank/worn_overlays(var/isinhands = FALSE) //apply chemcolor and level
/obj/item/reagent_containers/chemtank/worn_overlays(isinhands = FALSE) //apply chemcolor and level
. = list()
//inhands + reagent_filling
if(!isinhands && reagents.total_volume)
+36 -36
View File
@@ -32,19 +32,19 @@
/// TRUE = in combat currently || FALSE = Not in combat
var/in_combat = FALSE
/// The mech's health in battle
var/combat_health = 0
var/combat_health = 0
/// The mech's max combat health
var/max_combat_health = 0
/// TRUE = the special attack is charged || FALSE = not charged
var/special_attack_charged = FALSE
/// What type of special attack they use - SPECIAL_ATTACK_DAMAGE, SPECIAL_ATTACK_HEAL, SPECIAL_ATTACK_UTILITY, SPECIAL_ATTACK_OTHER
var/special_attack_type = 0
var/special_attack_type = 0
/// What message their special move gets on examining
var/special_attack_type_message = ""
/// The battlecry when using the special attack
var/special_attack_cry = "*flip"
/// Current cooldown of their special attack
var/special_attack_cooldown = 0
var/special_attack_cooldown = 0
/// This mech's win count in combat
var/wins = 0
/// ...And their loss count in combat
@@ -52,7 +52,7 @@
/obj/item/toy/prize/Initialize()
. = ..()
desc = "Mini-Mecha action figure! Collect them all! Attack your friends or another mech with one to initiate epic mech combat! [desc]."
desc = "Mini-Mecha action figure! Collect them all! Attack your friends or another mech with one to initiate epic mech combat! [desc]."
combat_health = max_combat_health
switch(special_attack_type)
if(SPECIAL_ATTACK_DAMAGE)
@@ -67,7 +67,7 @@
special_attack_type_message = "a mystery move, even I don't know."
/**
* this proc combines "sleep" while also checking for if the battle should continue
* this proc combines "sleep" while also checking for if the battle should continue
*
* this goes through some of the checks - the toys need to be next to each other to fight!
* if it's player vs themself: They need to be able to "control" both mechs (either must be adjacent or using TK)
@@ -80,10 +80,10 @@
* * attacker_controller - the controller of the attacking toy. there should ALWAYS be an attacker_controller
* * opponent - (optional) the defender controller in the battle, for PvP
*/
/obj/item/toy/prize/proc/combat_sleep(var/delay, obj/item/toy/prize/attacker, mob/living/carbon/attacker_controller, mob/living/carbon/opponent)
/obj/item/toy/prize/proc/combat_sleep(delay, obj/item/toy/prize/attacker, mob/living/carbon/attacker_controller, mob/living/carbon/opponent)
if(!attacker_controller)
return FALSE
if(!attacker) //if there's no attacker, then attacker_controller IS the attacker
if(!in_range(src, attacker_controller))
attacker_controller.visible_message("<span class='suicide'>[attacker_controller] is running from [src]! The coward!</span>")
@@ -140,10 +140,10 @@
attack_self(user)
/**
* If you attack a mech with a mech, initiate combat between them
* If you attack a mech with a mech, initiate combat between them
*/
/obj/item/toy/prize/attackby(obj/item/user_toy, mob/living/user)
if(istype(user_toy, /obj/item/toy/prize))
if(istype(user_toy, /obj/item/toy/prize))
var/obj/item/toy/prize/P = user_toy
if(check_battle_start(user, P))
mecha_brawl(P, user)
@@ -219,7 +219,7 @@
sleep(1.5 SECONDS)
for(var/i in 1 to 4)
switch(i)
if(1, 3)
if(1, 3)
SpinAnimation(5, 0)
playsound(src, 'sound/mecha/mechstep.ogg', 30, TRUE)
user.adjustBruteLoss(25)
@@ -301,9 +301,9 @@
sleep(1 SECONDS)
//--THE BATTLE BEGINS--
while(combat_health > 0 && attacker.combat_health > 0 && battle_length < MAX_BATTLE_LENGTH)
while(combat_health > 0 && attacker.combat_health > 0 && battle_length < MAX_BATTLE_LENGTH)
if(!combat_sleep(0.5 SECONDS, attacker, attacker_controller, opponent)) //combat_sleep checks everything we need to have checked for combat to continue
break
break
//before we do anything - deal with charged attacks
if(special_attack_charged)
@@ -329,7 +329,7 @@
attacker.special_attack_charged = TRUE
attacker_controller.visible_message("<span class='danger'> [attacker] begins charging its special attack!! </span>", \
"<span class='danger'> You begin charging [attacker]'s special attack! </span>")
else //just attack
else //just attack
attacker.SpinAnimation(5, 0)
playsound(attacker, 'sound/mecha/mechstep.ogg', 30, TRUE)
combat_health--
@@ -340,7 +340,7 @@
combat_health--
playsound(src, 'sound/effects/meteorimpact.ogg', 20, TRUE)
attacker_controller.visible_message("<span class='boldwarning'> ...and lands a CRIPPLING BLOW! </span>", \
"<span class='boldwarning'> ...and you land a CRIPPLING blow on [src]! </span>", null, COMBAT_MESSAGE_RANGE)
"<span class='boldwarning'> ...and you land a CRIPPLING blow on [src]! </span>", null, COMBAT_MESSAGE_RANGE)
if(4) //both lose
attacker.SpinAnimation(5, 0)
@@ -373,7 +373,7 @@
special_attack_charged = TRUE
src_controller.visible_message("<span class='danger'> [src] begins charging its special attack!! </span>", \
"<span class='danger'> You begin charging [src]'s special attack! </span>")
else //just attack
else //just attack
SpinAnimation(5, 0)
playsound(src, 'sound/mecha/mechstep.ogg', 30, TRUE)
attacker.combat_health--
@@ -384,12 +384,12 @@
attacker.combat_health--
playsound(attacker, 'sound/effects/meteorimpact.ogg', 20, TRUE)
src_controller.visible_message("<span class='boldwarning'> ...and lands a CRIPPLING BLOW! </span>", \
"<span class='boldwarning'> ...and you land a CRIPPLING blow on [attacker]! </span>", null, COMBAT_MESSAGE_RANGE)
"<span class='boldwarning'> ...and you land a CRIPPLING blow on [attacker]! </span>", null, COMBAT_MESSAGE_RANGE)
else
attacker_controller.visible_message("<span class='notice'> [src] and [attacker] stand around awkwardly.</span>", \
"<span class='notice'> You don't know what to do next.</span>")
"<span class='notice'> You don't know what to do next.</span>")
battle_length++
battle_length++
sleep(0.5 SECONDS)
/// Lines chosen for the winning mech
@@ -398,7 +398,7 @@
if(attacker.combat_health <= 0 && combat_health <= 0) //both lose
playsound(src, 'sound/machines/warning-buzzer.ogg', 20, TRUE)
attacker_controller.visible_message("<span class='boldnotice'> MUTUALLY ASSURED DESTRUCTION!! [src] and [attacker] both end up destroyed!</span>", \
"<span class='boldnotice'> Both [src] and [attacker] are destroyed!</span>")
"<span class='boldnotice'> Both [src] and [attacker] are destroyed!</span>")
else if(attacker.combat_health <= 0) //src wins
wins++
attacker.losses++
@@ -410,7 +410,7 @@
"<span class='notice'> You raise up [src] victoriously over [attacker]!</span>")
else if (combat_health <= 0) //attacker wins
attacker.wins++
losses++
losses++
playsound(src, 'sound/effects/light_flicker.ogg', 20, TRUE)
src_controller.visible_message("<span class='notice'> [src] collapses!</span>", \
"<span class='notice'> [src] collapses!</span>", null, COMBAT_MESSAGE_RANGE)
@@ -425,7 +425,7 @@
in_combat = FALSE
attacker.in_combat = FALSE
combat_health = max_combat_health
combat_health = max_combat_health
attacker.combat_health = attacker.max_combat_health
return
@@ -433,42 +433,42 @@
/**
* This proc checks if a battle can be initiated between src and attacker.
*
* Both SRC and attacker (if attacker is included) timers are checked if they're on cooldown, and
* Both SRC and attacker (if attacker is included) timers are checked if they're on cooldown, and
* both SRC and attacker (if attacker is included) are checked if they are in combat already.
* If any of the above are true, the proc returns FALSE and sends a message to user (and target, if included) otherwise, it returns TRUE
* Arguments:
* * user: the user who is initiating the battle
* * attacker: optional arg for checking two mechs at once
* * attacker: optional arg for checking two mechs at once
* * target: optional arg used in Mech PvP battles (if used, attacker is target's toy)
*/
/obj/item/toy/prize/proc/check_battle_start(mob/living/carbon/user, obj/item/toy/prize/attacker, mob/living/carbon/target)
/obj/item/toy/prize/proc/check_battle_start(mob/living/carbon/user, obj/item/toy/prize/attacker, mob/living/carbon/target)
if(attacker && attacker.in_combat)
to_chat(user, "<span class='notice'>[target?target.p_their() : "Your" ] [attacker.name] is in combat.</span>")
target?.to_chat(target, "<span class='notice'>Your [attacker.name] is in combat.</span>")
return FALSE
return FALSE
if(in_combat)
to_chat(user, "<span class='notice'>Your [name] is in combat.</span>")
target?.to_chat(target, "<span class='notice'>[target.p_their()] [name] is in combat.</span>")
return FALSE
return FALSE
if(attacker && attacker.timer > world.time)
to_chat(user, "<span class='notice'>[target?target.p_their() : "Your" ] [attacker.name] isn't ready for battle.</span>")
target?.to_chat(target, "<span class='notice'>Your [attacker.name] isn't ready for battle.</span>")
return FALSE
return FALSE
if(timer > world.time)
to_chat(user, "<span class='notice'>Your [name] isn't ready for battle.</span>")
target?.to_chat(target, "<span class='notice'>[target.p_their()] [name] isn't ready for battle.</span>")
return FALSE
return FALSE
return TRUE
/**
* Processes any special attack moves that happen in the battle (called in the mechaBattle proc).
* Processes any special attack moves that happen in the battle (called in the mechaBattle proc).
*
* Makes the toy shout their special attack cry and updates its cooldown. Then, does the special attack.
* Arguments:
* * victim - the toy being hit by the special move
*/
/obj/item/toy/prize/proc/special_attack_move(obj/item/toy/prize/victim)
/obj/item/toy/prize/proc/special_attack_move(obj/item/toy/prize/victim)
say(special_attack_cry + "!!")
special_attack_charged = FALSE
@@ -491,13 +491,13 @@
say("I FORGOT MY SPECIAL ATTACK...")
/**
* Base proc for 'other' special attack moves.
* Base proc for 'other' special attack moves.
*
* This one is only for inheritance, each mech with an 'other' type move has their procs below.
* This one is only for inheritance, each mech with an 'other' type move has their procs below.
* Arguments:
* * victim - the toy being hit by the super special move (doesn't necessarily need to be used)
*/
/obj/item/toy/prize/proc/super_special_attack(obj/item/toy/prize/victim)
/obj/item/toy/prize/proc/super_special_attack(obj/item/toy/prize/victim)
visible_message("<span class='notice'> [src] does a cool flip.</span>")
/obj/item/toy/prize/ripley
@@ -524,7 +524,7 @@
special_attack_type_message = "instantly destroys the opposing mech if its health is less than this mech's health."
special_attack_cry = "KILLER CLAMP"
/obj/item/toy/prize/deathripley/super_special_attack(obj/item/toy/prize/victim)
/obj/item/toy/prize/deathripley/super_special_attack(obj/item/toy/prize/victim)
playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 20, TRUE)
if(victim.combat_health < combat_health) //Instantly kills the other mech if it's health is below our's.
say("EXECUTE!!")
@@ -557,7 +557,7 @@
special_attack_type_message = "puts the opposing mech's special move on cooldown and heals this mech."
special_attack_cry = "MEGA HORN"
/obj/item/toy/prize/honk/super_special_attack(obj/item/toy/prize/victim)
/obj/item/toy/prize/honk/super_special_attack(obj/item/toy/prize/victim)
playsound(src, 'sound/machines/honkbot_evil_laugh.ogg', 20, TRUE)
victim.special_attack_cooldown += 3 //Adds cooldown to the other mech and gives a minor self heal
combat_health++
@@ -612,7 +612,7 @@
special_attack_type_message = "has a lower cooldown than normal special moves, increases the opponent's cooldown, and deals damage."
special_attack_cry = "*wave"
/obj/item/toy/prize/reticence/super_special_attack(obj/item/toy/prize/victim)
/obj/item/toy/prize/reticence/super_special_attack(obj/item/toy/prize/victim)
special_attack_cooldown-- //Has a lower cooldown...
victim.special_attack_cooldown++ //and increases the opponent's cooldown by 1...
victim.combat_health-- //and some free damage.
+1 -1
View File
@@ -238,7 +238,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
//The surgeon general warns that being buckled to certain objects receiving powerful shocks is greatly hazardous to your health
///Only tesla coils, vehicles, and grounding rods currently call this because mobs are already targeted over all other objects, but this might be useful for more things later.
/obj/proc/zap_buckle_check(var/strength)
/obj/proc/zap_buckle_check(strength)
if(has_buckled_mobs())
for(var/m in buckled_mobs)
var/mob/living/buckled_mob = m
+2 -2
View File
@@ -40,7 +40,7 @@
if(istype(M) && !M.mineralType)
M.Change_Ore(mineralType)
/turf/closed/mineral/proc/Change_Ore(var/ore_type, random = 0)
/turf/closed/mineral/proc/Change_Ore(ore_type, random = 0)
if(random)
mineralAmt = rand(1, 5)
if(ispath(ore_type, /obj/item/stack/ore)) //If it has a scan_state, switch to it
@@ -268,7 +268,7 @@
/obj/item/stack/ore/silver = 12, /obj/item/stack/ore/plasma = 20, /obj/item/stack/ore/iron = 40,
/turf/closed/mineral/gibtonite/ice/icemoon = 4, /turf/open/floor/plating/asteroid/airless/cave/snow = 1, /obj/item/stack/ore/bluespace_crystal = 1)
/turf/closed/mineral/random/snow/Change_Ore(var/ore_type, random = 0)
/turf/closed/mineral/random/snow/Change_Ore(ore_type, random = 0)
. = ..()
if(mineralType)
smooth_icon = 'icons/turf/walls/icerock_wall.dmi'
+5 -5
View File
@@ -34,7 +34,7 @@
explosion_block = 3
canSmoothWith = list(/turf/closed/wall/mineral/diamond, /obj/structure/falsewall/diamond)
/turf/closed/wall/mineral/diamond/hulk_recoil(obj/item/bodypart/arm, mob/living/carbon/human/hulkman, var/damage = 41)
/turf/closed/wall/mineral/diamond/hulk_recoil(obj/item/bodypart/arm, mob/living/carbon/human/hulkman, damage = 41)
return ..()
/turf/closed/wall/mineral/bananium
@@ -87,7 +87,7 @@
radiate()
..()
/turf/closed/wall/mineral/uranium/hulk_recoil(obj/item/bodypart/arm, mob/living/carbon/human/hulkman, var/damage = 41)
/turf/closed/wall/mineral/uranium/hulk_recoil(obj/item/bodypart/arm, mob/living/carbon/human/hulkman, damage = 41)
return ..()
/turf/closed/wall/mineral/plasma
@@ -148,7 +148,7 @@
return
return ..()
/turf/closed/wall/mineral/hulk_recoil(obj/item/bodypart/arm, mob/living/carbon/human/hulkman, var/damage = 0)
/turf/closed/wall/mineral/hulk_recoil(obj/item/bodypart/arm, mob/living/carbon/human/hulkman, damage = 0)
return ..() //No recoil damage, wood is weak
/turf/closed/wall/mineral/wood/nonmetal
@@ -179,7 +179,7 @@
bullet_sizzle = TRUE
bullet_bounce_sound = null
/turf/closed/wall/mineral/snow/hulk_recoil(obj/item/bodypart/arm, mob/living/carbon/human/hulkman, var/damage = 0)
/turf/closed/wall/mineral/snow/hulk_recoil(obj/item/bodypart/arm, mob/living/carbon/human/hulkman, damage = 0)
return ..() //No recoil damage, snow is weak
/turf/closed/wall/mineral/abductor
@@ -293,7 +293,7 @@
bombcore.detonate()
..()
/turf/closed/wall/mineral/plastitanium/hulk_recoil(obj/item/bodypart/arm, mob/living/carbon/human/hulkman, var/damage = 41)
/turf/closed/wall/mineral/plastitanium/hulk_recoil(obj/item/bodypart/arm, mob/living/carbon/human/hulkman, damage = 41)
return ..()
//have to copypaste this code
+1 -1
View File
@@ -47,7 +47,7 @@
playsound(src, 'sound/effects/bang.ogg', 50, TRUE)
to_chat(M, "<span class='warning'>This wall is far too strong for you to destroy.</span>")
/turf/closed/wall/r_wall/hulk_recoil(obj/item/bodypart/arm, mob/living/carbon/human/hulkman, var/damage = 41)
/turf/closed/wall/r_wall/hulk_recoil(obj/item/bodypart/arm, mob/living/carbon/human/hulkman, damage = 41)
return ..()
/turf/closed/wall/r_wall/try_decon(obj/item/W, mob/user, turf/T)
+1 -1
View File
@@ -168,7 +168,7 @@
**arg1 is the arm to deal damage to.
**arg2 is the hulk
*/
/turf/closed/wall/proc/hulk_recoil(obj/item/bodypart/arm, mob/living/carbon/human/hulkman, var/damage = 20)
/turf/closed/wall/proc/hulk_recoil(obj/item/bodypart/arm, mob/living/carbon/human/hulkman, damage = 20)
arm.receive_damage(brute = damage, blocked = 0, wound_bonus = CANT_WOUND)
var/datum/mutation/human/hulk/smasher = locate(/datum/mutation/human/hulk) in hulkman.dna.mutations
if(!smasher || !damage) //sanity check but also snow and wood walls deal no recoil damage, so no arm breaky
+2 -2
View File
@@ -385,7 +385,7 @@ GLOBAL_LIST_EMPTY(station_turfs)
//////////////////////////////
//Distance associates with all directions movement
/turf/proc/Distance(var/turf/T)
/turf/proc/Distance(turf/T)
return get_dist(src,T)
// This Distance proc assumes that only cardinal movement is
@@ -459,7 +459,7 @@ GLOBAL_LIST_EMPTY(station_turfs)
underlay_appearance.dir = adjacency_dir
return TRUE
/turf/proc/add_blueprints(var/atom/movable/AM)
/turf/proc/add_blueprints(atom/movable/AM)
var/image/I = new
I.appearance = AM.appearance
I.appearance_flags = RESET_COLOR|RESET_ALPHA|RESET_TRANSFORM
+1 -1
View File
@@ -754,7 +754,7 @@
target_mind.traitor_panel()
SSblackbox.record_feedback("tally", "admin_verb", 1, "Traitor Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/show_skill_panel(var/target)
/datum/admins/proc/show_skill_panel(target)
set category = "Admin - Game"
set desc = "Edit mobs's experience and skill levels"
set name = "Show Skill Panel"
+1 -1
View File
@@ -406,7 +406,7 @@
return sortList(world.GetConfig("ban"))
/proc/get_stickyban_from_ckey(var/ckey)
/proc/get_stickyban_from_ckey(ckey)
. = list()
if (!ckey)
return null
+2 -2
View File
@@ -1,5 +1,5 @@
// Proc taken from yogstation, credit to nichlas0010 for the original
/client/proc/fix_air(var/turf/open/T in world)
/client/proc/fix_air(turf/open/T in world)
set name = "Fix Air"
set category = "Admin - Game"
set desc = "Fixes air in specified radius."
@@ -18,4 +18,4 @@
continue
GM.parse_gas_string(F.initial_gas_mix)
F.copy_air(GM)
F.update_visuals()
F.update_visuals()
+1 -1
View File
@@ -303,7 +303,7 @@
unset_busy_human_dummy(DUMMY_HUMAN_SLOT_ADMIN)
return preview_icon
/datum/admins/proc/makeEmergencyresponseteam(var/datum/ert/ertemplate = null)
/datum/admins/proc/makeEmergencyresponseteam(datum/ert/ertemplate = null)
if (ertemplate)
ertemplate = new ertemplate
else
@@ -198,7 +198,7 @@
message_admins("[key_name_admin(src)] mass modified [original_name]'s [variable] to [O.vars[variable]] ([accepted] objects modified)")
//not using global lists as vv is a debug function and debug functions should rely on as less things as possible.
/proc/get_all_of_type(var/T, subtypes = TRUE)
/proc/get_all_of_type(T, subtypes = TRUE)
var/list/typecache = list()
typecache[T] = 1
if (subtypes)
@@ -17,7 +17,7 @@ GLOBAL_PROTECT(VVpixelmovement)
//FALSE = no subtypes, strict exact type pathing (or the type doesn't have subtypes)
//TRUE = Yes subtypes
//NULL = User cancelled at the prompt or invalid type given
/client/proc/vv_subtype_prompt(var/type)
/client/proc/vv_subtype_prompt(type)
if (!ispath(type))
return
var/list/subtypes = subtypesof(type)
+1 -1
View File
@@ -15,7 +15,7 @@ GLOBAL_PROTECT(whitelist)
if(!GLOB.whitelist.len)
GLOB.whitelist = null
/proc/check_whitelist(var/ckey)
/proc/check_whitelist(ckey)
if(!GLOB.whitelist)
return FALSE
. = (ckey in GLOB.whitelist)
+1 -1
View File
@@ -72,7 +72,7 @@
return 1
return ..()
/mob/living/simple_animal/hostile/blob/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
/mob/living/simple_animal/hostile/blob/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
if(!overmind)
..()
return
@@ -6,7 +6,7 @@
reagent = new reagent()
/datum/blobstrain/reagent/attack_living(var/mob/living/L)
/datum/blobstrain/reagent/attack_living(mob/living/L)
var/mob_protection = L.get_permeability_protection()
reagent.expose_mob(L, VAPOR, 25, 1, mob_protection, overmind)
send_message(L)
@@ -50,7 +50,7 @@
/obj/structure/blob/blob_act()
return
/obj/structure/blob/Adjacent(var/atom/neighbour)
/obj/structure/blob/Adjacent(atom/neighbour)
. = ..()
if(.)
var/result = 0
@@ -43,7 +43,7 @@ GLOBAL_LIST_EMPTY(hivemind_bank)
chemical_cost = 10
dna_cost = -1
/datum/action/changeling/hivemind_upload/sting_action(var/mob/living/user)
/datum/action/changeling/hivemind_upload/sting_action(mob/living/user)
if (HAS_TRAIT(user, CHANGELING_HIVEMIND_MUTE))
to_chat(user, "<span class='warning'>The poison in the air hinders our ability to interact with the hivemind.</span>")
return
+1 -1
View File
@@ -45,7 +45,7 @@
var/mob/living/M = mob_override || owner.current
remove_antag_hud(antag_hud_type, M)
/datum/antagonist/obsessed/proc/forge_objectives(var/datum/mind/obsessionmind)
/datum/antagonist/obsessed/proc/forge_objectives(datum/mind/obsessionmind)
var/list/objectives_left = list("spendtime", "polaroid", "hug")
var/datum/objective/assassinate/obsessed/kill = new
kill.owner = owner
+1 -1
View File
@@ -86,7 +86,7 @@
var/datum/antagonist/cult/C = owner.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
pollCultists(owner,C.cult_team)
/proc/pollCultists(var/mob/living/Nominee,datum/team/cult/team) //Cult Master Poll
/proc/pollCultists(mob/living/Nominee,datum/team/cult/team) //Cult Master Poll
if(world.time < CULT_POLL_WAIT)
to_chat(Nominee, "It would be premature to select a leader while everyone is still settling in, try again in [DisplayTimeText(CULT_POLL_WAIT-world.time)].")
return
+14 -14
View File
@@ -110,7 +110,7 @@ structure_check() searches for nearby cultist structures required for the invoca
*/
/obj/effect/rune/proc/can_invoke(var/mob/living/user=null)
/obj/effect/rune/proc/can_invoke(mob/living/user=null)
//This proc determines if the rune can be invoked at the time. If there are multiple required cultists, it will find all nearby cultists.
var/list/invokers = list() //people eligible to invoke the rune
if(user)
@@ -130,7 +130,7 @@ structure_check() searches for nearby cultist structures required for the invoca
invokers += L
return invokers
/obj/effect/rune/proc/invoke(var/list/invokers)
/obj/effect/rune/proc/invoke(list/invokers)
//This proc contains the effects of the rune as well as things that happen afterwards. If you want it to spawn an object and then delete itself, have both here.
for(var/M in invokers)
if(isliving(M))
@@ -171,7 +171,7 @@ structure_check() searches for nearby cultist structures required for the invoca
icon_state = "[rand(1,7)]"
color = rgb(rand(0,255), rand(0,255), rand(0,255))
/obj/effect/rune/malformed/invoke(var/list/invokers)
/obj/effect/rune/malformed/invoke(list/invokers)
..()
qdel(src)
@@ -189,7 +189,7 @@ structure_check() searches for nearby cultist structures required for the invoca
/obj/effect/rune/convert/do_invoke_glow()
return
/obj/effect/rune/convert/invoke(var/list/invokers)
/obj/effect/rune/convert/invoke(list/invokers)
if(rune_in_use)
return
var/list/myriad_targets = list()
@@ -320,7 +320,7 @@ structure_check() searches for nearby cultist structures required for the invoca
color = RUNE_COLOR_TALISMAN
construct_invoke = FALSE
/obj/effect/rune/empower/invoke(var/list/invokers)
/obj/effect/rune/empower/invoke(list/invokers)
. = ..()
var/mob/living/user = invokers[1] //the first invoker is always the user
for(var/datum/action/innate/cult/blood_magic/BM in user.actions)
@@ -350,7 +350,7 @@ structure_check() searches for nearby cultist structures required for the invoca
GLOB.teleport_runes -= src
return ..()
/obj/effect/rune/teleport/invoke(var/list/invokers)
/obj/effect/rune/teleport/invoke(list/invokers)
var/mob/living/user = invokers[1] //the first invoker is always the user
var/list/potential_runes = list()
var/list/teleportnames = list()
@@ -474,7 +474,7 @@ structure_check() searches for nearby cultist structures required for the invoca
/obj/effect/rune/narsie/conceal() //can't hide this, and you wouldn't want to
return
/obj/effect/rune/narsie/invoke(var/list/invokers)
/obj/effect/rune/narsie/invoke(list/invokers)
if(used)
return
if(!is_station_level(z))
@@ -527,7 +527,7 @@ structure_check() searches for nearby cultist structures required for the invoca
if(iscultist(user) || user.stat == DEAD)
. += "<b>Sacrifices unrewarded:</b> [LAZYLEN(GLOB.sacrificed) - sacrifices_used]"
/obj/effect/rune/raise_dead/invoke(var/list/invokers)
/obj/effect/rune/raise_dead/invoke(list/invokers)
var/turf/T = get_turf(src)
var/mob/living/mob_to_revive
var/list/potential_revive_mobs = list()
@@ -623,7 +623,7 @@ structure_check() searches for nearby cultist structures required for the invoca
QDEL_NULL(barrier)
return ..()
/obj/effect/rune/wall/invoke(var/list/invokers)
/obj/effect/rune/wall/invoke(list/invokers)
var/mob/living/user = invokers[1]
..()
if(!barrier)
@@ -644,7 +644,7 @@ structure_check() searches for nearby cultist structures required for the invoca
icon_state = "3"
color = RUNE_COLOR_SUMMON
/obj/effect/rune/summon/invoke(var/list/invokers)
/obj/effect/rune/summon/invoke(list/invokers)
var/mob/living/user = invokers[1]
var/list/cultists = list()
for(var/datum/mind/M in SSticker.mode.cult)
@@ -702,7 +702,7 @@ structure_check() searches for nearby cultist structures required for the invoca
/obj/effect/rune/blood_boil/do_invoke_glow()
return
/obj/effect/rune/blood_boil/invoke(var/list/invokers)
/obj/effect/rune/blood_boil/invoke(list/invokers)
if(rune_in_use)
return
..()
@@ -775,7 +775,7 @@ structure_check() searches for nearby cultist structures required for the invoca
return list()
return ..()
/obj/effect/rune/manifest/invoke(var/list/invokers)
/obj/effect/rune/manifest/invoke(list/invokers)
. = ..()
var/mob/living/user = invokers[1]
var/turf/T = get_turf(src)
@@ -884,7 +884,7 @@ structure_check() searches for nearby cultist structures required for the invoca
req_cultists = 3
scribe_delay = 100
/obj/effect/rune/apocalypse/invoke(var/list/invokers)
/obj/effect/rune/apocalypse/invoke(list/invokers)
if(rune_in_use)
return
. = ..()
@@ -990,7 +990,7 @@ structure_check() searches for nearby cultist structures required for the invoca
N.runEvent()
qdel(src)
/obj/effect/rune/apocalypse/proc/image_handler(var/list/images, duration)
/obj/effect/rune/apocalypse/proc/image_handler(list/images, duration)
var/end = world.time + duration
set waitfor = 0
while(end>world.time)
@@ -19,7 +19,7 @@
overmind.remove_infection(src)
..()
/datum/disease/advance/sentient_disease/infect(var/mob/living/infectee, make_copy = TRUE)
/datum/disease/advance/sentient_disease/infect(mob/living/infectee, make_copy = TRUE)
if(make_copy && overmind && (overmind.disease_template != src))
overmind.disease_template.infect(infectee, TRUE) //get an updated version of the virus
else
@@ -286,13 +286,13 @@ the new instance inside the host to be updated to the template's stats.
if(T)
forceMove(T)
/mob/camera/disease/DblClickOn(var/atom/A, params)
/mob/camera/disease/DblClickOn(atom/A, params)
if(hosts[A])
set_following(A)
else
..()
/mob/camera/disease/ClickOn(var/atom/A, params)
/mob/camera/disease/ClickOn(atom/A, params)
if(freemove && ishuman(A))
var/mob/living/carbon/human/H = A
if(alert(src, "Select [H.name] as your initial host?", "Select Host", "Yes", "No") != "Yes")
@@ -162,7 +162,7 @@
*
* Use this whenever you want to add someone to the list
*/
/datum/reality_smash_tracker/proc/AddMind(var/datum/mind/M)
/datum/reality_smash_tracker/proc/AddMind(datum/mind/M)
RegisterSignal(M.current,COMSIG_MOB_LOGIN,.proc/ReworkNetwork)
targets |= M
_Generate()
@@ -176,7 +176,7 @@
*
* Use this whenever you want to remove someone from the list
*/
/datum/reality_smash_tracker/proc/RemoveMind(var/datum/mind/M)
/datum/reality_smash_tracker/proc/RemoveMind(datum/mind/M)
UnregisterSignal(M.current,COMSIG_MOB_LOGIN)
targets -= M
for(var/obj/effect/reality_smash/RS in smashes)
@@ -266,7 +266,7 @@
new /obj/effect/broken_illusion(drop_location())
///Makes the mind able to see this effect
/obj/effect/reality_smash/proc/AddMind(var/datum/mind/cultie)
/obj/effect/reality_smash/proc/AddMind(datum/mind/cultie)
minds |= cultie
if(cultie.current.client)
cultie.current.client.images |= img
@@ -274,7 +274,7 @@
///Makes the mind not able to see this effect
/obj/effect/reality_smash/proc/RemoveMind(var/datum/mind/cultie)
/obj/effect/reality_smash/proc/RemoveMind(datum/mind/cultie)
minds -= cultie
if(cultie.current.client)
cultie.current.client.images -= img
+1 -1
View File
@@ -169,7 +169,7 @@
return "<div class='panel redborder'>[report.Join("<br>")]</div>"
/// Adds points to the points var.
/datum/team/gang/proc/adjust_points(var/points_to_adjust)
/datum/team/gang/proc/adjust_points(points_to_adjust)
points += points_to_adjust
/datum/action/cooldown/spawn_induction_package
+1 -1
View File
@@ -176,7 +176,7 @@
/mob/living/simple_animal/hostile/morph/LoseAggro()
vision_range = initial(vision_range)
/mob/living/simple_animal/hostile/morph/AIShouldSleep(var/list/possible_targets)
/mob/living/simple_animal/hostile/morph/AIShouldSleep(list/possible_targets)
. = ..()
if(.)
var/list/things = list()
@@ -201,7 +201,7 @@
playsound(T, feast_sound, 50, TRUE, -1)
to_chat(M, "<span class='clown'>You leave [src]'s warm embrace, and feel ready to take on the world.</span>")
/mob/living/simple_animal/hostile/imp/slaughter/laughter/bloodcrawl_swallow(var/mob/living/victim)
/mob/living/simple_animal/hostile/imp/slaughter/laughter/bloodcrawl_swallow(mob/living/victim)
if(consumed_mobs)
// Keep their corpse so rescue is possible
consumed_mobs += victim
@@ -255,7 +255,7 @@
to_chat(killer, "Your radio has been upgraded! Use :t to speak on an encrypted channel with Syndicate Agents!")
killer.add_malf_picker()
/datum/antagonist/traitor/proc/equip(var/silent = FALSE)
/datum/antagonist/traitor/proc/equip(silent = FALSE)
if(traitor_kind == TRAITOR_HUMAN)
owner.equip_traitor(employer, silent, src)
@@ -112,7 +112,7 @@
limited = 2
cost = 0
/datum/contractor_item/contract_reroll/handle_purchase(var/datum/contractor_hub/hub)
/datum/contractor_item/contract_reroll/handle_purchase(datum/contractor_hub/hub)
. = ..()
if (.)
@@ -159,7 +159,7 @@
cost = 2
var/datum/mind/partner_mind = null
/datum/contractor_item/contractor_partner/handle_purchase(var/datum/contractor_hub/hub, mob/living/user)
/datum/contractor_item/contractor_partner/handle_purchase(datum/contractor_hub/hub, mob/living/user)
. = ..()
if (.)
@@ -238,7 +238,7 @@
limited = 2
cost = 3
/datum/contractor_item/blackout/handle_purchase(var/datum/contractor_hub/hub)
/datum/contractor_item/blackout/handle_purchase(datum/contractor_hub/hub)
. = ..()
if (.)
@@ -246,7 +246,7 @@
priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", 'sound/ai/poweroff.ogg')
// Subtract cost, and spawn if it's an item.
/datum/contractor_item/proc/handle_purchase(var/datum/contractor_hub/hub, mob/living/user)
/datum/contractor_item/proc/handle_purchase(datum/contractor_hub/hub, mob/living/user)
if (hub.contract_rep >= cost)
hub.contract_rep -= cost
@@ -45,7 +45,7 @@
var/location = pick_list_weighted(WANTED_FILE, "location")
wanted_message = "[base] [verb_string] [noun] [location]."
/datum/syndicate_contract/proc/handle_extraction(var/mob/living/user)
/datum/syndicate_contract/proc/handle_extraction(mob/living/user)
if (contract.target && contract.dropoff_check(user, contract.target.current))
var/turf/free_location = find_obstruction_free_location(3, user, contract.dropoff)
@@ -153,7 +153,7 @@
[C.registered_account.account_balance] cr.", TRUE)
// They're off to holding - handle the return timer and give some text about what's going on.
/datum/syndicate_contract/proc/handleVictimExperience(var/mob/living/M)
/datum/syndicate_contract/proc/handleVictimExperience(mob/living/M)
// Ship 'em back - dead or alive, 4 minutes wait.
// Even if they weren't the target, we're still treating them the same.
addtimer(CALLBACK(src, .proc/returnVictim, M), (60 * 10) * 4)
@@ -188,7 +188,7 @@
M.add_confusion(20)
// We're returning the victim
/datum/syndicate_contract/proc/returnVictim(var/mob/living/M)
/datum/syndicate_contract/proc/returnVictim(mob/living/M)
var/list/possible_drop_loc = list()
for (var/turf/possible_drop in contract.dropoff.contents)
@@ -146,7 +146,7 @@
scrub(tile)
return TRUE
/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/scrub(var/turf/tile)
/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/scrub(turf/tile)
if(!istype(tile))
return FALSE
var/datum/gas_mixture/environment = tile.return_air()
@@ -63,7 +63,7 @@
var/turf/T = get_turf(src)
scrub(T.return_air())
/obj/machinery/portable_atmospherics/scrubber/proc/scrub(var/datum/gas_mixture/mixture)
/obj/machinery/portable_atmospherics/scrubber/proc/scrub(datum/gas_mixture/mixture)
if(air_contents.return_pressure() >= overpressure_m * ONE_ATMOSPHERE)
return
@@ -265,7 +265,7 @@
addtimer(CALLBACK(src, .proc/clear_cooldown, body.ckey), respawn_cooldown, TIMER_UNIQUE)
body.dust()
/obj/machinery/capture_the_flag/proc/clear_cooldown(var/ckey)
/obj/machinery/capture_the_flag/proc/clear_cooldown(ckey)
recently_dead_ckeys -= ckey
/obj/machinery/capture_the_flag/proc/spawn_team_member(client/new_team_member)
@@ -221,7 +221,7 @@
user.dropItemToGround(src)
/obj/item/dice/d20/fate/proc/effect(var/mob/living/carbon/human/user,roll)
/obj/item/dice/d20/fate/proc/effect(mob/living/carbon/human/user,roll)
var/turf/T = get_turf(src)
switch(roll)
if(1)
+1 -1
View File
@@ -81,7 +81,7 @@ GLOBAL_LIST_EMPTY(bounties_list)
*
* *Guided determines what specific catagory of bounty should be chosen.
*/
/proc/random_bounty(var/guided = 0)
/proc/random_bounty(guided = 0)
var/bounty_num
if(guided)
bounty_num = guided
+2 -2
View File
@@ -480,7 +480,7 @@
/datum/centcom_podlauncher/ui_close() //Uses the destroy() proc. When the user closes the UI, we clean up the temp_pod and supplypod_selector variables.
qdel(src)
/datum/centcom_podlauncher/proc/updateCursor(var/launching, var/turf_picking) //Update the mouse of the user
/datum/centcom_podlauncher/proc/updateCursor(launching, turf_picking) //Update the mouse of the user
if (!holder) //Can't update the mouse icon if the client doesnt exist!
return
if (launching || turf_picking) //If the launching param is true, we give the user new mouse icons.
@@ -650,7 +650,7 @@
qdel(selector) //Delete the selector effect
. = ..()
/datum/centcom_podlauncher/proc/supplypod_punish_log(var/list/whoDyin)
/datum/centcom_podlauncher/proc/supplypod_punish_log(list/whoDyin)
var/podString = effectBurst ? "5 pods" : "a pod"
var/whomString = ""
if (LAZYLEN(whoDyin))
+9 -9
View File
@@ -17,7 +17,7 @@
anchored = TRUE //So it cant slide around after landing
anchorable = FALSE
flags_1 = PREVENT_CONTENTS_EXPLOSION_1
appearance_flags = KEEP_TOGETHER | PIXEL_SCALE
appearance_flags = KEEP_TOGETHER | PIXEL_SCALE
density = FALSE
//*****NOTE*****: Many of these comments are similarly described in centcom_podlauncher.dm. If you change them here, please consider doing so in the centcom podlauncher code as well!
@@ -80,7 +80,7 @@
landingDelay = 20 //Very speedy!
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
/obj/structure/closet/supplypod/Initialize(var/turf/spawn_location)
/obj/structure/closet/supplypod/Initialize(turf/spawn_location)
. = ..()
if (!spawn_location)
var/shippingLane = GLOB.areas_by_type[/area/centcom/supplypod/supplypod_temp_holding] //temporary holder for supplypods mid-transit
@@ -110,7 +110,7 @@
fin_mask = "bottomfin"
if (POD_STYLES[style][POD_SHAPE] == POD_SHAPE_NORML)
icon_state = POD_STYLES[style][POD_BASE] + "_reverse"
pixel_x = initial(pixel_x)
pixel_x = initial(pixel_x)
transform = matrix()
update_icon()
@@ -118,7 +118,7 @@
fin_mask = initial(fin_mask)
if (POD_STYLES[style][POD_SHAPE] == POD_SHAPE_NORML)
icon_state = POD_STYLES[style][POD_BASE]
pixel_x = initial(pixel_x)
pixel_x = initial(pixel_x)
transform = matrix()
update_icon()
@@ -154,7 +154,7 @@
else
var/icon/masked_door = new(icon, door) //The door we want to apply
var/icon/fin_masker = new(icon, "mask_[fin_mask]") //The fin shape we want to 'cut out' of the door
fin_masker.MapColors(0,0,0,1, 0,0,0,1, 0,0,0,1, 1,1,1,0, 0,0,0,1)
fin_masker.MapColors(0,0,0,1, 0,0,0,1, 0,0,0,1, 1,1,1,0, 0,0,0,1)
fin_masker.SwapColor("#ffffffff", null)
fin_masker.Blend("#000000", ICON_SUBTRACT)
masked_door.Blend(fin_masker, ICON_ADD)
@@ -204,7 +204,7 @@
if (landingSound)
playsound(get_turf(src), landingSound, soundVolume, FALSE, FALSE)
AddComponent(/datum/component/pellet_cloud, projectile_type=shrapnel_type, magnitude=shrapnel_magnitude)
if(effectShrapnel)
if(effectShrapnel)
SEND_SIGNAL(src, COMSIG_SUPPLYPOD_LANDED)
for (var/mob/living/M in T)
if (effectLimb && iscarbon(M)) //If effectLimb is true (which means we pop limbs off when we hit people):
@@ -338,9 +338,9 @@
if (leavingSound)
playsound(get_turf(holder), leavingSound, soundVolume, FALSE, FALSE)
deleteRubble()
animate(holder, alpha = 0, time = 8, easing = QUAD_EASING|EASE_IN, flags = ANIMATION_PARALLEL)
animate(holder, alpha = 0, time = 8, easing = QUAD_EASING|EASE_IN, flags = ANIMATION_PARALLEL)
animate(holder, pixel_z = 400, time = 10, easing = QUAD_EASING|EASE_IN, flags = ANIMATION_PARALLEL) //Animate our rising pod
addtimer(CALLBACK(src, .proc/handleReturnAfterDeparting, holder), 15) //Finish up the pod's duties after a certain amount of time
/obj/structure/closet/supplypod/setOpened() //Proc exists here, as well as in any atom that can assume the role of a "holder" of a supplypod. Check the open_pod() proc for more details
@@ -440,7 +440,7 @@
/obj/effect/supplypod_rubble/proc/getForeground(obj/structure/closet/supplypod/pod)
var/mutable_appearance/rubble_overlay = mutable_appearance('icons/obj/supplypods.dmi', foreground)
rubble_overlay.appearance_flags = KEEP_APART|RESET_TRANSFORM
rubble_overlay.transform = matrix().Translate(SUPPLYPOD_X_OFFSET - pod.pixel_x, verticle_offset)
rubble_overlay.transform = matrix().Translate(SUPPLYPOD_X_OFFSET - pod.pixel_x, verticle_offset)
return rubble_overlay
/obj/effect/supplypod_rubble/proc/fadeAway()
+1 -1
View File
@@ -12,7 +12,7 @@
var/ready = FALSE
var/launched = FALSE
/obj/item/supplypod_beacon/proc/update_status(var/consoleStatus)
/obj/item/supplypod_beacon/proc/update_status(consoleStatus)
switch(consoleStatus)
if (SP_LINKED)
linked = TRUE
+1 -1
View File
@@ -815,7 +815,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
#undef APPEARANCE_CATEGORY_COLUMN
#undef MAX_MUTANT_ROWS
/datum/preferences/proc/CaptureKeybinding(mob/user, datum/keybinding/kb, var/old_key)
/datum/preferences/proc/CaptureKeybinding(mob/user, datum/keybinding/kb, old_key)
var/HTML = {"
<div id='focus' style="outline: 0;" tabindex=0>Keybinding: [kb.full_name]<br>[kb.description]<br><br><b>Press any key to change<br>Press ESC to clear</b></div>
<script>
+2 -2
View File
@@ -239,7 +239,7 @@
select_look(owner)
return 1
/datum/action/item_action/chameleon/change/proc/emp_randomise(var/amount = EMP_RANDOMISE_TIME)
/datum/action/item_action/chameleon/change/proc/emp_randomise(amount = EMP_RANDOMISE_TIME)
START_PROCESSING(SSprocessing, src)
random_look(owner)
@@ -745,7 +745,7 @@
target.desc = initial(picked_item.skill_description)
target.icon_state = initial(picked_item.skill_icon)
/datum/action/item_action/chameleon/change/skillchip/update_look(mob/user, var/picked_item)
/datum/action/item_action/chameleon/change/skillchip/update_look(mob/user, picked_item)
if(!COOLDOWN_FINISHED(src, usable_cooldown))
to_chat(user, "<span class='notice'>Chameleon skillchip is still recharging for another [COOLDOWN_TIMELEFT(src, usable_cooldown) * 0.1] seconds!</span>")
return ..()
@@ -271,7 +271,7 @@
if(target_ui)
QDEL_NULL(target_ui)
/obj/effect/chronos_cam/relaymove(var/mob/user, direction)
/obj/effect/chronos_cam/relaymove(mob/user, direction)
if(!holder)
qdel(src)
return
+1 -1
View File
@@ -66,7 +66,7 @@
else
soundloop.start(user)
/obj/item/clothing/head/helmet/space/hardsuit/proc/display_visor_message(var/msg)
/obj/item/clothing/head/helmet/space/hardsuit/proc/display_visor_message(msg)
var/mob/wearer = loc
if(msg && ishuman(wearer))
wearer.show_message("[icon2html(src, wearer)]<b><span class='robot'>[msg]</span></b>", MSG_VISUAL)
+1 -1
View File
@@ -21,7 +21,7 @@
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
/obj/item/reagent_containers/food/proc/checkLiked(var/fraction, mob/M)
/obj/item/reagent_containers/food/proc/checkLiked(fraction, mob/M)
if(last_check_time + 50 < world.time)
if(ishuman(M))
var/mob/living/carbon/human/H = M

Some files were not shown because too many files have changed in this diff Show More