cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Removes more sleeps from init (#10445)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-03-16 11:24:07 -07:00
committed by GitHub
parent 8c225f2526
commit 8732f6f928
34 changed files with 174 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
modular_chomp/code/modules/organs/internal/malignant/malignant.dm
View File

@@ -157,11 +157,11 @@
owner.AdjustConfused(4 * base_mult)
var/obj/item/organ/O = owner.organs_by_name[parent_organ]
if(damage >= min_broken_damage)
owner.custom_pain("<span class='warning'>You feel a painful sensation in your [O.name].</span>",damage,TRUE)
owner.custom_pain(span_warning("You feel a painful sensation in your [O.name]."),damage,TRUE)
owner.AdjustBlinded(6 * base_mult)
owner.adjustToxLoss(4 * base_mult)
else
owner.custom_pain("<span class='warning'>You feel a strange sensation in your [O.name].</span>",damage / 10,TRUE)
owner.custom_pain(span_warning("You feel a strange sensation in your [O.name]."),damage / 10,TRUE)
/****************************************************
Tumor varients
@@ -250,14 +250,14 @@
/obj/item/organ/internal/malignant/tumor/potato/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W,/obj/item/material/knife))
new /obj/item/reagent_containers/food/snacks/rawsticks(get_turf(src))
to_chat(user, "<span class='notice'>You cut the mimetic potato.</span>")
to_chat(user, span_notice("You cut the mimetic potato."))
qdel(src)
return
if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = W
if(C.use(5))
//TODO: generalize this.
to_chat(user, "<span class='notice'>You add some cable to the [src.name] and slide it inside the battery casing.</span>")
to_chat(user, span_notice("You add some cable to the [src.name] and slide it inside the battery casing."))
var/obj/item/cell/potato/pocell = new /obj/item/cell/potato(get_turf(user))
if(src.loc == user && ishuman(user))
user.put_in_hands(pocell)
@@ -305,14 +305,14 @@
if(prob(2))
var/obj/item/organ/O = owner.organs_by_name[parent_organ]
if(stage_progress > 200)
owner.custom_pain("<span class='warning'>You feel bloated. The pain in your [O.name] is agonizing.</span>",20,TRUE)
owner.custom_emote(VISIBLE_MESSAGE, "winces slightly.")
owner.custom_pain(span_warning("You feel bloated. The pain in your [O.name] is agonizing."),20,TRUE)
owner.automatic_custom_emote(VISIBLE_MESSAGE, "winces slightly.", check_stat = TRUE)
else if(stage_progress > 100)
owner.custom_pain("<span class='warning'>You feel a pressure inside your [O.name].</span>",5,TRUE)
owner.custom_emote(VISIBLE_MESSAGE, "winces painfully.")
owner.custom_pain(span_warning("You feel a pressure inside your [O.name]."),5,TRUE)
owner.automatic_custom_emote(VISIBLE_MESSAGE, "winces painfully.", check_stat = TRUE)
else
owner.custom_pain("<span class='danger'>The pressure inside your [O.name] hurts.</span>",1,TRUE)
owner.custom_emote(VISIBLE_MESSAGE, "winces painfully.")
owner.custom_pain(span_danger("The pressure inside your [O.name] hurts."),1,TRUE)
owner.automatic_custom_emote(VISIBLE_MESSAGE, "winces painfully.", check_stat = TRUE)
/obj/item/organ/internal/malignant/tumor/pinata/attackby(obj/item/W as obj, mob/user as mob)
if(can_puncture(W))
@@ -459,11 +459,11 @@
if(thalers < 100)
pass()
else if(thalers < 500)
owner.custom_pain("<span class='warning'>You feel bloated.</span>",1,TRUE)
owner.custom_emote(VISIBLE_MESSAGE, "winces slightly.")
owner.custom_pain(span_warning("You feel bloated."),1,TRUE)
owner.automatic_custom_emote(VISIBLE_MESSAGE, "winces slightly.", check_stat = TRUE)
else if(thalers < 1000)
owner.custom_pain("<span class='warning'>You feel a pressure inside your [O.name].</span>",6,TRUE)
owner.custom_emote(VISIBLE_MESSAGE, "winces painfully.")
owner.custom_pain(span_warning("You feel a pressure inside your [O.name]."),6,TRUE)
owner.automatic_custom_emote(VISIBLE_MESSAGE, "winces painfully.", check_stat = TRUE)
if(prob(30))
owner.vomit()
else if(prob(30))
@@ -471,8 +471,8 @@
else
owner.Confuse(15)
else if(thalers < 5000)
owner.custom_pain("<span class='danger'>The pressure inside your [O.name] hurts.</span>",15,TRUE)
owner.custom_emote(VISIBLE_MESSAGE, "winces painfully.")
owner.custom_pain(span_danger("The pressure inside your [O.name] hurts."),15,TRUE)
owner.automatic_custom_emote(VISIBLE_MESSAGE, "winces painfully.", check_stat = TRUE)
owner.Weaken(3)
if(prob(30))
owner.Stun(10)