mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 19:44:09 +01:00
Fixes various runtimes (squashed)
- Fixes runtime in pod lock busters - Fixes possessed object examination runtime - Fixes runtime when following a destroyed mob - Fixes to_chat runtimes from involuntary emotes - Fixes runtimes from invalid clothing IDs - Fixes runtime caused by wirecutting non-humans - Fixes runtime when setting up malf AI antaghuds - Fixes runtimes in sensory destruction reagents - Fixes runtime caused by clientless ghosts - Fixes antag hud runtime in autotraitor generation - Fixes welding tool shutoff runtime - Fixes runtime in laptops' welcome program - Fixes to_chat runtime from mech sound effect - Fixes runtimes in camera-using NanoUIs - Fixes to_chat runtimes in resisting held mobs - Fixes headless mob skeletonizing/husking runtimes - Fixes non-mob add_logs runtime
This commit is contained in:
@@ -1219,15 +1219,15 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
|
||||
|
||||
// Don't wear another species' underwear!
|
||||
var/datum/sprite_accessory/S = underwear_list[underwear]
|
||||
if(!(species in S.species_allowed))
|
||||
if(!S || !(species in S.species_allowed))
|
||||
underwear = random_underwear(gender, species)
|
||||
|
||||
S = undershirt_list[undershirt]
|
||||
if(!(species in S.species_allowed))
|
||||
if(!S || !(species in S.species_allowed))
|
||||
undershirt = random_undershirt(gender, species)
|
||||
|
||||
S = socks_list[socks]
|
||||
if(!(species in S.species_allowed))
|
||||
if(!S || !(species in S.species_allowed))
|
||||
socks = random_socks(gender, species)
|
||||
|
||||
//reset hair colour and skin colour
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
|
||||
|
||||
interact()
|
||||
usr.set_machine(src)
|
||||
if(!interactable())
|
||||
return
|
||||
var/dat = ""
|
||||
|
||||
@@ -135,7 +135,7 @@ Works together with spawning an observer, noted above.
|
||||
if(ghost.can_reenter_corpse)
|
||||
respawnable_list += ghost
|
||||
ghost.key = key
|
||||
if(!ghost.client.holder && !config.antag_hud_allowed) // For new ghosts we remove the verb from even showing up if it's not allowed.
|
||||
if(!(ghost.client && ghost.client.holder) && !config.antag_hud_allowed) // For new ghosts we remove the verb from even showing up if it's not allowed.
|
||||
ghost.verbs -= /mob/dead/observer/verb/toggle_antagHUD // Poor guys, don't know what they are missing!
|
||||
return ghost
|
||||
|
||||
@@ -373,6 +373,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
|
||||
if(!target)
|
||||
return
|
||||
|
||||
if(!get_turf(target))
|
||||
return
|
||||
|
||||
if(target != src)
|
||||
if(following && following == target)
|
||||
return
|
||||
|
||||
@@ -17,7 +17,8 @@
|
||||
/mob/proc/custom_emote(var/m_type=1,var/message = null)
|
||||
|
||||
if(stat || !use_me && usr == src)
|
||||
to_chat(usr, "You are unable to emote.")
|
||||
if(usr)
|
||||
to_chat(usr, "You are unable to emote.")
|
||||
return
|
||||
|
||||
var/muzzled = istype(src.wear_mask, /obj/item/clothing/mask/muzzle)
|
||||
|
||||
@@ -48,10 +48,10 @@
|
||||
if(istype(M))
|
||||
M.unEquip(src)
|
||||
to_chat(M, "[src] wriggles out of your grip!")
|
||||
to_chat(src, "You wriggle out of [M]'s grip!")
|
||||
else if(istype(src.loc,/obj/item))
|
||||
to_chat(src, "You struggle free of [src.loc].")
|
||||
src.forceMove(get_turf(src))
|
||||
to_chat(L, "You wriggle out of [M]'s grip!")
|
||||
else if(istype(loc,/obj/item))
|
||||
to_chat(L, "You struggle free of [loc].")
|
||||
forceMove(get_turf(src))
|
||||
|
||||
if(istype(M))
|
||||
for(var/atom/A in M.contents)
|
||||
|
||||
@@ -144,10 +144,11 @@
|
||||
var/obj/item/organ/external/head/H = get_organ("head")
|
||||
if(SKELETON in src.mutations) return
|
||||
|
||||
if(H.f_style)
|
||||
H.f_style = "Shaved"
|
||||
if(H.h_style)
|
||||
H.h_style = "Bald"
|
||||
if(istype(H))
|
||||
if(H.f_style)
|
||||
H.f_style = "Shaved"
|
||||
if(H.h_style)
|
||||
H.h_style = "Bald"
|
||||
update_fhair(0)
|
||||
update_hair(0)
|
||||
|
||||
@@ -162,10 +163,11 @@
|
||||
var/obj/item/organ/external/head/H = organs_by_name["head"]
|
||||
if(HUSK in mutations) return
|
||||
|
||||
if(H.f_style)
|
||||
H.f_style = "Shaved" //we only change the icon_state of the hair datum, so it doesn't mess up their UI/UE
|
||||
if(H.h_style)
|
||||
H.h_style = "Bald"
|
||||
if(istype(H))
|
||||
if(H.f_style)
|
||||
H.f_style = "Shaved" //we only change the icon_state of the hair datum, so it doesn't mess up their UI/UE
|
||||
if(H.h_style)
|
||||
H.h_style = "Bald"
|
||||
update_fhair(0)
|
||||
update_hair(0)
|
||||
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
var/obj/item/possessed_item
|
||||
|
||||
|
||||
/mob/living/simple_animal/possessed_object/examine()
|
||||
possessed_item.examine()
|
||||
/mob/living/simple_animal/possessed_object/examine(mob/user)
|
||||
possessed_item.examine(user)
|
||||
if(health > (maxHealth / 30))
|
||||
to_chat(usr, "<span class='warning'>[src] appears to be floating without any support!</span>")
|
||||
else
|
||||
|
||||
@@ -322,7 +322,7 @@
|
||||
|
||||
if(istype(W, /obj/item/device/lock_buster))
|
||||
var/obj/item/device/lock_buster/L = W
|
||||
if(L.on & equipment_system.lock_system)
|
||||
if(L.on && equipment_system.lock_system)
|
||||
user.visible_message(user, "<span class='warning'>[user] is drilling through the [src]'s lock!</span>",
|
||||
"<span class='notice'>You start drilling through the [src]'s lock!</span>")
|
||||
if(do_after(user, 100, target = src))
|
||||
|
||||
Reference in New Issue
Block a user