cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 03:26:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactors most spans

Browse Source
This commit is contained in:
Kashargul
2024-10-02 21:10:31 +02:00
parent 5417c7772c
commit a2c673ab7a
1517 changed files with 12436 additions and 12347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_external.dm
+39 -39
View File
@@ -157,7 +157,7 @@
I.loc = get_turf(user) //just in case something was embedded that is not an item
if(istype(I))
user.put_in_hands(I)
user.visible_message("<span class='danger'>\The [user] rips \the [I] out of \the [src]!</span>")
user.visible_message(span_danger("\The [user] rips \the [I] out of \the [src]!"))
return //no eating the limb until everything's been removed
return ..()
@@ -167,18 +167,18 @@
for(var/obj/item/I in contents)
if(istype(I, /obj/item/organ))
continue
. += "<span class='danger'>There is \a [I] sticking out of it.</span>"
. += span_danger("There is \a [I] sticking out of it.")
/obj/item/organ/external/attackby(obj/item/W as obj, mob/living/user as mob)
switch(stage)
if(0)
if(istype(W,/obj/item/surgical/scalpel))
user.visible_message("<span class='danger'><b>[user]</b> cuts [src] open with [W]!</span>")
user.visible_message(span_danger("<b>[user]</b> cuts [src] open with [W]!"))
stage++
return
if(1)
if(istype(W,/obj/item/surgical/retractor))
user.visible_message("<span class='danger'><b>[user]</b> cracks [src] open like an egg with [W]!</span>")
user.visible_message(span_danger("<b>[user]</b> cracks [src] open like an egg with [W]!"))
stage++
return
if(2)
@@ -187,9 +187,9 @@
var/obj/item/removing = pick(contents)
removing.loc = get_turf(user.loc)
user.put_in_hands(removing)
user.visible_message("<span class='danger'><b>[user]</b> extracts [removing] from [src] with [W]!</span>")
user.visible_message(span_danger("<b>[user]</b> extracts [removing] from [src] with [W]!"))
else
user.visible_message("<span class='danger'><b>[user]</b> fishes around fruitlessly in [src] with [W].</span>")
user.visible_message(span_danger("<b>[user]</b> fishes around fruitlessly in [src] with [W]."))
return
..()
@@ -445,11 +445,11 @@
else return 0
if(!damage_amount)
to_chat(user, "<span class='notice'>Nothing to fix!</span>")
to_chat(user, span_notice("Nothing to fix!"))
return 0
if(brute_dam + burn_dam >= min_broken_damage) //VOREStation Edit - Makes robotic limb damage scalable
to_chat(user, "<span class='danger'>The damage is far too severe to patch over externally.</span>")
to_chat(user, span_danger("The damage is far too severe to patch over externally."))
return 0
if(user == src.owner)
@@ -460,12 +460,12 @@
grasp = "r_hand"
if(grasp)
to_chat(user, "<span class='warning'>You can't reach your [src.name] while holding [tool] in your [owner.get_bodypart_name(grasp)].</span>")
to_chat(user, span_warning("You can't reach your [src.name] while holding [tool] in your [owner.get_bodypart_name(grasp)]."))
return 0
user.setClickCooldown(user.get_attack_speed(tool))
if(!do_mob(user, owner, 10))
to_chat(user, "<span class='warning'>You must stand still to do that.</span>")
to_chat(user, span_warning("You must stand still to do that."))
return 0
switch(damage_type)
@@ -567,13 +567,13 @@ This function completely restores a damaged organ to perfect condition.
W.open_wound(damage)
if(prob(25))
if(robotic >= ORGAN_ROBOT)
owner.visible_message("<span class='danger'>The damage to [owner.name]'s [name] worsens.</span>",\
"<span class='danger'>The damage to your [name] worsens.</span>",\
"<span class='danger'>You hear the screech of abused metal.</span>")
owner.visible_message(span_danger("The damage to [owner.name]'s [name] worsens."),\
span_danger("The damage to your [name] worsens."),\
span_danger("You hear the screech of abused metal."))
else
owner.visible_message("<span class='danger'>The wound on [owner.name]'s [name] widens with a nasty ripping noise.</span>",\
"<span class='danger'>The wound on your [name] widens with a nasty ripping noise.</span>",\
"<span class='danger'>You hear a nasty ripping noise, as if flesh is being torn apart.</span>")
owner.visible_message(span_danger("The wound on [owner.name]'s [name] widens with a nasty ripping noise."),\
span_danger("The wound on your [name] widens with a nasty ripping noise."),\
span_danger("You hear a nasty ripping noise, as if flesh is being torn apart."))
return
//Creating wound
@@ -731,7 +731,7 @@ Note that amputating the affected organ does in fact remove the infection from t
if(. >= 3 && antibiotics < ANTIBIO_OD) //INFECTION_LEVEL_THREE
if (!(status & ORGAN_DEAD))
status |= ORGAN_DEAD
to_chat(owner, "<span class='notice'>You can't feel your [name] anymore...</span>")
to_chat(owner, span_notice("You can't feel your [name] anymore..."))
owner.update_icons_body()
for (var/obj/item/organ/external/child in children)
child.germ_level += 110 //Burst of infection from a parent organ becoming necrotic
@@ -889,26 +889,26 @@ Note that amputating the affected organ does in fact remove the infection from t
if(!clean)
var/gore_sound = "[(robotic >= ORGAN_ROBOT) ? "tortured metal" : "ripping tendons and flesh"]"
owner.visible_message(
"<span class='danger'>\The [owner]'s [src.name] flies off in an arc!</span>",\
"<span class='moderate'><b>Your [src.name] goes flying off!</b></span>",\
"<span class='danger'>You hear a terrible sound of [gore_sound].</span>")
span_danger("\The [owner]'s [src.name] flies off in an arc!"),\
span_moderate("<b>Your [src.name] goes flying off!</b>"),\
span_danger("You hear a terrible sound of [gore_sound]."))
if(DROPLIMB_BURN)
if(cannot_gib)
return
var/gore = "[(robotic >= ORGAN_ROBOT) ? "": " of burning flesh"]"
owner.visible_message(
"<span class='danger'>\The [owner]'s [src.name] flashes away into ashes!</span>",\
"<span class='moderate'><b>Your [src.name] flashes away into ashes!</b></span>",\
"<span class='danger'>You hear a crackling sound[gore].</span>")
span_danger("\The [owner]'s [src.name] flashes away into ashes!"),\
span_moderate("<b>Your [src.name] flashes away into ashes!</b>"),\
span_danger("You hear a crackling sound[gore]."))
if(DROPLIMB_BLUNT)
if(cannot_gib)
return
var/gore = "[(robotic >= ORGAN_ROBOT) ? "": " in shower of gore"]"
var/gore_sound = "[(status >= ORGAN_ROBOT) ? "rending sound of tortured metal" : "sickening splatter of gore"]"
owner.visible_message(
"<span class='danger'>\The [owner]'s [src.name] explodes[gore]!</span>",\
"<span class='moderate'><b>Your [src.name] explodes[gore]!</b></span>",\
"<span class='danger'>You hear the [gore_sound].</span>")
span_danger("\The [owner]'s [src.name] explodes[gore]!"),\
span_moderate("<b>Your [src.name] explodes[gore]!</b>"),\
span_danger("You hear the [gore_sound]."))
var/mob/living/carbon/human/victim = owner //Keep a reference for post-removed().
var/obj/item/organ/external/parent_organ = parent
@@ -1085,9 +1085,9 @@ Note that amputating the affected organ does in fact remove the infection from t
if(owner) //VOREStation Edit Start
if(organ_can_feel_pain() && !isbelly(owner.loc) && !isliving(owner.loc))
owner.visible_message(\
"<span class='danger'>You hear a loud cracking sound coming from \the [owner].</span>",\
"<span class='danger'>Something feels like it shattered in your [name]!</span>",\
"<span class='danger'>You hear a sickening crack.</span>")
span_danger("You hear a loud cracking sound coming from \the [owner]."),\
span_danger("Something feels like it shattered in your [name]!"),\
span_danger("You hear a sickening crack."))
owner.emote("scream")
jostle_bone() //VOREStation Edit End
@@ -1220,7 +1220,7 @@ Note that amputating the affected organ does in fact remove the infection from t
if(!owner || loc != owner)
return
if(!silent)
owner.visible_message("<span class='danger'>\The [W] sticks in the wound!</span>")
owner.visible_message(span_danger("\The [W] sticks in the wound!"))
implants += W
owner.embedded_flag = 1
owner.verbs += /mob/proc/yank_out_object
@@ -1277,9 +1277,9 @@ Note that amputating the affected organ does in fact remove the infection from t
//Robotic limbs explode if sabotaged.
if(is_robotic && sabotaged)
victim.visible_message(
"<span class='danger'>\The [victim]'s [src.name] explodes violently!</span>",\
"<span class='danger'>Your [src.name] explodes!</span>",\
"<span class='danger'>You hear an explosion!</span>")
span_danger("\The [victim]'s [src.name] explodes violently!"),\
span_danger("Your [src.name] explodes!"),\
span_danger("You hear an explosion!"))
explosion(get_turf(owner),-1,-1,2,3)
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, victim)
@@ -1297,13 +1297,13 @@ Note that amputating the affected organ does in fact remove the infection from t
return
if(owner)
if(type == "brute")
owner.visible_message("<span class='danger'>You hear a sickening cracking sound coming from \the [owner]'s [name].</span>", \
"<span class='danger'>Your [name] becomes a mangled mess!</span>", \
"<span class='danger'>You hear a sickening crack.</span>")
owner.visible_message(span_danger("You hear a sickening cracking sound coming from \the [owner]'s [name]."), \
span_danger("Your [name] becomes a mangled mess!"), \
span_danger("You hear a sickening crack."))
else
owner.visible_message("<span class='danger'>\The [owner]'s [name] melts away, turning into mangled mess!</span>", \
"<span class='danger'>Your [name] melts away!</span>", \
"<span class='danger'>You hear a sickening sizzle.</span>")
owner.visible_message(span_danger("\The [owner]'s [name] melts away, turning into mangled mess!"), \
span_danger("Your [name] melts away!"), \
span_danger("You hear a sickening sizzle."))
disfigured = 1
/obj/item/organ/external/proc/jostle_bone(force)