mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-28 22:47:59 +01:00
Fixes a few runtimes (#23264)
* The fixes * This probably has a worse underlying cause * Update code/modules/paperwork/paper.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * Cotnra review * Contra review * Removes nullcheck --------- Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
@@ -267,7 +267,7 @@
|
||||
data["chemicals"] = chemicals
|
||||
return data
|
||||
|
||||
/obj/machinery/sleeper/ui_act(action, params)
|
||||
/obj/machinery/sleeper/ui_act(action, params, datum/tgui/ui)
|
||||
if(..())
|
||||
return
|
||||
if(!controls_inside && usr == occupant)
|
||||
@@ -295,7 +295,7 @@
|
||||
else
|
||||
to_chat(usr, "<span class='danger'>This person is not in good enough condition for sleepers to be effective! Use another means of treatment, such as cryogenics!</span>")
|
||||
if("removebeaker")
|
||||
remove_beaker()
|
||||
remove_beaker(ui.user)
|
||||
if("togglefilter")
|
||||
toggle_filter()
|
||||
if("ejectify")
|
||||
|
||||
@@ -231,7 +231,7 @@
|
||||
if(Adjacent(user) && !opened)
|
||||
if(HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || user.stat) // Don't use it if you're not able to! Checks for stuns, ghost and restrain
|
||||
return
|
||||
togglelock()
|
||||
togglelock(user)
|
||||
return
|
||||
|
||||
. = ..()
|
||||
|
||||
@@ -102,7 +102,6 @@
|
||||
return ..()
|
||||
|
||||
/obj/item/paper/proc/rename(mob/user)
|
||||
|
||||
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
|
||||
to_chat(user, "<span class='warning'>You cut yourself on the paper.</span>")
|
||||
return
|
||||
|
||||
@@ -820,8 +820,7 @@
|
||||
"[user] is beginning to cauterize the incision on [target]'s [zone] with \the [tool].",
|
||||
"You are beginning to cauterize the incision on [target]'s [zone] with \the [tool]."
|
||||
)
|
||||
var/obj/item/organ/affected = target.get_organ(target_zone)
|
||||
affected.custom_pain("Your [zone] is being burned!")
|
||||
to_chat(user, "<span class='userdanger'>Your [zone] is being burned!</span>") // No custom pain because xenos are special
|
||||
return ..()
|
||||
|
||||
/datum/surgery_step/generic/seal_carapace/end_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
|
||||
|
||||
Reference in New Issue
Block a user