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

Removes a lot of redefined procs (#26186)

Browse Source 
* aaaaaaaaaaaaaaa

* Forgor

* Adds missing /proc/

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
DGamerL
2024-07-30 13:19:32 +00:00
committed by GitHub
parent cbeedfca9f
commit b497e4c925
76 changed files with 154 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/alien_base.dm
-7
View File
@@ -164,13 +164,6 @@
return threatcount
/mob/living/carbon/alien/death(gibbed)
. = ..()
if(!.)
return
deathrattle()
/mob/living/carbon/alien/proc/deathrattle()
var/alien_message = deathrattle_message()
for(var/mob/living/carbon/alien/M in GLOB.player_list)
code/modules/mob/living/carbon/alien/alien_death.dm
+2
View File
@@ -72,3 +72,5 @@
playsound(loc, death_sound, 80, TRUE, 1)
visible_message("<B>[src]</B> [death_message]")
update_icons()
deathrattle()
code/modules/mob/living/carbon/human/human_movement.dm
-22
View File
@@ -4,28 +4,6 @@
. += GLOB.configuration.movement.human_delay
. += dna.species.movement_delay(src)
/mob/living/carbon/human/Process_Spacemove(movement_dir = 0)
if(..())
return TRUE
//Do we have a working jetpack?
var/obj/item/tank/jetpack/thrust
if(istype(back, /obj/item/tank/jetpack))
thrust = back
else if(istype(wear_suit, /obj/item/clothing/suit/space/hardsuit))
var/obj/item/clothing/suit/space/hardsuit/C = wear_suit
thrust = C.jetpack
else if(ismodcontrol(back))
var/obj/item/mod/control/C = back
thrust = locate(/obj/item/mod/module/jetpack) in C
if(thrust)
if((movement_dir || thrust.stabilizers) && thrust.allow_thrust(0.01, src))
return TRUE
if(dna.species.spec_Process_Spacemove(src))
return TRUE
return FALSE
/mob/living/carbon/human/mob_has_gravity()
. = ..()
if(!.)
code/modules/mob/living/living.dm
+4 -2
View File
@@ -1086,8 +1086,6 @@
GLOB.dead_mob_list += src
. = ..()
switch(var_name)
if("maxHealth")
updatehealth()
if("resize")
update_transform()
if("lighting_alpha")
@@ -1095,6 +1093,10 @@
if("advanced_bullet_dodge_chance")
UnregisterSignal(src, COMSIG_ATOM_PREHIT)
RegisterSignal(src, COMSIG_ATOM_PREHIT, PROC_REF(advanced_bullet_dodge))
if("maxHealth")
updatehealth("var edit")
if("resize")
update_transform()
/mob/living/throw_at(atom/target, range, speed, mob/thrower, spin, diagonals_first, datum/callback/callback, force, dodgeable, block_movement)
stop_pulling()
code/modules/mob/living/living_update_status.dm
-8
View File
@@ -89,11 +89,3 @@
/mob/living/proc/update_stamina()
return
/mob/living/vv_edit_var(var_name, var_value)
. = ..()
switch(var_name)
if("maxHealth")
updatehealth("var edit")
if("resize")
update_transform()
code/modules/mob/living/silicon/robot/robot_laws.dm
+2
View File
@@ -68,6 +68,8 @@
/mob/living/silicon/robot/set_zeroth_law(law, law_borg)
if(mmi && mmi.syndiemmi)
return FALSE
if(tracking_entities)
to_chat(src, "<span class='warning'>Internal camera is currently being accessed.</span>")
..()
/mob/living/silicon/robot/clear_zeroth_law()
code/modules/mob/living/silicon/robot/syndicate_robot.dm
-5
View File
@@ -136,8 +136,3 @@
if(cham_proj)
cham_proj.disrupt(src)
..()
/mob/living/silicon/robot/syndicate/saboteur/attackby()
if(cham_proj)
cham_proj.disrupt(src)
..()
code/modules/mob/living/silicon/silicon_death.dm
+2
View File
@@ -46,3 +46,5 @@
if(. && !gibbed)
if(death_sound)
playsound(get_turf(src), death_sound, 200, 1)
if(gibbed)
drop_hat()
code/modules/mob/living/silicon/silicon_laws.dm
-5
View File
@@ -14,11 +14,6 @@
if(!isnull(usr) && law)
log_and_message_admins("has given [src] the zeroth laws: [law]/[law_borg ? law_borg : "N/A"]")
/mob/living/silicon/robot/set_zeroth_law(law, law_borg)
..()
if(tracking_entities)
to_chat(src, "<span class='warning'>Internal camera is currently being accessed.</span>")
/mob/living/silicon/proc/add_ion_law(law)
throw_alert("newlaw", /atom/movable/screen/alert/newlaw)
laws_sanity_check()
code/modules/mob/living/silicon/silicon_mob.dm
-5
View File
@@ -589,11 +589,6 @@
hat_alpha = null
hat_color = null
/mob/living/silicon/death(gibbed)
if(gibbed)
drop_hat()
. = ..()
/mob/living/silicon/examine(mob/user)
. = ..()
if(silicon_hat)
code/modules/mob/living/simple_animal/bot/ed209bot.dm
+18 -26
View File
@@ -202,6 +202,24 @@
set_weapon()
/mob/living/simple_animal/bot/ed209/bullet_act(obj/item/projectile/Proj)
if(!disabled)
var/lasertag_check = FALSE
if(lasercolor == "b")
if(istype(Proj, /obj/item/projectile/beam/lasertag/redtag))
lasertag_check = TRUE
else if(lasercolor == "r")
if(istype(Proj, /obj/item/projectile/beam/lasertag/bluetag))
lasertag_check = TRUE
if(lasertag_check)
icon_state = "[lasercolor]ed2090"
disabled = TRUE
walk_to(src, 0)
target = null
addtimer(CALLBACK(src, PROC_REF(unset_disabled)), 10 SECONDS)
return TRUE
if(istype(Proj ,/obj/item/projectile/beam)||istype(Proj,/obj/item/projectile/bullet))
if((Proj.damage_type == BURN) || (Proj.damage_type == BRUTE))
if(!Proj.nodamage && Proj.damage < src.health)
@@ -498,32 +516,6 @@
target = toarrest
mode = BOT_HUNT
/mob/living/simple_animal/bot/ed209/bullet_act(obj/item/projectile/Proj)
if(!disabled)
var/lasertag_check = 0
if(lasercolor == "b")
if(istype(Proj, /obj/item/projectile/beam/lasertag/redtag))
lasertag_check++
else if(lasercolor == "r")
if(istype(Proj, /obj/item/projectile/beam/lasertag/bluetag))
lasertag_check++
if(lasertag_check)
icon_state = "[lasercolor]ed2090"
disabled = TRUE
walk_to(src, 0)
target = null
addtimer(CALLBACK(src, PROC_REF(unset_disabled)), 10 SECONDS)
return TRUE
else
..(Proj)
else
..(Proj)
/mob/living/simple_animal/bot/ed209/proc/unset_disabled()
disabled = FALSE
icon_state = "[lasercolor]ed2091"
code/modules/mob/living/simple_animal/bot/griefsky.dm
+1 -12
View File
@@ -207,18 +207,7 @@
//this section is blocking attack
/mob/living/simple_animal/bot/secbot/griefsky/bullet_act(obj/item/projectile/P) //so uncivilized
retaliate(P.firer)
if((icon_state == spin_icon) && (prob(block_chance_ranged))) //only when the eswords are on
visible_message("[src] deflects [P] with its energy swords!")
playsound(loc, 'sound/weapons/blade1.ogg', 50, TRUE, 0)
else
..()
/mob/living/simple_animal/bot/secbot/griefsky/proc/special_retaliate_after_attack(mob/user) //allows special actions to take place after being attacked.
return
/mob/living/simple_animal/bot/secbot/griefsky/special_retaliate_after_attack(mob/user)
/mob/living/simple_animal/bot/secbot/griefsky/proc/special_retaliate_after_attack(mob/user)
if(icon_state != spin_icon)
return
if(prob(block_chance_melee))
code/modules/mob/living/simple_animal/corpse.dm
+1 -1
View File
@@ -120,7 +120,7 @@
name = "Corpse of a Space Wizard"
outfit = /datum/outfit/wizardcorpse
/obj/effect/mob_spawn/human/corpse/clown/officer/Initialize(mapload)
/obj/effect/mob_spawn/human/corpse/wizard/officer/Initialize(mapload)
mob_name = "[pick(GLOB.wizard_first)], [pick(GLOB.wizard_second)]"
. = ..()
code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
-18
View File
@@ -1,21 +1,3 @@
// This is important
/mob/living/attack_ghost(mob/dead/observer/user)
if(prob(80)) return ..()
var/found = 0
for(var/mob/living/simple_animal/hostile/retaliate/R in range(4,src))
if(R.faction != "undead" || R == src || prob(50)) continue
found = 1
R.enemies ^= src
if(src in R.enemies)
R.visible_message("[R]'s head swivels eerily towards [src].")
else
R.visible_message("[R] stares at [src] for a minute before turning away.")
if(R.target == src)
R.target = null
if(!found)
return ..()
/mob/living/simple_animal/hostile/retaliate/ghost
icon = 'icons/mob/mob.dmi'
name = "ghost"
code/modules/mob/living/simple_animal/hostile/terror_spiders/reproduction.dm
+2 -6
View File
@@ -30,6 +30,8 @@
/obj/structure/spider/spiderling/terror_spiderling/Destroy()
GLOB.ts_spiderling_list -= src
for(var/obj/structure/spider/spiderling/terror_spiderling/S in view(7, src))
S.immediate_ventcrawl = TRUE
return ..()
/obj/structure/spider/spiderling/terror_spiderling/Bump(obj/O)
@@ -37,12 +39,6 @@
forceMove(O.loc)
. = ..()
/obj/structure/spider/spiderling/terror_spiderling/Destroy()
for(var/obj/structure/spider/spiderling/terror_spiderling/S in view(7, src))
S.immediate_ventcrawl = TRUE
return ..()
/obj/structure/spider/spiderling/terror_spiderling/proc/score_surroundings(atom/A = src)
var/safety_score = 0
var/turf/T = get_turf(A)
code/modules/mob/living/simple_animal/simple_animal.dm
+8 -17
View File
@@ -386,6 +386,14 @@
/mob/living/simple_animal/revive()
..()
density = initial(density)
health = maxHealth
icon = initial(icon)
icon_state = icon_living
density = initial(density)
flying = initial(flying)
if(collar_type)
collar_type = "[initial(collar_type)]"
regenerate_icons()
/mob/living/simple_animal/death(gibbed)
// Only execute the below if we successfully died
@@ -465,17 +473,6 @@
if(on_fire)
overlays += image("icon"='icons/mob/OnFire.dmi', "icon_state"="Generic_mob_burning")
/mob/living/simple_animal/revive()
..()
health = maxHealth
icon = initial(icon)
icon_state = icon_living
density = initial(density)
flying = initial(flying)
if(collar_type)
collar_type = "[initial(collar_type)]"
regenerate_icons()
/mob/living/simple_animal/proc/make_babies() // <3 <3 <3
if(current_offspring >= max_offspring)
return FALSE
@@ -620,12 +617,6 @@
if(pulledby || shouldwakeup)
toggle_ai(AI_ON)
/mob/living/simple_animal/adjustHealth(amount, updating_health = TRUE)
. = ..()
if(!ckey && stat == CONSCIOUS)//Not unconscious
if(AIStatus == AI_IDLE)
toggle_ai(AI_ON)
/mob/living/simple_animal/onTransitZ(old_z, new_z)
..()
if(AIStatus == AI_Z_OFF)
code/modules/mob/living/simple_animal/simple_animal_damage.dm
+3
View File
@@ -11,6 +11,9 @@
. = STATUS_UPDATE_HEALTH
if(updating_health)
updatehealth()
if(!ckey && stat == CONSCIOUS)//Not unconscious
if(AIStatus == AI_IDLE)
toggle_ai(AI_ON)
/mob/living/simple_animal/adjustBruteLoss(amount, updating_health = TRUE)
if(damage_coeff[BRUTE])
code/modules/mob/mob.dm
-4
View File
@@ -1031,10 +1031,6 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
qdel(S)
mob_spell_list -= S
//override to avoid rotating pixel_xy on mobs
/mob/shuttleRotate(rotation)
dir = angle2dir(rotation+dir2angle(dir))
/mob/proc/handle_ventcrawl()
return // Only living mobs can ventcrawl