cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-17 11:14:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

converts our spans (#9185)

Browse Source
This commit is contained in:
Kashargul
2024-10-07 20:47:23 +02:00
committed by GitHub
parent f4155aa973
commit a92a42b85b
162 changed files with 1360 additions and 1269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_chomp/code/game/objects/structures/gargoyle.dm
+8 -8
View File
@@ -123,7 +123,7 @@
flapping = H.flapping
H.toggle_tail(FALSE, FALSE)
H.toggle_wing(FALSE, FALSE)
H.visible_message("<span class='warning'>[H]'s skin rapidly [adjective] as they turn to [material]!</span>", "<span class='warning'>Your skin abruptly [adjective] as you turn to [material]!</span>")
H.visible_message(span_warning("[H]'s skin rapidly [adjective] as they turn to [material]!"), span_warning("Your skin abruptly [adjective] as you turn to [material]!"))
H.forceMove(src)
H.SetBlinded(0)
H.SetSleeping(0)
@@ -142,7 +142,7 @@
if (can_revert)
unpetrify(deleting = FALSE) //don't delete if we're already deleting!
else
visible_message("<span class='warning'>The [identifier] loses shape and crumbles into a pile of [material]!</span>")
visible_message(span_warning("The [identifier] loses shape and crumbles into a pile of [material]!"))
. = ..()
/obj/structure/gargoyle/process()
@@ -205,10 +205,10 @@
var/f = (original_int - obj_integrity) / 10
for (var/x in 1 to 10)
gargoyle.adjustBruteLoss(f)
hurtmessage = " <b>You feel your body take the damage that was dealt while being [material]!</b>"
hurtmessage = " " + span_bold("You feel your body take the damage that was dealt while being [material]!")
gargoyle.updatehealth()
alpha = 0
gargoyle.visible_message("<span class='warning'>[gargoyle]'s skin rapidly reverts, returning them to normal!</span>", "<span class='warning'>Your skin reverts, freeing your movement once more![hurtmessage]</span>")
gargoyle.visible_message(span_warning("[gargoyle]'s skin rapidly reverts, returning them to normal!"), span_warning("Your skin reverts, freeing your movement once more![hurtmessage]"))
gargoyle = null
if (deleting)
qdel(src)
@@ -235,25 +235,25 @@
/obj/structure/gargoyle/attack_generic(var/mob/user, var/damage, var/attack_message = "hits")
user.do_attack_animation(src)
visible_message("<span class='danger'>[user] [attack_message] the [src]!</span>")
visible_message(span_danger("[user] [attack_message] the [src]!"))
damage(damage)
/obj/structure/gargoyle/attackby(var/obj/item/W as obj, var/mob/living/user as mob)
if(W.is_wrench())
if (isspace(loc) || isopenspace(loc))
to_chat(user, "<span class='warning'>You can't anchor that here!</span>")
to_chat(user, span_warning("You can't anchor that here!"))
anchored = FALSE
return ..()
playsound(src, W.usesound, 50, 1)
if (do_after(user, (2 SECONDS) * W.toolspeed, target = src))
to_chat(user, "<span class='notice'>You [anchored ? "un" : ""]anchor the [src].</span>")
to_chat(user, span_notice("You [anchored ? "un" : ""]anchor the [src]."))
anchored = !anchored
else if(!isrobot(user) && gargoyle && gargoyle.vore_selected && gargoyle.trash_catching)
if(istype(W,/obj/item/grab || /obj/item/holder))
gargoyle.vore_attackby(W, user)
return
if(gargoyle.adminbus_trash || is_type_in_list(W,edible_trash) && W.trash_eatable && !is_type_in_list(W,item_vore_blacklist))
to_chat(user, "<span class='warning'>You slip [W] into [gargoyle]'s [lowertext(gargoyle.vore_selected.name)] .</span>")
to_chat(user, span_warning("You slip [W] into [gargoyle]'s [lowertext(gargoyle.vore_selected.name)] ."))
user.drop_item()
W.forceMove(gargoyle.vore_selected)
return
modular_chomp/code/game/objects/structures/watercloset_ch.dm
+3 -3
View File
@@ -37,7 +37,7 @@
if((L.resting || L.lying) && !L.buckled)
bowl_contents += L
if(bowl_contents.len)
user.visible_message("<span class='notice'>[user] flushes the [lowertext(name)].</span>", "<span class='notice'>You flush the [lowertext(name)].</span>")
user.visible_message(span_notice("[user] flushes the [lowertext(name)]."), span_notice("You flush the [lowertext(name)]."))
playsound(src, 'sound/vore/death7.ogg', 50, 1) //Got lazy about getting new sound files. Have a sick remix lmao.
playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
playsound(src, 'sound/mecha/powerup.ogg', 30, 1)
@@ -78,7 +78,7 @@
panic_mult = 1
if(refilling)
playsound(src, 'sound/machines/door_locked.ogg', 30, 1)
to_chat(user, "<span class='notice'>The [lowertext(name)] is still refilling its tank.</span>")
to_chat(user, span_notice("The [lowertext(name)] is still refilling its tank."))
return ..()
/obj/structure/toilet/attackby(obj/item/I as obj, mob/living/user as mob)
@@ -226,4 +226,4 @@
var/obj/item/I
for(I in loc)
if(I.density || I.anchored || I == src) continue
I.forceMove(src)
I.forceMove(src)
modular_chomp/code/game/objects/structures/weathersignal.dm
+5 -5
View File
@@ -29,21 +29,21 @@
to_chat(user, "The machine is destroyed.")
if(P.weather_holder == /datum/weather/sif/sandstorm)
visible_message(span_orange("<B>The [src] begins to tremble before something emerges!.</B>"))
visible_message(span_bolddanger(span_orange("The [src] begins to tremble before something emerges!.")))
uses = 0
new /mob/living/simple_mob/vore/weatherbeast/sandstorm (src.loc)
if(P.weather_holder == /datum/weather/sif/toxinrain)
visible_message(span_orange("<B>The [src] begins to tremble before something emerges!.</B>"))
visible_message(span_bolddanger(span_orange("The [src] begins to tremble before something emerges!.")))
uses = 0
new /mob/living/simple_mob/vore/weatherbeast/acidrain (src.loc)
if(P.weather_holder == /datum/weather/sif/midnightfog)
visible_message(span_orange("<B>The [src] begins to tremble before something emerges!.</B>"))
visible_message(span_bolddanger(span_orange("The [src] begins to tremble before something emerges!.")))
uses = 0
new /mob/living/simple_mob/vore/weatherbeast/darkmist (src.loc)
if(P.weather_holder == /datum/weather/sif/starryrift)
visible_message(span_orange("<B>The [src] begins to tremble before something emerges!.</B>"))
visible_message(span_bolddanger(span_orange("The [src] begins to tremble before something emerges!.")))
uses = 0
new /mob/living/simple_mob/vore/weatherbeast/starsky (src.loc)
new /mob/living/simple_mob/vore/weatherbeast/starsky (src.loc)