removes var/ inside all procs (#19450)

* removes var/ inside all procs

* .

* ugh
This commit is contained in:
Kashargul
2026-05-05 10:55:17 +02:00
committed by GitHub
parent 13162d13a2
commit 5926589c16
1987 changed files with 7376 additions and 7377 deletions
+8 -8
View File
@@ -19,7 +19,7 @@ BLOOD_VOLUME_SURVIVE = 40
* Also called by inject_blood as fallback with amt = injected_amount
* MUST be followed by calling fixblood() allways.
***/
/mob/living/carbon/human/proc/make_blood(var/amt = 0)
/mob/living/carbon/human/proc/make_blood(amt = 0)
if(vessel)
return
@@ -276,11 +276,11 @@ BLOOD_VOLUME_SURVIVE = 40
//Makes a blood drop, leaking amt units of blood from the mob
/mob/living/carbon/human/proc/drip(var/amt)
/mob/living/carbon/human/proc/drip(amt)
if(remove_blood(amt))
blood_splatter(src,src)
/mob/living/carbon/human/proc/remove_blood(var/amt)
/mob/living/carbon/human/proc/remove_blood(amt)
if(!should_have_organ(O_HEART)) //TODO: Make drips come from the reagents instead.
return 0
@@ -301,7 +301,7 @@ BLOOD_VOLUME_SURVIVE = 40
****************************************************/
//Gets blood from mob to the container, preserving all data in it.
/mob/living/carbon/proc/take_blood(obj/item/reagent_containers/container, var/amount)
/mob/living/carbon/proc/take_blood(obj/item/reagent_containers/container, amount)
var/datum/reagent/B = get_blood(container.reagents)
if(!B)
@@ -340,7 +340,7 @@ BLOOD_VOLUME_SURVIVE = 40
return B
//For humans, blood does not appear from blue, it comes from vessels.
/mob/living/carbon/human/take_blood(obj/item/reagent_containers/container, var/amount)
/mob/living/carbon/human/take_blood(obj/item/reagent_containers/container, amount)
if(!should_have_organ(O_HEART))
return null
@@ -352,7 +352,7 @@ BLOOD_VOLUME_SURVIVE = 40
remove_blood(amount) // Removes blood if human
//Transfers blood from container ot vessels
/mob/living/carbon/proc/inject_blood(var/datum/reagent/blood/injected, var/amount)
/mob/living/carbon/proc/inject_blood(datum/reagent/blood/injected, amount)
if (!injected || !istype(injected))
return
var/list/sniffles = injected.data["viruses"]
@@ -372,7 +372,7 @@ BLOOD_VOLUME_SURVIVE = 40
reagents.update_total()
//Transfers blood from reagents to vessel, respecting blood types compatability.
/mob/living/carbon/human/inject_blood(var/datum/reagent/blood/injected, var/amount)
/mob/living/carbon/human/inject_blood(datum/reagent/blood/injected, amount)
if(!should_have_organ(O_HEART))
reagents.add_reagent(REAGENT_ID_BLOOD, amount, injected.data)
@@ -445,7 +445,7 @@ BLOOD_VOLUME_SURVIVE = 40
//AB is a universal receiver.
return 0
/proc/blood_splatter(var/target,var/datum/reagent/blood/source,var/large)
/proc/blood_splatter(target,datum/reagent/blood/source,large)
//Vorestation Edit Start - We're not going to splatter at all because we're in something and that's silly.
if(istype(source,/atom/movable))
+7 -7
View File
@@ -21,7 +21,7 @@
. = ..()
species = null
/datum/organ_data/proc/setup_from_dna(var/datum/dna/dna)
/datum/organ_data/proc/setup_from_dna(datum/dna/dna)
SHOULD_NOT_OVERRIDE(TRUE)
// Prosfab uses default dna to get vars, lets respect that still
var/self_clear = FALSE
@@ -44,7 +44,7 @@
if(self_clear)
qdel(dna)
/datum/organ_data/proc/setup_from_species(var/datum/species/S) // This needs a full rework, but can't be done unless all of transformating species code is refactored
/datum/organ_data/proc/setup_from_species(datum/species/S) // This needs a full rework, but can't be done unless all of transformating species code is refactored
SHOULD_NOT_OVERRIDE(TRUE)
species = WEAKREF(S)
@@ -62,15 +62,15 @@
SHOULD_NOT_OVERRIDE(TRUE)
SETUP_SPECIES_CHECK("name",SP.name)
/datum/organ_data/proc/get_species_race_key(var/owner)
/datum/organ_data/proc/get_species_race_key(owner)
SHOULD_NOT_OVERRIDE(TRUE)
SETUP_SPECIES_CHECK("race_key",SP.get_race_key(owner))
/datum/organ_data/proc/get_species_bodytype(var/mob/living/carbon/human/H)
/datum/organ_data/proc/get_species_bodytype(mob/living/carbon/human/H)
SHOULD_NOT_OVERRIDE(TRUE)
SETUP_SPECIES_CHECK("bodytype",SP.get_bodytype(H))
/datum/organ_data/proc/get_species_icobase(var/mob/living/carbon/human/H, var/get_deform)
/datum/organ_data/proc/get_species_icobase(mob/living/carbon/human/H, get_deform)
SHOULD_NOT_OVERRIDE(TRUE)
SETUP_SPECIES_CHECK("icobase",SP.get_icobase(H,get_deform))
@@ -94,11 +94,11 @@
SHOULD_NOT_OVERRIDE(TRUE)
SETUP_SPECIES_CHECK("mob_size",SP.mob_size)
/datum/organ_data/proc/get_species_flesh_colour(var/owner)
/datum/organ_data/proc/get_species_flesh_colour(owner)
SHOULD_NOT_OVERRIDE(TRUE)
SETUP_SPECIES_CHECK("flesh_colour",SP.get_flesh_colour(owner) || "#C80000")
/datum/organ_data/proc/get_species_blood_colour(var/owner)
/datum/organ_data/proc/get_species_blood_colour(owner)
SHOULD_NOT_OVERRIDE(TRUE)
SETUP_SPECIES_CHECK("blood_colour",SP.get_blood_colour(owner) || "#C80000")
+3 -3
View File
@@ -48,7 +48,7 @@
radial_state = icon_state
my_radial_icon = image(icon = radial_icon, icon_state = radial_state)
/obj/item/organ/internal/augment/handle_organ_mod_special(var/removed = FALSE)
/obj/item/organ/internal/augment/handle_organ_mod_special(removed = FALSE)
if(removed && integrated_object && integrated_object.loc != src)
if(isliving(integrated_object.loc))
var/mob/living/L = integrated_object.loc
@@ -92,7 +92,7 @@
enable_augments(src)
/mob/living/carbon/human/proc/enable_augments(var/mob/living/user)
/mob/living/carbon/human/proc/enable_augments(mob/living/user)
var/list/options = list()
var/list/present_augs = list()
@@ -123,7 +123,7 @@
* cling_to_organ is a reference to the organ object itself, so they can easily return to their organ when removed by any means.
*/
/mob/living/carbon/human/proc/equip_augment_item(var/slot, var/obj/item/equipping = null, var/make_sound = TRUE, var/obj/item/organ/cling_to_organ = null)
/mob/living/carbon/human/proc/equip_augment_item(slot, obj/item/equipping = null, make_sound = TRUE, obj/item/organ/cling_to_organ = null)
if(!ishuman(src))
return 0
+7 -7
View File
@@ -37,7 +37,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
/obj/item/organ/internal/brain/proc/can_assist()
return can_assist
/obj/item/organ/internal/brain/proc/implant_assist(var/targ_icon_state = null)
/obj/item/organ/internal/brain/proc/implant_assist(targ_icon_state = null)
name = "[owner.real_name]'s assisted [initial(name)]"
if(targ_icon_state)
icon_state = targ_icon_state
@@ -96,7 +96,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
QDEL_NULL(brainmob)
. = ..()
/obj/item/organ/internal/brain/proc/transfer_identity(var/mob/living/carbon/H)
/obj/item/organ/internal/brain/proc/transfer_identity(mob/living/carbon/H)
if(!brainmob)
brainmob = new(src)
@@ -133,7 +133,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
else
. += "This one seems particularly lifeless. Perhaps it will regain some of its luster later..."
/obj/item/organ/internal/brain/removed(var/mob/living/user)
/obj/item/organ/internal/brain/removed(mob/living/user)
if(name == initial(name))
name = "\the [owner.real_name]'s [initial(name)]"
@@ -150,7 +150,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
..()
/obj/item/organ/internal/brain/replaced(var/mob/living/target)
/obj/item/organ/internal/brain/replaced(mob/living/target)
if(target.key)
target.ghostize()
@@ -210,7 +210,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
var/mob/living/carbon/human/H = loc
color = rgb(min(H.r_skin + 40, 255), min(H.g_skin + 40, 255), min(H.b_skin + 40, 255))
/obj/item/organ/internal/brain/slime/removed(var/mob/living/user)
/obj/item/organ/internal/brain/slime/removed(mob/living/user)
if(istype(owner))
owner_flavor_text = owner.flavor_texts.Copy()
..()
@@ -306,12 +306,12 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
required_reagents = list(REAGENT_ID_PHORON = 40)
result_amount = 1
/datum/decl/chemical_reaction/instant/promethean_brain_revival/can_happen(var/datum/reagents/holder)
/datum/decl/chemical_reaction/instant/promethean_brain_revival/can_happen(datum/reagents/holder)
if(holder.my_atom && istype(holder.my_atom, /obj/item/organ/internal/brain/slime))
return ..()
return FALSE
/datum/decl/chemical_reaction/instant/promethean_brain_revival/on_reaction(var/datum/reagents/holder)
/datum/decl/chemical_reaction/instant/promethean_brain_revival/on_reaction(datum/reagents/holder)
var/obj/item/organ/internal/brain/slime/brain = holder.my_atom
if(brain.reviveBody())
brain.visible_message(span_notice("[brain] bubbles, surrounding itself with a rapidly expanding mass of slime!"))
+4 -4
View File
@@ -53,7 +53,7 @@
// Finally, update the eye icon on the mob.
owner.regenerate_icons()
/obj/item/organ/internal/eyes/replaced(var/mob/living/carbon/human/target)
/obj/item/organ/internal/eyes/replaced(mob/living/carbon/human/target)
// Apply our eye colour to the target.
if(istype(target) && eye_colour)
@@ -72,7 +72,7 @@
owner.b_eyes ? owner.b_eyes : 0
)
/obj/item/organ/internal/eyes/take_damage(amount, var/silent=0)
/obj/item/organ/internal/eyes/take_damage(amount, silent=0)
var/oldbroken = is_broken()
..()
if(is_broken() && !oldbroken && owner && !owner.stat)
@@ -100,10 +100,10 @@
owner.custom_pain("Your eyes are watering, making it harder to see clearly for a moment.",1)
owner.eye_blurry += 10
/obj/item/organ/internal/eyes/proc/get_total_protection(var/flash_protection = FLASH_PROTECTION_NONE)
/obj/item/organ/internal/eyes/proc/get_total_protection(flash_protection = FLASH_PROTECTION_NONE)
return (flash_protection + innate_flash_protection)
/obj/item/organ/internal/eyes/proc/additional_flash_effects(var/intensity)
/obj/item/organ/internal/eyes/proc/additional_flash_effects(intensity)
return -1
/obj/item/organ/internal/eyes/emp_act(severity, recursive)
+2 -2
View File
@@ -98,7 +98,7 @@
entry_vent = null
. = ..()
/obj/item/organ/internal/intestine/horror/handle_organ_mod_special(var/removed = FALSE)
/obj/item/organ/internal/intestine/horror/handle_organ_mod_special(removed = FALSE)
..()
if(removed)
for(var/obj/machinery/atmospherics/unary/vent_pump/v in view(7,src))
@@ -232,7 +232,7 @@
. = ..()
redspace = GLOB.all_languages[LANGUAGE_REDSPACE]
/obj/item/organ/internal/voicebox/horror/replaced(var/mob/living/carbon/human/target,var/obj/item/organ/external/affected)
/obj/item/organ/internal/voicebox/horror/replaced(mob/living/carbon/human/target,obj/item/organ/external/affected)
..()
target.add_language(LANGUAGE_REDSPACE)
target.default_language = redspace
+1 -1
View File
@@ -20,7 +20,7 @@
for(var/L in will_assist_languages)
assists_languages |= GLOB.all_languages[L]
/obj/item/organ/internal/voicebox/proc/add_assistable_langs(var/language) // Adds a new language (by string/define) to the list of things the voicebox can assist
/obj/item/organ/internal/voicebox/proc/add_assistable_langs(language) // Adds a new language (by string/define) to the list of things the voicebox can assist
will_assist_languages |= language
amend_assist_langs() // Can't think of a better place to put this, makes the voicebox actually start to assist with the added language
+1 -1
View File
@@ -30,7 +30,7 @@
goo.basecolor = "#412464"
goo.update_icon()
/obj/item/organ/internal/borer/removed(var/mob/living/user)
/obj/item/organ/internal/borer/removed(mob/living/user)
..()
+11 -11
View File
@@ -62,7 +62,7 @@
/obj/item/organ/proc/update_health()
return
/obj/item/organ/Initialize(mapload, var/internal)
/obj/item/organ/Initialize(mapload, internal)
. = ..()
create_reagents(5)
@@ -128,7 +128,7 @@
else
meat_type = /obj/item/reagent_containers/food/snacks/meat
/obj/item/organ/proc/set_dna(var/datum/dna/new_dna)
/obj/item/organ/proc/set_dna(datum/dna/new_dna)
if(new_dna)
data.setup_from_dna(new_dna)
forensic_data?.clear_blooddna()
@@ -144,7 +144,7 @@
owner.can_defib = FALSE
owner.death()
/obj/item/organ/proc/adjust_germ_level(var/amount) // Unless you're setting germ level directly to 0, use this proc instead
/obj/item/organ/proc/adjust_germ_level(amount) // Unless you're setting germ level directly to 0, use this proc instead
germ_level = CLAMP(germ_level + amount, 0, INFECTION_LEVEL_MAX)
/obj/item/organ/process()
@@ -325,7 +325,7 @@
/obj/item/organ/proc/remove_rejuv()
qdel(src)
/obj/item/organ/proc/rejuvenate(var/ignore_prosthetic_prefs)
/obj/item/organ/proc/rejuvenate(ignore_prosthetic_prefs)
damage = 0
status = 0
germ_level = 0
@@ -366,7 +366,7 @@
adjust_germ_level(-antibiotics) // You waited this long to get treated, you don't really deserve this organ
//Adds autopsy data for used_weapon.
/obj/item/organ/proc/add_autopsy_data(var/used_weapon, var/damage)
/obj/item/organ/proc/add_autopsy_data(used_weapon, damage)
var/datum/autopsy_data/W = autopsy_data[used_weapon]
if(!W)
W = new()
@@ -378,7 +378,7 @@
W.time_inflicted = world.time
//Note: external organs have their own version of this proc
/obj/item/organ/take_damage(amount, var/silent=0)
/obj/item/organ/take_damage(amount, silent=0)
if(owner)
if(SEND_SIGNAL(owner, COMSIG_INTERNAL_ORGAN_PRE_DAMAGE_APPLICATION, amount, silent) & COMPONENT_CANCEL_INTERNAL_ORGAN_DAMAGE)
return 0
@@ -436,7 +436,7 @@
if (EMP_HARMLESS)
take_damage(rand(1,3))
/obj/item/organ/proc/removed(var/mob/living/user)
/obj/item/organ/proc/removed(mob/living/user)
if(owner)
owner.internal_organs_by_name[organ_tag] = null
owner.internal_organs_by_name -= organ_tag
@@ -471,7 +471,7 @@
owner = null
/obj/item/organ/proc/replaced(var/mob/living/carbon/human/target,var/obj/item/organ/external/affected)
/obj/item/organ/proc/replaced(mob/living/carbon/human/target,obj/item/organ/external/affected)
if(!istype(target)) return
@@ -549,7 +549,7 @@
return
return ..()
/obj/item/organ/proc/can_butcher(var/obj/item/O, var/mob/living/user)
/obj/item/organ/proc/can_butcher(obj/item/O, mob/living/user)
if(butcherable && meat_type)
if(istype(O, /obj/machinery/gibber)) // The great equalizer.
@@ -565,7 +565,7 @@
return FALSE
/obj/item/organ/proc/butcher(var/obj/item/O, var/mob/living/user, var/atom/newtarget)
/obj/item/organ/proc/butcher(obj/item/O, mob/living/user, atom/newtarget)
if(user)
to_chat(user, span_danger("You are preparing to butcher \the [src]!"))
@@ -606,7 +606,7 @@
return 0
return 1
/obj/item/organ/proc/handle_organ_mod_special(var/removed = FALSE) // Called when created, transplanted, and removed.
/obj/item/organ/proc/handle_organ_mod_special(removed = FALSE) // Called when created, transplanted, and removed.
if(!istype(owner))
return
+15 -15
View File
@@ -337,7 +337,7 @@
/obj/item/organ/external/update_health()
damage = min(max_damage, (brute_dam + burn_dam))
/obj/item/organ/external/Initialize(mapload, var/internal)
/obj/item/organ/external/Initialize(mapload, internal)
..(mapload, 0)
if(istype(owner))
replaced(owner)
@@ -348,7 +348,7 @@
if(!QDELETED(src))
get_icon()
/obj/item/organ/external/replaced(var/mob/living/carbon/human/target)
/obj/item/organ/external/replaced(mob/living/carbon/human/target)
owner = target
forceMove(owner)
if(istype(owner))
@@ -375,7 +375,7 @@
DAMAGE PROCS
****************************************************/
/obj/item/organ/external/proc/is_damageable(var/additional_damage = 0)
/obj/item/organ/external/proc/is_damageable(additional_damage = 0)
//Continued damage to vital organs can kill you, and robot organs don't count towards total damage so no need to cap them.
return (vital || (robotic >= ORGAN_ROBOT) || brute_dam + burn_dam + additional_damage < max_damage)
@@ -588,7 +588,7 @@
return result
//Helper proc used by various tools for repairing robot limbs
/obj/item/organ/external/proc/robo_repair(var/repair_amount, var/damage_type, var/damage_desc, obj/item/tool, mob/living/user)
/obj/item/organ/external/proc/robo_repair(repair_amount, damage_type, damage_desc, obj/item/tool, mob/living/user)
if((src.robotic < ORGAN_ROBOT))
return 0
@@ -645,7 +645,7 @@
/*
This function completely restores a damaged organ to perfect condition.
*/
/obj/item/organ/external/rejuvenate(var/ignore_prosthetic_prefs)
/obj/item/organ/external/rejuvenate(ignore_prosthetic_prefs)
damage_state = "00"
status = 0
brute_dam = 0
@@ -696,7 +696,7 @@ This function completely restores a damaged organ to perfect condition.
I.remove_rejuv()
..()
/obj/item/organ/external/proc/createwound(var/type = CUT, var/damage)
/obj/item/organ/external/proc/createwound(type = CUT, damage)
if(damage == 0) return
//moved this before the open_wound check so that having many small wounds for example doesn't somehow protect you from taking internal damage (because of the return)
@@ -1015,7 +1015,7 @@ Note that amputating the affected organ does in fact remove the infection from t
****************************************************/
//Handles dismemberment
/obj/item/organ/external/proc/droplimb(var/clean, var/disintegrate = DROPLIMB_EDGE, var/ignore_children = null)
/obj/item/organ/external/proc/droplimb(clean, disintegrate = DROPLIMB_EDGE, ignore_children = null)
if(cannot_amputate || !owner)
return
@@ -1159,7 +1159,7 @@ Note that amputating the affected organ does in fact remove the infection from t
/obj/item/organ/external/proc/is_stump()
return 0
/obj/item/organ/external/proc/release_restraints(var/mob/living/carbon/human/holder)
/obj/item/organ/external/proc/release_restraints(mob/living/carbon/human/holder)
if(!holder)
holder = owner
if(!holder)
@@ -1285,7 +1285,7 @@ Note that amputating the affected organ does in fact remove the infection from t
status &= ~ORGAN_BROKEN
return 1
/obj/item/organ/external/proc/apply_splint(var/atom/movable/splint)
/obj/item/organ/external/proc/apply_splint(atom/movable/splint)
if(!splinted)
splinted = splint
if(!applied_pressure)
@@ -1303,7 +1303,7 @@ Note that amputating the affected organ does in fact remove the infection from t
return 1
return 0
/obj/item/organ/external/robotize(var/company, var/skip_prosthetics = 0, var/keep_organs = 0)
/obj/item/organ/external/robotize(company, skip_prosthetics = 0, keep_organs = 0)
if(robotic >= ORGAN_ROBOT)
return
@@ -1383,7 +1383,7 @@ Note that amputating the affected organ does in fact remove the infection from t
/obj/item/organ/external/proc/is_malfunctioning()
return ((robotic >= ORGAN_ROBOT) && (brute_dam + burn_dam) >= min_broken_damage*0.83 && prob(brute_dam + burn_dam)) //VOREStation Edit - Makes robotic limb damage scalable
/obj/item/organ/external/proc/embed(var/obj/item/W, var/silent = 0)
/obj/item/organ/external/proc/embed(obj/item/W, silent = 0)
if(!owner || loc != owner)
return
if(SEND_SIGNAL(owner, COMSIG_EMBED_OBJECT) & COMSIG_CANCEL_EMBED) //Normally we'd let this proc continue on, but it's much less time consumptive to just do a godmode check here.
@@ -1400,7 +1400,7 @@ Note that amputating the affected organ does in fact remove the infection from t
H.drop_from_inventory(W)
W.loc = owner
/obj/item/organ/external/removed(var/mob/living/user, var/ignore_children = 0)
/obj/item/organ/external/removed(mob/living/user, ignore_children = 0)
if(!owner)
return
var/is_robotic = robotic >= ORGAN_ROBOT
@@ -1461,7 +1461,7 @@ Note that amputating the affected organ does in fact remove the infection from t
victim.refresh_modular_limb_verbs()
victim.update_icons_body()
/obj/item/organ/external/proc/disfigure(var/type = "brute")
/obj/item/organ/external/proc/disfigure(type = "brute")
if (disfigured)
return
if(owner)
@@ -1567,7 +1567,7 @@ Note that amputating the affected organ does in fact remove the infection from t
return english_list(flavor_text)
// Returns a list of the clothing (not glasses) that are covering this part
/obj/item/organ/external/proc/get_covering_clothing(var/target_covering) // target_covering checks for mouth/eye coverage
/obj/item/organ/external/proc/get_covering_clothing(target_covering) // target_covering checks for mouth/eye coverage
var/list/covering_clothing = list()
if(!target_covering)
@@ -1592,7 +1592,7 @@ Note that amputating the affected organ does in fact remove the infection from t
if(!istype(I,/obj/item/implant) && !istype(I,/obj/item/nif)) //VOREStation Add - NIFs
return 1
/obj/item/organ/external/proc/is_hidden_by_sprite_accessory(var/clothing_only = FALSE) // Clothing only will mean the check should only be used in places where we want to hide clothing icon, not organ itself.
/obj/item/organ/external/proc/is_hidden_by_sprite_accessory(clothing_only = FALSE) // Clothing only will mean the check should only be used in places where we want to hide clothing icon, not organ itself.
if(owner && owner.tail_style && owner.tail_style.hide_body_parts && (organ_tag in owner.tail_style.hide_body_parts))
return 1
if(clothing_only && markings.len)
+2 -2
View File
@@ -1,5 +1,5 @@
//Sideways override for nanoform limbs (ugh)
/obj/item/organ/external/robotize(var/company, var/skip_prosthetics = FALSE, var/keep_organs = FALSE)
/obj/item/organ/external/robotize(company, skip_prosthetics = FALSE, keep_organs = FALSE)
var/original_robotic = robotic
if(original_robotic >= ORGAN_NANOFORM)
var/o_encased = encased
@@ -14,5 +14,5 @@
else
return ..()
/obj/item/organ/external/digitize(var/company, var/skip_prosthetics = FALSE, var/keep_organs = FALSE)
/obj/item/organ/external/digitize(company, skip_prosthetics = FALSE, keep_organs = FALSE)
robotize(company, skip_prosthetics, keep_organs)
+5 -5
View File
@@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
add_overlay(child.mob_icon)
add_overlay(organ.mob_icon)
/obj/item/organ/external/proc/sync_colour_to_human(var/mob/living/carbon/human/human)
/obj/item/organ/external/proc/sync_colour_to_human(mob/living/carbon/human/human)
s_tone = null
s_col = null
h_col = null
@@ -41,7 +41,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
s_col = data.skin_color.Copy()
h_col = data.hair_color.Copy()
/obj/item/organ/external/head/sync_colour_to_human(var/mob/living/carbon/human/human)
/obj/item/organ/external/head/sync_colour_to_human(mob/living/carbon/human/human)
..()
if(owner)
@@ -76,7 +76,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
return res
/obj/item/organ/external/proc/get_icon(var/skeletal, var/can_apply_transparency = TRUE)
/obj/item/organ/external/proc/get_icon(skeletal, can_apply_transparency = TRUE)
var/digitigrade = 0
cut_overlays()
@@ -171,7 +171,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
icon = mob_icon
return mob_icon
/obj/item/organ/external/proc/apply_colouration(var/icon/applying)
/obj/item/organ/external/proc/apply_colouration(icon/applying)
if(transparent)
applying.MapColors("#4D4D4D","#969696","#1C1C1C", "#000000")
@@ -218,7 +218,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
GLOBAL_LIST_INIT(flesh_hud_colours, list("#02BA08","#9ECF19","#DEDE10","#FFAA00","#FF0000","#AA0000","#660000"))
GLOBAL_LIST_INIT(robot_hud_colours, list("#CFCFCF","#AFAFAF","#8F8F8F","#6F6F6F","#4F4F4F","#2F2F2F","#000000"))
/obj/item/organ/external/proc/get_damage_hud_image(var/min_dam_state)
/obj/item/organ/external/proc/get_damage_hud_image(min_dam_state)
// Generate the greyscale base icon and cache it for later.
// icon_cache_key is set by any get_icon() calls that are made.
+1 -1
View File
@@ -3,7 +3,7 @@
icon_name = ""
dislocated = -1
/obj/item/organ/external/stump/Initialize(mapload, var/internal, var/obj/item/organ/external/limb)
/obj/item/organ/external/stump/Initialize(mapload, internal, obj/item/organ/external/limb)
if(istype(limb))
organ_tag = limb.organ_tag
body_part = limb.body_part
+4 -4
View File
@@ -1,4 +1,4 @@
/proc/spawn_diona_nymph(var/turf/target)
/proc/spawn_diona_nymph(turf/target)
if(!istype(target))
return 0
@@ -141,7 +141,7 @@
icon_state = "nymph"
organ_tag = "special" // Turns into a nymph instantly, no transplanting possible.
/obj/item/organ/internal/diona/removed(var/mob/living/user, var/skip_nymph)
/obj/item/organ/internal/diona/removed(mob/living/user, skip_nymph)
if(robotic >= ORGAN_ROBOT)
return ..()
var/mob/living/carbon/human/H = owner
@@ -192,7 +192,7 @@
icon = 'icons/mob/alien.dmi'
icon_state = "claw"
/obj/item/organ/internal/diona/nutrients/removed(var/mob/user)
/obj/item/organ/internal/diona/nutrients/removed(mob/user)
return ..(user, 1)
/obj/item/organ/internal/diona/node
@@ -225,7 +225,7 @@
/obj/item/organ/internal/brain/cephalon/digitize()
return
/obj/item/organ/internal/brain/cephalon/removed(var/mob/living/user, var/skip_nymph)
/obj/item/organ/internal/brain/cephalon/removed(mob/living/user, skip_nymph)
if(robotic >= ORGAN_ROBOT)
return ..()
var/mob/living/carbon/human/H = owner
+2 -2
View File
@@ -48,7 +48,7 @@
stored_mmi = null
return ..()
/obj/item/organ/internal/mmi_holder/Initialize(mapload, var/internal, var/obj/item/mmi/installed)
/obj/item/organ/internal/mmi_holder/Initialize(mapload, internal, obj/item/mmi/installed)
. = ..(mapload, internal)
if(!ishuman(loc) || ismannequin(loc))
return
@@ -97,7 +97,7 @@
GLOB.living_mob_list |= owner
owner.visible_message(span_danger("\The [owner] twitches visibly!"))
/obj/item/organ/internal/mmi_holder/removed(var/mob/living/user)
/obj/item/organ/internal/mmi_holder/removed(mob/living/user)
if(stored_mmi)
. = stored_mmi //VOREStation Code
+3 -3
View File
@@ -126,12 +126,12 @@
. = ..()
icon_state = "refactory"
/obj/item/organ/internal/nano/refactory/proc/get_stored_material(var/material)
/obj/item/organ/internal/nano/refactory/proc/get_stored_material(material)
if(status & ORGAN_DEAD)
return 0
return materials[material] || 0
/obj/item/organ/internal/nano/refactory/proc/add_stored_material(var/material,var/amt)
/obj/item/organ/internal/nano/refactory/proc/add_stored_material(material,amt)
if(status & ORGAN_DEAD)
return 0
var/increase = min(amt,max(max_storage-materials[material],0))
@@ -142,7 +142,7 @@
return increase
/obj/item/organ/internal/nano/refactory/proc/use_stored_material(var/material,var/amt)
/obj/item/organ/internal/nano/refactory/proc/use_stored_material(material,amt)
if(status & ORGAN_DEAD)
return 0
+2 -2
View File
@@ -97,7 +97,7 @@
var/mob/living/carbon/human/H = loc
color = H.species.get_blood_colour(H)
/obj/item/organ/internal/regennetwork/proc/get_strain_percent(var/cost)
/obj/item/organ/internal/regennetwork/proc/get_strain_percent(cost)
adjust_strain(cost)
if((status & ORGAN_CUT_AWAY) || (status & ORGAN_BROKEN) || (status & ORGAN_DEAD))
@@ -105,7 +105,7 @@
return round((strain / min_broken_damage) * 10) / 10
/obj/item/organ/internal/regennetwork/proc/adjust_strain(var/amount)
/obj/item/organ/internal/regennetwork/proc/adjust_strain(amount)
if(amount < 0 && world.time < (last_strain_increase + strain_regen_cooldown))
return
+2 -2
View File
@@ -297,7 +297,7 @@
cannot_gib = FALSE
return ..()
/obj/item/organ/external/head/robotize(var/company, var/skip_prosthetics, var/keep_organs)
/obj/item/organ/external/head/robotize(company, skip_prosthetics, keep_organs)
. = ..(company, skip_prosthetics, 1)
if(model)
var/datum/robolimb/robohead = GLOB.all_robolimbs[model]
@@ -349,7 +349,7 @@
span_notice("You make \the [I] kiss \the [src]!."))
return ..()
/obj/item/organ/external/head/get_icon(var/skeletal, var/can_apply_transparency = TRUE)
/obj/item/organ/external/head/get_icon(skeletal, can_apply_transparency = TRUE)
..()
//The overlays are not drawn on the mob, they are used for if the head is removed and becomes an item
+3 -3
View File
@@ -48,7 +48,7 @@
adjust_plasma(1)
/obj/item/organ/internal/xenos/plasmavessel/proc/adjust_plasma(var/amount = 0)
/obj/item/organ/internal/xenos/plasmavessel/proc/adjust_plasma(amount = 0)
stored_plasma = CLAMP(stored_plasma + amount, 0, max_plasma)
/obj/item/organ/internal/xenos/plasmavessel/grey
@@ -108,11 +108,11 @@
icon_state = "xenode"
organ_tag = O_HIVE
/obj/item/organ/internal/xenos/hivenode/replaced(var/mob/living/carbon/human/target,var/obj/item/organ/external/affected)
/obj/item/organ/internal/xenos/hivenode/replaced(mob/living/carbon/human/target,obj/item/organ/external/affected)
..()
target.add_language(LANGUAGE_HIVEMIND) //You need this to speak the language, so...
/obj/item/organ/internal/xenos/hivenode/removed(var/mob/living/user)
/obj/item/organ/internal/xenos/hivenode/removed(mob/living/user)
if(ishuman(user))
var/mob/living/carbon/human/human = user
human.remove_language(LANGUAGE_HIVEMIND)
+7 -7
View File
@@ -53,7 +53,7 @@
var/tmp/list/desc_list = list()
var/tmp/list/damage_list = list()
/datum/wound/New(var/damage)
/datum/wound/New(damage)
created = world.time
@@ -71,7 +71,7 @@
bleed_timer += damage
// returns 1 if there's a next stage, 0 otherwise
/datum/wound/proc/init_stage(var/initial_damage)
/datum/wound/proc/init_stage(initial_damage)
current_stage = stages.len
while(src.current_stage > 1 && src.damage_list[current_stage-1] <= initial_damage / src.amount)
@@ -100,7 +100,7 @@
return salved
// Checks whether other other can be merged into src.
/datum/wound/proc/can_merge(var/datum/wound/other)
/datum/wound/proc/can_merge(datum/wound/other)
if (other.type != src.type) return 0
if (other.current_stage != src.current_stage) return 0
if (other.damage_type != src.damage_type) return 0
@@ -112,7 +112,7 @@
//if (other.germ_level != src.germ_level) return 0
return 1
/datum/wound/proc/merge_wound(var/datum/wound/other)
/datum/wound/proc/merge_wound(datum/wound/other)
src.damage += other.damage
src.amount += other.amount
src.bleed_timer += other.bleed_timer
@@ -223,7 +223,7 @@
//the damage amount for the stage with the same name as the wound.
//e.g. /datum/wound/cut/deep should only be applied for 15 damage and up,
//because in it's stages list, "deep cut" = 15.
/proc/get_wound_type(var/type = CUT, var/damage)
/proc/get_wound_type(type = CUT, damage)
switch(type)
if(CUT)
switch(damage)
@@ -373,7 +373,7 @@
/** EXTERNAL ORGAN LOSS **/
/datum/wound/lost_limb
/datum/wound/lost_limb/New(var/obj/item/organ/external/lost_limb, var/losstype, var/clean)
/datum/wound/lost_limb/New(obj/item/organ/external/lost_limb, losstype, clean)
var/damage_amt = lost_limb.max_damage
if(clean) damage_amt *= 0.25
@@ -407,5 +407,5 @@
..(damage_amt)
/datum/wound/lost_limb/can_merge(var/datum/wound/other)
/datum/wound/lost_limb/can_merge(datum/wound/other)
return 0 //cannot be merged