cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 13:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

BRUTAL Part 1 - No proc var/ in procs

Browse Source
This commit is contained in:
AffectedArc07
2021-02-01 14:10:08 +00:00
parent 1d89138436
commit f5f97882cf
533 changed files with 1558 additions and 1554 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/augments_arms.dm
+2 -2
View File
@@ -79,7 +79,7 @@
holder = null
playsound(get_turf(owner), 'sound/mecha/mechmove03.ogg', 50, 1)
/obj/item/organ/internal/cyberimp/arm/proc/Extend(var/obj/item/item)
/obj/item/organ/internal/cyberimp/arm/proc/Extend(obj/item/item)
if(!(item in src))
return
@@ -138,7 +138,7 @@
else
Retract()
/obj/item/organ/internal/cyberimp/arm/proc/check_menu(var/mob/user)
/obj/item/organ/internal/cyberimp/arm/proc/check_menu(mob/user)
return (owner && owner == user && owner.stat != DEAD && (src in owner.internal_organs) && !holder)
/obj/item/organ/internal/cyberimp/arm/proc/radial_menu(mob/user)
code/modules/surgery/organs/augments_eyes.dm
+5 -5
View File
@@ -17,7 +17,7 @@
var/flash_protect = 0
var/aug_message = "Your vision is augmented!"
/obj/item/organ/internal/cyberimp/eyes/insert(var/mob/living/carbon/M, var/special = 0)
/obj/item/organ/internal/cyberimp/eyes/insert(mob/living/carbon/M, special = 0)
..()
var/mob/living/carbon/human/H = M
if(istype(H) && eye_colour)
@@ -26,11 +26,11 @@
to_chat(owner, "<span class='notice'>[aug_message]</span>")
M.update_sight()
/obj/item/organ/internal/cyberimp/eyes/remove(var/mob/living/carbon/M, var/special = 0)
/obj/item/organ/internal/cyberimp/eyes/remove(mob/living/carbon/M, special = 0)
. = ..()
M.update_sight()
/obj/item/organ/internal/cyberimp/eyes/proc/generate_icon(var/mob/living/carbon/human/HA)
/obj/item/organ/internal/cyberimp/eyes/proc/generate_icon(mob/living/carbon/human/HA)
var/mob/living/carbon/human/H = HA
if(!istype(H))
H = owner
@@ -87,14 +87,14 @@
/// A list of extension kinds added to the examine text. Things like medical or security records.
var/list/examine_extensions = null
/obj/item/organ/internal/cyberimp/eyes/hud/insert(var/mob/living/carbon/M, var/special = 0)
/obj/item/organ/internal/cyberimp/eyes/hud/insert(mob/living/carbon/M, special = 0)
..()
if(HUD_type)
var/datum/atom_hud/H = GLOB.huds[HUD_type]
H.add_hud_to(M)
M.permanent_huds |= H
/obj/item/organ/internal/cyberimp/eyes/hud/remove(var/mob/living/carbon/M, var/special = 0)
/obj/item/organ/internal/cyberimp/eyes/hud/remove(mob/living/carbon/M, special = 0)
. = ..()
if(HUD_type)
var/datum/atom_hud/H = GLOB.huds[HUD_type]
code/modules/surgery/organs/augments_internal.dm
+2 -2
View File
@@ -6,7 +6,7 @@
var/implant_overlay
tough = TRUE // Immune to damage
/obj/item/organ/internal/cyberimp/New(var/mob/M = null)
/obj/item/organ/internal/cyberimp/New(mob/M = null)
. = ..()
if(implant_overlay)
var/image/overlay = new /image(icon, implant_overlay)
@@ -114,7 +114,7 @@
if(!r_hand_ignore && (r_hand_obj in owner.contents))
r_hand_obj.flags ^= NODROP
/obj/item/organ/internal/cyberimp/brain/anti_drop/remove(var/mob/living/carbon/M, special = 0)
/obj/item/organ/internal/cyberimp/brain/anti_drop/remove(mob/living/carbon/M, special = 0)
if(active)
ui_action_click()
return ..()
code/modules/surgery/organs/body_egg.dm
+2 -2
View File
@@ -10,7 +10,7 @@
..()
to_chat(finder, "<span class='warning'>You found an unknown alien organism in [owner]'s [parent_organ]!</span>")
/obj/item/organ/internal/body_egg/insert(var/mob/living/carbon/M, special = 0)
/obj/item/organ/internal/body_egg/insert(mob/living/carbon/M, special = 0)
..()
owner.status_flags |= XENO_HOST
START_PROCESSING(SSobj, src)
@@ -18,7 +18,7 @@
spawn(0)
AddInfectionImages(owner)
/obj/item/organ/internal/body_egg/remove(var/mob/living/carbon/M, special = 0)
/obj/item/organ/internal/body_egg/remove(mob/living/carbon/M, special = 0)
STOP_PROCESSING(SSobj, src)
if(owner)
owner.status_flags &= ~(XENO_HOST)
code/modules/surgery/organs/eyes.dm
+1 -1
View File
@@ -20,7 +20,7 @@
/obj/item/organ/internal/eyes/proc/update_colour()
dna.write_eyes_attributes(src)
/obj/item/organ/internal/eyes/proc/generate_icon(var/mob/living/carbon/human/HA)
/obj/item/organ/internal/eyes/proc/generate_icon(mob/living/carbon/human/HA)
var/mob/living/carbon/human/H = HA
if(!istype(H))
H = owner
code/modules/surgery/organs/helpers.dm
+1 -1
View File
@@ -17,7 +17,7 @@
return (locate(typepath) in internal_organs)
/mob/living/carbon/get_organs_zone(zone, var/subzones = 0)
/mob/living/carbon/get_organs_zone(zone, subzones = 0)
var/list/returnorg = list()
if(subzones)
// Include subzones - groin for chest, eyes and mouth for head
code/modules/surgery/organs/organ.dm
+6 -6
View File
@@ -72,7 +72,7 @@
return
return ..()
/obj/item/organ/proc/set_dna(var/datum/dna/new_dna)
/obj/item/organ/proc/set_dna(datum/dna/new_dna)
if(new_dna)
dna = new_dna.Clone()
if(blood_DNA)
@@ -193,7 +193,7 @@
return (damage >= min_broken_damage || ((status & ORGAN_BROKEN) && !(status & ORGAN_SPLINTED)))
//Adds autopsy data for used_weapon.
/obj/item/organ/proc/add_autopsy_data(var/used_weapon = "Unknown", var/damage)
/obj/item/organ/proc/add_autopsy_data(used_weapon = "Unknown", damage)
var/datum/autopsy_data/W = autopsy_data[used_weapon]
if(!W)
W = new()
@@ -233,7 +233,7 @@
/obj/item/organ/proc/shock_organ(intensity)
return
/obj/item/organ/proc/remove(var/mob/living/user,special = 0)
/obj/item/organ/proc/remove(mob/living/user,special = 0)
if(!istype(owner))
return
@@ -251,12 +251,12 @@
owner = null
return src
/obj/item/organ/proc/replaced(var/mob/living/carbon/human/target)
/obj/item/organ/proc/replaced(mob/living/carbon/human/target)
return // Nothing uses this, it is always overridden
// A version of `replaced` that "flattens" the process of insertion, making organs "Plug'n'play"
// (Particularly the heart, which stops beating when removed)
/obj/item/organ/proc/safe_replace(var/mob/living/carbon/human/target)
/obj/item/organ/proc/safe_replace(mob/living/carbon/human/target)
replaced(target)
/obj/item/organ/proc/surgeryize()
@@ -267,7 +267,7 @@ Returns 1 if this is the organ that is handling all the functionalities of that
Returns 0 if it isn't
I use this so that this can be made better once the organ overhaul rolls out -- Crazylemon
*/
/obj/item/organ/proc/is_primary_organ(var/mob/living/carbon/human/O = null)
/obj/item/organ/proc/is_primary_organ(mob/living/carbon/human/O = null)
if(isnull(O))
O = owner
if(!istype(owner)) // You're not the primary organ of ANYTHING, bucko
code/modules/surgery/organs/organ_external.dm
+7 -7
View File
@@ -105,7 +105,7 @@
return
/obj/item/organ/external/New(var/mob/living/carbon/holder)
/obj/item/organ/external/New(mob/living/carbon/holder)
..()
var/mob/living/carbon/human/H = holder
icobase = dna.species.icobase
@@ -115,7 +115,7 @@
sync_colour_to_human(H)
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))
@@ -402,7 +402,7 @@ Note that amputating the affected organ does in fact remove the infection from t
owner.adjustToxLoss(1)
//Updates brute_damn and burn_damn from wound damages. Updates BLEEDING status.
/obj/item/organ/external/proc/check_fracture(var/damage_inflicted)
/obj/item/organ/external/proc/check_fracture(damage_inflicted)
if(config.bones_can_break && brute_dam > min_broken_damage && !is_robotic())
if(prob(damage_inflicted))
fracture()
@@ -588,7 +588,7 @@ Note that amputating the affected organ does in fact remove the infection from t
/****************************************************
HELPERS
****************************************************/
/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)
@@ -665,7 +665,7 @@ Note that amputating the affected organ does in fact remove the infection from t
/obj/item/organ/external/proc/set_company(var/company)
/obj/item/organ/external/proc/set_company(company)
model = company
var/datum/robolimb/R = GLOB.all_robolimbs[company]
if(R)
@@ -699,7 +699,7 @@ Note that amputating the affected organ does in fact remove the infection from t
/obj/item/organ/external/proc/is_malfunctioning()
return (is_robotic() && (brute_dam + burn_dam) >= 10 && prob(brute_dam + burn_dam) && !tough)
/obj/item/organ/external/remove(var/mob/living/user, var/ignore_children)
/obj/item/organ/external/remove(mob/living/user, ignore_children)
if(!owner)
return
@@ -753,7 +753,7 @@ Note that amputating the affected organ does in fact remove the infection from t
"<span class='warning'>You hear a sickening sound.</span>")
disfigured = TRUE
/obj/item/organ/external/is_primary_organ(var/mob/living/carbon/human/O = null)
/obj/item/organ/external/is_primary_organ(mob/living/carbon/human/O = null)
if(isnull(O))
O = owner
if(!istype(O)) // You're not the primary organ of ANYTHING, bucko
code/modules/surgery/organs/organ_icon.dm
+3 -3
View File
@@ -14,7 +14,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
overlays += organ.mob_icon
child_icons += organ.mob_icon
/obj/item/organ/external/proc/change_organ_icobase(var/new_icobase, var/new_deform, var/owner_sensitive) //Change the icobase/deform of this organ. If owner_sensitive is set, that means the proc won't mess with frankenstein limbs.
/obj/item/organ/external/proc/change_organ_icobase(new_icobase, new_deform, owner_sensitive) //Change the icobase/deform of this organ. If owner_sensitive is set, that means the proc won't mess with frankenstein limbs.
if(owner_sensitive) //This and the below statements mean that the icobase/deform will only get updated if the limb is the same species as and is owned by the mob it's attached to.
if(dna.species && owner.dna.species && dna.species.name != owner.dna.species.name)
return
@@ -24,7 +24,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
icobase = new_icobase ? new_icobase : icobase
deform = new_deform ? new_deform : deform
/obj/item/organ/external/proc/sync_colour_to_human(var/mob/living/carbon/human/H)
/obj/item/organ/external/proc/sync_colour_to_human(mob/living/carbon/human/H)
if(is_robotic() && !istype(dna.species, /datum/species/machine)) //machine people get skin color
return
if(dna.species && H.dna.species && dna.species.name != H.dna.species.name)
@@ -53,7 +53,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
s_tone = null
s_col = rgb(dna.GetUIValue(DNA_UI_SKIN_R), dna.GetUIValue(DNA_UI_SKIN_G), dna.GetUIValue(DNA_UI_SKIN_B))
/obj/item/organ/external/head/sync_colour_to_human(var/mob/living/carbon/human/H)
/obj/item/organ/external/head/sync_colour_to_human(mob/living/carbon/human/H)
..()
var/obj/item/organ/internal/eyes/eyes = owner.get_int_organ(/obj/item/organ/internal/eyes)//owner.internal_bodyparts_by_name["eyes"]
if(eyes) eyes.update_colour()
code/modules/surgery/organs/organ_internal.dm
+2 -2
View File
@@ -13,7 +13,7 @@
if(istype(holder))
insert(holder)
/obj/item/organ/internal/proc/insert(mob/living/carbon/M, special = 0, var/dont_remove_slot = 0)
/obj/item/organ/internal/proc/insert(mob/living/carbon/M, special = 0, dont_remove_slot = 0)
if(!iscarbon(M) || owner == M)
return
@@ -83,7 +83,7 @@
if(2)
receive_damage(7, 1)
/obj/item/organ/internal/replaced(var/mob/living/carbon/human/target)
/obj/item/organ/internal/replaced(mob/living/carbon/human/target)
insert(target)
/obj/item/organ/internal/item_action_slot_check(slot, mob/user)
code/modules/surgery/organs/parasites.dm
+2 -2
View File
@@ -32,7 +32,7 @@
owner.visible_message("<span class='danger'>[owner] bursts open! Holy fuck!</span>")
owner.gib()
/obj/item/organ/internal/body_egg/spider_eggs/remove(var/mob/living/carbon/M, var/special = 0)
/obj/item/organ/internal/body_egg/spider_eggs/remove(mob/living/carbon/M, special = 0)
..()
M.reagents.del_reagent("spidereggs") //purge all remaining spider eggs reagent if caught, in time.
if(!QDELETED(src))
@@ -120,7 +120,7 @@
if(infection_completed && !QDELETED(src))
qdel(src)
/obj/item/organ/internal/body_egg/terror_eggs/remove(var/mob/living/carbon/M, var/special = 0)
/obj/item/organ/internal/body_egg/terror_eggs/remove(mob/living/carbon/M, special = 0)
..()
if(!QDELETED(src))
qdel(src) // prevent people re-implanting them into others
code/modules/surgery/organs/subtypes/grey.dm
+2 -2
View File
@@ -11,11 +11,11 @@
mmi_icon = 'icons/obj/species_organs/grey.dmi'
mmi_icon_state = "mmi_full"
/obj/item/organ/internal/brain/grey/insert(var/mob/living/carbon/M, var/special = 0)
/obj/item/organ/internal/brain/grey/insert(mob/living/carbon/M, special = 0)
..()
M.add_language("Psionic Communication")
/obj/item/organ/internal/brain/grey/remove(var/mob/living/carbon/M, var/special = 0)
/obj/item/organ/internal/brain/grey/remove(mob/living/carbon/M, special = 0)
. = ..()
M.remove_language("Psionic Communication")
code/modules/surgery/organs/subtypes/machine.dm
+1 -1
View File
@@ -120,7 +120,7 @@
// dead_icon = "camera_broken"
weld_proof = 1
/obj/item/organ/internal/eyes/optical_sensor/remove(var/mob/living/user,special = 0)
/obj/item/organ/internal/eyes/optical_sensor/remove(mob/living/user,special = 0)
if(!special)
to_chat(owner, "Error 404:Optical Sensors not found.")