also fix those

This commit is contained in:
Kashargul
2024-10-04 23:03:01 +02:00
parent 4076d302a9
commit d40bfe9d08
9 changed files with 17 additions and 16 deletions
+1
View File
@@ -58,6 +58,7 @@
#define span_danger(str) ("<span class='danger'>" + str + "</span>")
#define span_userdanger(str) ("<span class='userdanger'>" + str + "</span>")
#define span_warning(str) ("<span class='warning'>" + str + "</span>")
#define span_warningplain(str) ("<span class='warningplain italics'>" + str + "</span>")
#define span_boldwarning(str) ("<span class='boldwarning'>" + str + "</span>")
#define span_filter_warning(str) ("<span class='filter_warning'>" + str + "</span>")
#define span_filter_combat(str) ("<span class='filter_combat'>" + str + "</span>")
@@ -18,7 +18,7 @@
if(istype(M.wear_suit, armor_type) || istype(M.head, helmet_type) || istype(M.shoes, boot_type))
M.visible_message(span_warning("[M] casts off their [M.wear_suit.name]!"),
span_warning("We cast off our [M.wear_suit.name]"),
span_italics("You hear the organic matter ripping and tearing!"))
span_warningplain("You hear the organic matter ripping and tearing!"))
if(istype(M.wear_suit, armor_type))
qdel(M.wear_suit)
if(istype(M.head, helmet_type))
@@ -71,13 +71,13 @@
if(ismob(loc))
visible_message(span_warning("A grotesque weapon forms around [loc.name]\'s arm!"),
span_warning("Our arm twists and mutates, transforming it into a deadly weapon."),
span_italics("You hear organic matter ripping and tearing!"))
span_warningplain("You hear organic matter ripping and tearing!"))
src.creator = loc
/obj/item/melee/changeling/dropped(mob/user)
visible_message(span_warning("With a sickening crunch, [creator] reforms their arm!"),
span_notice("We assimilate the weapon back into our body."),
span_italics("You hear organic matter ripping and tearing!"))
span_warningplain("You hear organic matter ripping and tearing!"))
playsound(src, 'sound/effects/blobattack.ogg', 30, 1)
spawn(1)
if(src)
@@ -46,7 +46,7 @@
if(ismob(loc))
loc.visible_message(span_warning("[loc.name]\'s flesh rapidly inflates, forming a bloated mass around their body!"),
span_warning("We inflate our flesh, creating a spaceproof suit!"),
span_italics("You hear organic matter ripping and tearing!"))
span_warningplain("You hear organic matter ripping and tearing!"))
/obj/item/clothing/suit/space/changeling/dropped()
qdel(src)
@@ -110,7 +110,7 @@
if(ismob(loc))
loc.visible_message(span_warning("[loc.name]\'s flesh turns black, quickly transforming into a hard, chitinous mass!"),
span_warning("We harden our flesh, creating a suit of armor!"),
span_italics("You hear organic matter ripping and tearing!"))
span_warningplain("You hear organic matter ripping and tearing!"))
/obj/item/clothing/head/helmet/space/changeling/armored
name = "chitinous mass"
@@ -52,7 +52,7 @@
if(siemens)
visible_message(span_warning("Arcs of electricity strike [G.affecting]!"),
span_warning("Our hand channels raw electricity into [G.affecting]."),
span_italics("You hear sparks!"))
span_warningplain("You hear sparks!"))
else
to_chat(src, span_warning("Our gloves block us from shocking \the [G.affecting]."))
src.mind.changeling.chem_charges -= 10
@@ -76,7 +76,7 @@
for(var/obj/item/cell/cell in L)
visible_message(span_warning("Some sparks fall out from \the [src.name]\'s [held_item]!"),
span_warning("Our hand channels raw electricity into \the [held_item]."),
span_italics("You hear sparks!"))
span_warningplain("You hear sparks!"))
var/i = 10
if(siemens)
while(i)
@@ -117,7 +117,7 @@
if(ismob(loc))
visible_message(span_warning("Electrical arcs form around [loc.name]\'s hand!"),
span_warning("We store a charge of electricity in our hand."),
span_italics("You hear crackling electricity!"))
span_warningplain("You hear crackling electricity!"))
var/T = get_turf(src)
new /obj/effect/effect/sparks(T)
@@ -154,7 +154,7 @@
if(siemens)
visible_message(span_warning("Arcs of electricity strike [C]!"),
span_warning("Our hand channels raw electricity into [C]"),
span_italics("You hear sparks!"))
span_warningplain("You hear sparks!"))
else
to_chat(src, span_warning("Our gloves block us from shocking \the [C]."))
//qdel(src) //Since we're no longer a one hit stun, we need to stick around.
@@ -172,7 +172,7 @@
if(siemens)
visible_message(span_warning("Arcs of electricity strike [S]!"),
span_warning("Our hand channels raw electricity into [S]"),
span_italics("You hear sparks!"))
span_warningplain("You hear sparks!"))
to_chat(S, span_danger("Warning: Electrical surge detected!"))
//qdel(src)
user.mind.changeling.chem_charges -= 10
@@ -186,7 +186,7 @@
for(var/obj/item/cell/cell in T.contents)
visible_message(span_warning("Some sparks fall out from \the [target]!"),
span_warning("Our hand channels raw electricity into \the [target]."),
span_italics("You hear sparks!"))
span_warningplain("You hear sparks!"))
var/i = 10
if(siemens)
while(i)
@@ -49,7 +49,7 @@
new /obj/effect/gibspawner/human(T)
visible_message(span_warning("With a sickening squish, [src] reforms their whole body, casting their old parts on the floor!"),
span_notice("We reform our body. We are whole once more."),
span_italics("You hear organic matter ripping and tearing!"))
span_warningplain("You hear organic matter ripping and tearing!"))
feedback_add_details("changeling_powers","RR")
return 1
+1 -1
View File
@@ -216,7 +216,7 @@ Buildable meters
user.visible_message( \
"[user] fastens \the [src].", \
span_notice("You fasten \the [src]."), \
span_italics("You hear ratcheting."))
span_warningplain("You hear ratcheting."))
qdel(src)
@@ -214,7 +214,7 @@
playsound(src, 'sound/machines/click.ogg', 75, 1)
user.visible_message("\The [user] attaches \the [src] to the wall.",
span_notice("You attach \the [src] to the wall."),
span_italics("You hear clicking."))
span_warningplain("You hear clicking."))
if(istype(user, /mob/living/silicon/robot)) //Robots cannot unequip/drop items, for Safety Reasons.
forceMove(T)
user.drop_item(T)
+2 -2
View File
@@ -180,7 +180,7 @@
return
going_kaboom = TRUE
visible_message(span_danger("\The [src] lets out an shower of sparks as it starts to lose stability!"),\
span_italics("You hear a loud electrical crack!"))
span_warningplain("You hear a loud electrical crack!"))
playsound(src, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5)
tesla_zap(src, 5, power_gen * 0.05)
addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(explosion), get_turf(src), 2, 3, 4, 8), 100) // Not a normal explosion.
@@ -286,7 +286,7 @@
/obj/machinery/power/rtg/kugelblitz/proc/asplod()
visible_message(span_danger("\The [src] lets out an shower of sparks as it starts to lose stability!"),\
span_italics("You hear a loud electrical crack!"))
span_warningplain("You hear a loud electrical crack!"))
playsound(src, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5)
var/turf/T = get_turf(src)
qdel(src)