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

[MIRROR] refactors most spans (#9139)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
CHOMPStation2
2024-10-04 06:00:17 -07:00
committed by GitHub
parent 43ee646816
commit ab154b48b2
1511 changed files with 12497 additions and 12357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
code/modules/vore/fluffstuff/custom_clothes_vr.dm
View File

@@ -91,10 +91,10 @@
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
if(H.wear_suit != src)
to_chat(H, "<span class='warning'>You must be wearing [src] to put up the hood!</span>")
to_chat(H, span_warning("You must be wearing [src] to put up the hood!"))
return
if(H.head)
to_chat(H, "<span class='warning'>You're already wearing something on your head!</span>")
to_chat(H, span_warning("You're already wearing something on your head!"))
return
else
H.equip_to_slot_if_possible(hood,slot_head,0,0,1)
@@ -612,7 +612,7 @@
/obj/item/clothing/head/helmet/space/void/engineering/hazmat/fluff/screehelm/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(H.ckey != "scree")
to_chat(H, "<span class='warning'>Your face and whoever is meant for this helmet are too different.</span>")
to_chat(H, span_warning("Your face and whoever is meant for this helmet are too different."))
return 0
else
return 1
@@ -635,7 +635,7 @@
/obj/item/clothing/suit/space/void/engineering/hazmat/fluff/screespess/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(H.ckey != "scree")
to_chat(H, "<span class='warning'>The gloves only have three fingers, not to mention the accommodation for extra limbs.</span>")
to_chat(H, span_warning("The gloves only have three fingers, not to mention the accommodation for extra limbs."))
return 0
else
return 1
@@ -689,7 +689,7 @@
/obj/item/clothing/under/fluff/aluranevines/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(H.ckey != "natje")
to_chat(H, "<span class='warning'>Wrapping vines around yourself is a quite an... Odd idea. You decide otherwise.</span>")
to_chat(H, span_warning("Wrapping vines around yourself is a quite an... Odd idea. You decide otherwise."))
return 0
else
return 1
@@ -856,7 +856,7 @@ No. With a teleporter? Just *no*. - Hawk, YW
/obj/item/clothing/head/helmet/space/fluff/joan/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(H.ckey != "joanrisu")
to_chat(H, "<span class='warning'>You try to fit on the helmet, but it doesn't fit.</span>")
to_chat(H, span_warning("You try to fit on the helmet, but it doesn't fit."))
return 0
else
return 1
@@ -883,7 +883,7 @@ No. With a teleporter? Just *no*. - Hawk, YW
/obj/item/clothing/suit/space/fluff/joan/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(H.ckey != "joanrisu")
to_chat(H, "<span class='warning'>You try to fit into the suit, to no avail.</span>")
to_chat(H, span_warning("You try to fit into the suit, to no avail."))
return 0
else
return 1
@@ -1322,7 +1322,7 @@ Departamental Swimsuits, for general use
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
return ..()
else
to_chat(H, "<span class='warning'>You need to have a wolf-taur half to wear this.</span>")
to_chat(H, span_warning("You need to have a wolf-taur half to wear this."))
return 0
//samanthafyre:Kateryna Petrovitch
@@ -1339,7 +1339,7 @@ Departamental Swimsuits, for general use
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
return ..()
else
to_chat(H, "<span class='warning'>You need to have a wolf-taur half to wear this.</span>")
to_chat(H, span_warning("You need to have a wolf-taur half to wear this."))
return 0
//samanthafyre:Kateryna Petrovitch
@@ -1369,7 +1369,7 @@ Departamental Swimsuits, for general use
/obj/item/clothing/head/helmet/space/fluff/kate/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(H.ckey != "samanthafyre")
to_chat(H, "<span class='warning'>You try to fit on the helmet, but it doesn't fit.</span>")
to_chat(H, span_warning("You try to fit on the helmet, but it doesn't fit."))
return 0
else
return 1
@@ -1566,10 +1566,10 @@ Departamental Swimsuits, for general use
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
if(H.wear_suit != src)
to_chat(H, "<span class='warning'>You must be wearing [src] to put up the hood!</span>")
to_chat(H, span_warning("You must be wearing [src] to put up the hood!"))
return
if(H.head)
to_chat(H, "<span class='warning'>You're already wearing something on your head!</span>")
to_chat(H, span_warning("You're already wearing something on your head!"))
return
else
H.equip_to_slot_if_possible(hood,slot_head,0,0,1)
@@ -1759,7 +1759,7 @@ Departamental Swimsuits, for general use
/obj/item/clothing/head/helmet/space/void/security/hasd/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(H.ckey != "silencedmp5a5")
to_chat(H, "<span class='warning'>...The faceplate is clearly not made for your anatomy, thus, does not fit.</span>")
to_chat(H, span_warning("...The faceplate is clearly not made for your anatomy, thus, does not fit."))
return 0
else
return 1
@@ -1778,7 +1778,7 @@ Departamental Swimsuits, for general use
if(..() && istype(H) && H.ckey == "silencedmp5a5")
return 1
else
to_chat(H, "<span class='warning'>This suit is not designed for you.</span>")
to_chat(H, span_warning("This suit is not designed for you."))
return 0
//Zigfe:Zaoozaoo Xrimxuqmqixzix
@@ -2033,7 +2033,7 @@ Departamental Swimsuits, for general use
if (M.ckey == "ryumi")
return 1
else if (M.get_active_hand() == src)
to_chat(M, "<span class='warning'>What the heck? \The [src] doesn't fit!</span>")
to_chat(M, span_warning("What the heck? \The [src] doesn't fit!"))
return 0
/obj/item/clothing/shoes/fluff/nikki
@@ -2049,7 +2049,7 @@ Departamental Swimsuits, for general use
if (M.ckey == "ryumi")
return 1
else if (M.get_active_hand() == src)
to_chat(M, "<span class='warning'>What the heck? \The [src] doesn't fit!</span>")
to_chat(M, span_warning("What the heck? \The [src] doesn't fit!"))
return 0
/obj/item/clothing/suit/fluff/nikki //see /obj/item/rig/nikki
@@ -2114,27 +2114,27 @@ Departamental Swimsuits, for general use
/obj/item/clothing/head/fluff/nikki/proc/teleport_fail(mob/user, mob/target)
if (target != user)
user.visible_message("<span class='notice'>[user] harmlessly bops [target] with \the [src].</span>", \
"<span class='notice'>\The [src] harmlessly bops [target]. The hat seems... unwilling?</span>")
user.visible_message(span_notice("[user] harmlessly bops [target] with \the [src]."), \
span_notice("\The [src] harmlessly bops [target]. The hat seems... unwilling?"))
else
user.visible_message("<b>\The [src]</b> flops over [user]'s' head for a moment, but they seem alright.", \
"<span class='notice'>\The [src] flops over your head for a moment, but you correct it without issue. There we go!</span>")
span_notice("\The [src] flops over your head for a moment, but you correct it without issue. There we go!"))
/obj/item/clothing/head/fluff/nikki/proc/hat_warp_checks(var/mob/living/target, mob/user, proximity_flag)
if (!proximity_flag)
return 0
if (!translocator)
to_chat(user, "<span class='warning'>\The [src] doesn't have a translocator inside it yet, you goof!</span>")
to_chat(user, span_warning("\The [src] doesn't have a translocator inside it yet, you goof!"))
return 0
if (target.ckey == owner && target != user) // ur not getting me that easy sonny jim......
to_chat(user, "<span class='warning'>You think to turn \the [src] on its creator?! <b>FOOOOOOOOL.</b></span>")
to_chat(user, "<span class='notice'>From seemingly nowhere you hear echoing, derisive laughter, accompanied by a stock laugh track and... Are those bike horns?</span>")
to_chat(user, span_warning("You think to turn \the [src] on its creator?! <b>FOOOOOOOOL.</b>"))
to_chat(user, span_notice("From seemingly nowhere you hear echoing, derisive laughter, accompanied by a stock laugh track and... Are those bike horns?"))
return 0
if (!istype(target))
to_chat(user, "<span class='warning'>\The [src] isn't a valid target!</span>")
to_chat(user, span_warning("\The [src] isn't a valid target!"))
return 0
// Because other mobs (i.e. monkeys) apparently have dropnom prey set to 0, we check SPECIFICALLY for humans' dropnom setting.
@@ -2150,11 +2150,11 @@ Departamental Swimsuits, for general use
/obj/item/clothing/head/fluff/nikki/attackby(obj/item/I as obj, mob/user as mob)
if (istype(I, /obj/item/perfect_tele) && user.get_inactive_hand() == src)
if (translocator)
visible_message("<span class='notice'>[user] starts to pull \a [translocator] out of \the [src] to swap it out with \the [I]...</span>", \
"<span class='notice'>You start pulling \the [translocator] pops out of its compartment with a soft 'click' as you replace it with \the [I]....</span>")
visible_message(span_notice("[user] starts to pull \a [translocator] out of \the [src] to swap it out with \the [I]..."), \
span_notice("You start pulling \the [translocator] pops out of its compartment with a soft 'click' as you replace it with \the [I]...."))
else
visible_message("<span class='notice'>[user] begins slipping \the [I] into \the [src]...</span>", \
"<span class='notice'>You begin to snap \the [I] into a small, hidden compartment inside \the [src]...</span>")
visible_message(span_notice("[user] begins slipping \the [I] into \the [src]..."), \
span_notice("You begin to snap \the [I] into a small, hidden compartment inside \the [src]..."))
// This works for both adding and replacing a translocator
translocator_equip(I, user)
return
@@ -2203,8 +2203,8 @@ Departamental Swimsuits, for general use
// hey, are we actually able to teleport this poor person?
if (hat_warp_checks(user, user, proximity_flag = 1))
// YOU FOOL! YOU HAVE ACTIVATED MY STAND, 「ＶＯＲＥ　ＢＹ　ＨＡＴ」！
src.visible_message("<span class='danger'>\The [src] falls over [user]'s head... and somehow falls over the rest of their body, causing them to vanish inside. Where did they go?!</span>", \
"<span class='danger'>The hat falls over your head as you put it on, enveloping you in a bright green light! <b>Uh oh.</b></span>")
src.visible_message(span_danger("\The [src] falls over [user]'s head... and somehow falls over the rest of their body, causing them to vanish inside. Where did they go?!"), \
span_danger("The hat falls over your head as you put it on, enveloping you in a bright green light! <b>Uh oh.</b>"))
var/uh_oh = pick(translocator.beacons)
user.remove_from_mob(src, get_turf(user))
translocator.destination = translocator.beacons[uh_oh]
@@ -2218,18 +2218,18 @@ Departamental Swimsuits, for general use
// Silly fluffed up styles of teleporting people based on user intent.
switch (user.a_intent)
if (I_HELP)
user.visible_message("<span class='notice'>[user] guides \the [target] to the bottomless hole within \the [src]. They begin to climb inside...</span>")
user.visible_message(span_notice("[user] guides \the [target] to the bottomless hole within \the [src]. They begin to climb inside..."))
if (do_after(user, 5 SECONDS, target))
translocator.afterattack(target, user, proximity_flag)
if (I_DISARM)
user.visible_message("<span class='danger'>[user] plops \the [src] onto \the [target]'s head!</span>")
user.visible_message(span_danger("[user] plops \the [src] onto \the [target]'s head!"))
translocator.afterattack(target, user, proximity_flag)
if (I_GRAB)
user.visible_message("<span class='danger'>[user] begins stuffing [target] into \the [src]!</span>")
user.visible_message(span_danger("[user] begins stuffing [target] into \the [src]!"))
if (do_after(user, 5 SECONDS, target))
translocator.afterattack(target, user, proximity_flag)
if (I_HURT)
user.visible_message("<span class='danger'>[user] swipes \the [src] over \the [target]!</span>")
user.visible_message(span_danger("[user] swipes \the [src] over \the [target]!"))
translocator.afterattack(target, user, proximity_flag)
add_attack_logs(user, target, "Teleported [target] with via \the [src]'s [translocator]!")
@@ -2377,10 +2377,10 @@ Departamental Swimsuits, for general use
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
if(H.wear_suit != src)
to_chat(H, "<span class='warning'>You must be wearing [src] to put up the hood!</span>")
to_chat(H, span_warning("You must be wearing [src] to put up the hood!"))
return
if(H.head)
to_chat(H, "<span class='warning'>You're already wearing something on your head!</span>")
to_chat(H, span_warning("You're already wearing something on your head!"))
return
else
H.equip_to_slot_if_possible(hood,slot_head,0,0,1)
@@ -2435,10 +2435,10 @@ Departamental Swimsuits, for general use
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
if(H.wear_suit != src)
to_chat(H, "<span class='warning'>You must be wearing [src] to put up the hood!</span>")
to_chat(H, span_warning("You must be wearing [src] to put up the hood!"))
return
if(H.head)
to_chat(H, "<span class='warning'>You're already wearing something on your head!</span>")
to_chat(H, span_warning("You're already wearing something on your head!"))
return
else
H.equip_to_slot_if_possible(hood,slot_head,0,0,1)

74
code/modules/vore/fluffstuff/custom_implants_vr.dm
View File

@@ -111,7 +111,7 @@
/obj/item/implant/reagent_generator/roiz/post_implant(mob/living/carbon/source)
START_PROCESSING(SSobj, src)
to_chat(source, "<span class='notice'>You implant [source] with \the [src].</span>")
to_chat(source, span_notice("You implant [source] with \the [src]."))
add_verb(source,assigned_proc) //CHOMPEdit TGPanel
return 1
@@ -139,7 +139,7 @@
break
if (rimplant)
if(rimplant.reagents.total_volume <= rimplant.transfer_amount)
to_chat(src, "<span class='notice'>[pick(rimplant.empty_message)]</span>")
to_chat(src, span_notice("[pick(rimplant.empty_message)]"))
return
new /obj/item/reagent_containers/food/snacks/egg/roiz(get_turf(src))
@@ -150,13 +150,13 @@
var/emote = rimplant.emote_descriptor[index]
var/verb_desc = rimplant.verb_descriptor[index]
var/self_verb_desc = rimplant.self_verb_descriptor[index]
usr.visible_message("<span class='notice'>[usr] [verb_desc] [emote]</span>",
"<span class='notice'>You [self_verb_desc] [emote]</span>")
usr.visible_message(span_notice("[usr] [verb_desc] [emote]"),
span_notice("You [self_verb_desc] [emote]"))
else
visible_message("<span class='notice'>[src] [pick(rimplant.short_emote_descriptor)] an egg.</span>",
"<span class='notice'>You [pick(rimplant.self_emote_descriptor)] an egg.</span>")
visible_message(span_notice("[src] [pick(rimplant.short_emote_descriptor)] an egg."),
span_notice("You [pick(rimplant.self_emote_descriptor)] an egg."))
if(prob(15))
visible_message("<span class='notice'>[src] [pick(rimplant.random_emote)].</span>") // M-mlem.
visible_message(span_notice("[src] [pick(rimplant.random_emote)].")) // M-mlem.
rimplant.reagents.remove_any(rimplant.transfer_amount)
@@ -180,7 +180,7 @@
/obj/item/implant/reagent_generator/jasmine/post_implant(mob/living/carbon/source)
START_PROCESSING(SSobj, src)
to_chat(source, "<span class='notice'>You implant [source] with \the [src].</span>")
to_chat(source, span_notice("You implant [source] with \the [src]."))
add_verb(source,assigned_proc) //CHOMPEdit TGPanel
return 1
@@ -208,7 +208,7 @@
break
if (rimplant)
if(rimplant.reagents.total_volume <= rimplant.transfer_amount)
to_chat(src, "<span class='notice'>[pick(rimplant.empty_message)]</span>")
to_chat(src, span_notice("[pick(rimplant.empty_message)]"))
return
new /obj/item/reagent_containers/food/snacks/egg/roiz(get_turf(src))
@@ -219,13 +219,13 @@
var/emote = rimplant.emote_descriptor[index]
var/verb_desc = rimplant.verb_descriptor[index]
var/self_verb_desc = rimplant.self_verb_descriptor[index]
usr.visible_message("<span class='notice'>[usr] [verb_desc] [emote]</span>",
"<span class='notice'>You [self_verb_desc] [emote]</span>")
usr.visible_message(span_notice("[usr] [verb_desc] [emote]"),
span_notice("You [self_verb_desc] [emote]"))
else
visible_message("<span class='notice'>[src] [pick(rimplant.short_emote_descriptor)] an egg.</span>",
"<span class='notice'>You [pick(rimplant.self_emote_descriptor)] an egg.</span>")
visible_message(span_notice("[src] [pick(rimplant.short_emote_descriptor)] an egg."),
span_notice("You [pick(rimplant.self_emote_descriptor)] an egg."))
if(prob(15))
visible_message("<span class='notice'>[src] [pick(rimplant.random_emote)].</span>")
visible_message(span_notice("[src] [pick(rimplant.random_emote)]."))
rimplant.reagents.remove_any(rimplant.transfer_amount)
@@ -249,7 +249,7 @@
/obj/item/implant/reagent_generator/yonra/post_implant(mob/living/carbon/source)
START_PROCESSING(SSobj, src)
to_chat(source, "<span class='notice'>You implant [source] with \the [src].</span>")
to_chat(source, span_notice("You implant [source] with \the [src]."))
add_verb(source,assigned_proc) //CHOMPEdit TGPanel
return 1
@@ -277,7 +277,7 @@
break
if (rimplant)
if(rimplant.reagents.total_volume <= rimplant.transfer_amount)
to_chat(src, "<span class='notice'>[pick(rimplant.empty_message)]</span>")
to_chat(src, span_notice("[pick(rimplant.empty_message)]"))
return
new /obj/item/reagent_containers/food/snacks/egg/teshari(get_turf(src))
@@ -288,13 +288,13 @@
var/emote = rimplant.emote_descriptor[index]
var/verb_desc = rimplant.verb_descriptor[index]
var/self_verb_desc = rimplant.self_verb_descriptor[index]
usr.visible_message("<span class='notice'>[usr] [verb_desc] [emote]</span>",
"<span class='notice'>You [self_verb_desc] [emote]</span>")
usr.visible_message(span_notice("[usr] [verb_desc] [emote]"),
span_notice("You [self_verb_desc] [emote]"))
else
visible_message("<span class='notice'>[src] [pick(rimplant.short_emote_descriptor)] an egg.</span>",
"<span class='notice'>You [pick(rimplant.self_emote_descriptor)] an egg.</span>")
visible_message(span_notice("[src] [pick(rimplant.short_emote_descriptor)] an egg."),
span_notice("You [pick(rimplant.self_emote_descriptor)] an egg."))
if(prob(15))
visible_message("<span class='notice'>[src] [pick(rimplant.random_emote)].</span>")
visible_message(span_notice("[src] [pick(rimplant.random_emote)]."))
rimplant.reagents.remove_any(rimplant.transfer_amount)
@@ -334,7 +334,7 @@
/obj/item/implant/reagent_generator/rischi/post_implant(mob/living/carbon/source)
START_PROCESSING(SSobj, src)
to_chat(source, "<span class='notice'>You implant [source] with \the [src].</span>")
to_chat(source, span_notice("You implant [source] with \the [src]."))
add_verb(source,assigned_proc) //CHOMPEdit TGPanel
return 1
@@ -362,7 +362,7 @@
break
if (rimplant)
if(rimplant.reagents.total_volume <= rimplant.transfer_amount)
to_chat(src, "<span class='notice'>[pick(rimplant.empty_message)]</span>")
to_chat(src, span_notice("[pick(rimplant.empty_message)]"))
return
new /obj/item/reagent_containers/food/snacks/egg/teshari/tesh2(get_turf(src))
@@ -373,13 +373,13 @@
var/emote = rimplant.emote_descriptor[index]
var/verb_desc = rimplant.verb_descriptor[index]
var/self_verb_desc = rimplant.self_verb_descriptor[index]
usr.visible_message("<span class='notice'>[usr] [verb_desc] [emote]</span>",
"<span class='notice'>You [self_verb_desc] [emote]</span>")
usr.visible_message(span_notice("[usr] [verb_desc] [emote]"),
span_notice("You [self_verb_desc] [emote]"))
else
visible_message("<span class='notice'>[src] falls to her knees as the urge to lay overwhelms her, letting out a whimper as she [pick(rimplant.short_emote_descriptor)] an egg from between her legs.</span>",
"<span class='notice'>You fall to your knees as the urge to lay overwhelms you, letting out a whimper as you [pick(rimplant.self_emote_descriptor)] an egg from between your legs.</span>")
visible_message(span_notice("[src] falls to her knees as the urge to lay overwhelms her, letting out a whimper as she [pick(rimplant.short_emote_descriptor)] an egg from between her legs."),
span_notice("You fall to your knees as the urge to lay overwhelms you, letting out a whimper as you [pick(rimplant.self_emote_descriptor)] an egg from between your legs."))
if(prob(15))
visible_message("<span class='notice'>[src] [pick(rimplant.random_emote)].</span>")
visible_message(span_notice("[src] [pick(rimplant.random_emote)]."))
rimplant.reagents.remove_any(rimplant.transfer_amount)
@@ -420,10 +420,10 @@
var/clr = C.colourName
if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow")))
to_chat(user, "<span class='warning'>The egg refuses to take on this color!</span>")
to_chat(user, span_warning("The egg refuses to take on this color!"))
return
to_chat(user, "<span class='notice'>You color \the [src] [clr]</span>")
to_chat(user, span_notice("You color \the [src] [clr]"))
icon_state = "egg_roiz_[clr]"
desc = "It's a large lizard egg. It has been colored [clr]!"
if (clr == "rainbow")
@@ -485,7 +485,7 @@
/obj/item/implant/reagent_generator/evian/post_implant(mob/living/carbon/source)
START_PROCESSING(SSobj, src)
to_chat(source, "<span class='notice'>You implant [source] with \the [src].</span>")
to_chat(source, span_notice("You implant [source] with \the [src]."))
add_verb(source,assigned_proc) //CHOMPEdit TGPanel
return 1
@@ -513,7 +513,7 @@
break
if (rimplant)
if(rimplant.reagents.total_volume <= rimplant.transfer_amount)
to_chat(src, "<span class='notice'>[pick(rimplant.empty_message)]</span>")
to_chat(src, span_notice("[pick(rimplant.empty_message)]"))
return
new /obj/item/reagent_containers/food/snacks/egg/roiz/evian(get_turf(src)) //Roiz/evian so it gets all the functionality
@@ -524,13 +524,13 @@
var/emote = rimplant.emote_descriptor[index]
var/verb_desc = rimplant.verb_descriptor[index]
var/self_verb_desc = rimplant.self_verb_descriptor[index]
usr.visible_message("<span class='notice'>[usr] [verb_desc] [emote]</span>",
"<span class='notice'>You [self_verb_desc] [emote]</span>")
usr.visible_message(span_notice("[usr] [verb_desc] [emote]"),
span_notice("You [self_verb_desc] [emote]"))
else
visible_message("<span class='notice'>[src] [pick(rimplant.short_emote_descriptor)] an egg.</span>",
"<span class='notice'>You [pick(rimplant.self_emote_descriptor)] an egg.</span>")
visible_message(span_notice("[src] [pick(rimplant.short_emote_descriptor)] an egg."),
span_notice("You [pick(rimplant.self_emote_descriptor)] an egg."))
if(prob(15))
visible_message("<span class='notice'>[src] [pick(rimplant.random_emote)].</span>") // M-mlem.
visible_message(span_notice("[src] [pick(rimplant.random_emote)].")) // M-mlem.
rimplant.reagents.remove_any(rimplant.transfer_amount)

104
code/modules/vore/fluffstuff/custom_items_vr.dm
View File

@@ -62,10 +62,10 @@
if(istype(O,/obj/item/clothing/suit/space/void/) && !can_repair) //check if we're a voidsuit and if we're allowed to repair
var/obj/item/clothing/suit/space/void/SS = O
if(LAZYLEN(SS.breaches))
to_chat(user, "<span class='warning'>You should probably repair that before you start tinkering with it.</span>")
to_chat(user, span_warning("You should probably repair that before you start tinkering with it."))
return
if(O.blood_DNA || O.contaminated) //check if we're bloody or gooey or whatever, so modkits can't be used to hide crimes easily.
to_chat(user, "<span class='warning'>You should probably clean that up before you start tinkering with it.</span>")
to_chat(user, span_warning("You should probably clean that up before you start tinkering with it."))
return
//we have to check that it's not the original type first, because otherwise it might convert wrong based on pathing; the subtype can still count as the basetype
if(istype(O,to_helmet) && can_revert)
@@ -75,7 +75,7 @@
cost = to_suit_cost
to_type = from_suit
else if(!can_revert && (istype(O,to_helmet) || istype (O,to_suit)))
to_chat(user, "<span class='warning'>This kit doesn't seem to have the tools necessary to revert changes to modified items.</span>")
to_chat(user, span_warning("This kit doesn't seem to have the tools necessary to revert changes to modified items."))
return
else if(istype(O,from_helmet))
cost = from_helmet_cost
@@ -86,26 +86,26 @@
to_type = to_suit
keycheck = TRUE
else
to_chat(user, "<span class='notice'>This kit doesn't seem to have any tools or parts for whatever you're trying to use it on.</span>") //new error message
to_chat(user, span_notice("This kit doesn't seem to have any tools or parts for whatever you're trying to use it on.")) //CHOMPAdd new error message
return
if(!isturf(O.loc))
to_chat(user, "<span class='warning'>You need to put \the [O] on the ground, a table, or other worksurface before modifying it.</span>")
to_chat(user, span_warning("You need to put \the [O] on the ground, a table, or other worksurface before modifying it."))
return
if(!skip_content_check && O.contents.len) //check if we're loaded/modified, in the event of gun/suit kits, to avoid purging stuff like ammo, badges, armbands, or suit helmets
to_chat(user, "<span class='warning'>You should probably remove any attached items or loaded ammunition before trying to modify that!</span>")
to_chat(user, span_warning("You should probably remove any attached items or loaded ammunition before trying to modify that!"))
return
if(cost > parts)
to_chat(user, "<span class='warning'>The kit doesn't have enough parts left to modify that.</span>")
to_chat(user, span_warning("The kit doesn't have enough parts left to modify that."))
if(can_revert && ((to_helmet_cost || to_suit_cost) < 0))
to_chat(user, "<span class='notice'> You can recover parts by using the kit on an already-modified item.</span>")
to_chat(user, span_notice(" You can recover parts by using the kit on an already-modified item."))
return
if(keycheck && owner_ckey) //check if we're supposed to care
if(user.ckey != owner_ckey) //ERROR: UNAUTHORIZED USER
to_chat(user, "<span class='warning'>You probably shouldn't mess with all these strange tools and parts...</span>") //give them a slightly fluffy explanation as to why it didn't work
to_chat(user, span_warning("You probably shouldn't mess with all these strange tools and parts...")) //give them a slightly fluffy explanation as to why it didn't work
return
playsound(src, 'sound/items/Screwdriver.ogg', 100, 1)
var/obj/N = new to_type(O.loc)
user.visible_message("<span class='notice'>[user] opens \the [src] and modifies \the [O] into \the [N].</span>","<span class='notice'>You open \the [src] and modify \the [O] into \the [N].</span>")
user.visible_message(span_notice("[user] opens \the [src] and modifies \the [O] into \the [N]."),span_notice("You open \the [src] and modify \the [O] into \the [N]."))
//crude, but transfer prints and fibers to avoid forensics abuse, same as the bloody/gooey check above
N.fingerprints = O.fingerprints
@@ -181,7 +181,7 @@
/obj/item/sword/fluff/joanaria/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
if(default_parry_check(user, attacker, damage_source) && prob(75))
user.visible_message("<span class='danger'>\The [user] parries [attack_text] with \the [src]!</span>")
user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!"))
playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1)
return 1
return 0
@@ -194,7 +194,7 @@
/obj/item/material/knife/tacknife/combatknife/fluff/katarina/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
if(default_parry_check(user, attacker, damage_source) && prob(75))
user.visible_message("<span class='danger'>\The [user] parries [attack_text] with \the [src]!</span>")
user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!"))
playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1)
return 1
return 0
@@ -229,11 +229,11 @@
/obj/item/card/id/centcom/station/fluff/joanbadge/attack_self(mob/user as mob)
if(isliving(user))
user.visible_message("<span class='warning'>[user] flashes their golden security badge.\nIt reads:NT Security.</span>","<span class='warning'>You display the faded badge.\nIt reads: NT Security.</span>")
user.visible_message(span_warning("[user] flashes their golden security badge.\nIt reads:NT Security."),span_warning("You display the faded badge.\nIt reads: NT Security."))
/obj/item/card/id/centcom/station/fluff/joanbadge/attack(mob/living/carbon/human/M, mob/living/user)
if(isliving(user))
user.visible_message("<span class='warning'>[user] invades [M]'s personal space, thrusting [src] into their face insistently.</span>","<span class='warning'>You invade [M]'s personal space, thrusting [src] into their face insistently.</span>")
user.visible_message(span_warning("[user] invades [M]'s personal space, thrusting [src] into their face insistently."),span_warning("You invade [M]'s personal space, thrusting [src] into their face insistently."))
//JoanRisu:Joan Risu
/obj/item/pda/heads/hos/joanpda
@@ -297,11 +297,11 @@
/obj/item/flag/attack_self(mob/user as mob)
if(isliving(user))
user.visible_message("<span class='warning'>[user] waves their Banner around!</span>","<span class='warning'>You wave your Banner around.</span>")
user.visible_message(span_warning("[user] waves their Banner around!"),span_warning("You wave your Banner around."))
/obj/item/flag/attack(mob/living/carbon/human/M, mob/living/user)
if(isliving(user))
user.visible_message("<span class='warning'>[user] invades [M]'s personal space, thrusting [src] into their face insistently.</span>","<span class='warning'>You invade [M]'s personal space, thrusting [src] into their face insistently.</span>")
user.visible_message(span_warning("[user] invades [M]'s personal space, thrusting [src] into their face insistently."),span_warning("You invade [M]'s personal space, thrusting [src] into their face insistently."))
/obj/item/flag/federation
@@ -403,13 +403,13 @@
//O.icon = icon // just in case we're using custom sprite paths with fluff items.
O.icon_state = new_icon // Changes the icon without changing the access.
playsound(src, 'sound/items/polaroid2.ogg', 100, 1)
user.visible_message("<span class='warning'> [user] reprints their ID.</span>")
user.visible_message(span_warning(" [user] reprints their ID."))
qdel(src)
else if(O.icon_state == new_icon)
to_chat(user, "<span class='notice'>[O] already has been reprinted.</span>")
to_chat(user, span_notice("[O] already has been reprinted."))
return
else
to_chat(user, "<span class='warning'>This isn't even an ID card you idiot.</span>")
to_chat(user, span_warning("This isn't even an ID card you idiot."))
return
//arokha:Aronai Sieyes - Centcom ID (Medical dept)
@@ -426,7 +426,7 @@
if(user.mind && user.mind.initial_account)
associated_account_number = user.mind.initial_account.account_number
configured = 1
to_chat(user, "<span class='notice'>Card settings set.</span>")
to_chat(user, span_notice("Card settings set."))
//Swat43:Fortune Bloise
/obj/item/storage/backpack/satchel/fluff/swat43bag
@@ -461,7 +461,7 @@
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
return ..()
else
to_chat(H, "<span class='warning'>You need to have a wolf-taur half to wear this.</span>")
to_chat(H, span_warning("You need to have a wolf-taur half to wear this."))
return 0
/obj/item/clothing/head/serdyhelmet //SilencedMP5A5's specialty helmet.
@@ -548,24 +548,24 @@
/obj/item/clothing/accessory/collar/khcrystal/attack_self(mob/user as mob)
if(state > 0) //Can't re-pair, one time only, for security reasons.
to_chat(user, "<span class='notice'>The [name] doesn't do anything.</span>")
to_chat(user, span_notice("The [name] doesn't do anything."))
return 0
owner = user //We're paired to this guy
owner_c = user.client //This is his client
update_state(1)
to_chat(user, "<span class='notice'>The [name] glows pleasantly blue.</span>")
to_chat(user, span_notice("The [name] glows pleasantly blue."))
START_PROCESSING(SSobj, src)
/obj/item/clothing/accessory/collar/khcrystal/proc/check_owner()
//He's dead, jim
if((state == 1) && owner && (owner.stat == DEAD))
update_state(2)
visible_message("<span class='warning'>The [name] begins flashing red.</span>")
visible_message(span_warning("The [name] begins flashing red."))
sleep(30)
visible_message("<span class='warning'>The [name] shatters into dust!</span>")
visible_message(span_warning("The [name] shatters into dust!"))
if(owner_c)
to_chat(owner_c, "<span class='notice'>A signal is sent notifying of your demise by \the [name].</span>")
to_chat(owner_c, span_notice("A signal is sent notifying of your demise by \the [name]."))
update_state(3)
name = "broken [initial(name)]"
desc = "This seems like a necklace, but the actual pendant is missing."
@@ -656,13 +656,13 @@
O.icon_state = new_icon_state // Changes the icon without changing the access.
O.desc = new_desc
playsound(src, 'sound/items/polaroid2.ogg', 100, 1)
user.visible_message("<span class='warning'> [user] reprints their ID.</span>")
user.visible_message(span_warning(" [user] reprints their ID."))
qdel(src)
else if(O.icon_state == new_icon)
to_chat(user, "<span class='notice'>[O] already has been reprinted.</span>")
to_chat(user, span_notice("[O] already has been reprinted."))
return
else
to_chat(user, "<span class='warning'>This isn't even an ID card you idiot.</span>")
to_chat(user, span_warning("This isn't even an ID card you idiot."))
return
//WickedTempest: Chakat Tempest
@@ -830,7 +830,7 @@
/obj/item/clothing/accessory/badge/holo/detective/ruda/attack(mob/living/carbon/human/M, mob/living/user)
if(isliving(user))
user.visible_message("<span class='danger'>[user] invades [M]'s personal space, thrusting [src] into their face with an insistent huff.</span>","<span class='danger'>You invade [M]'s personal space, thrusting [src] into their face with an insistent huff.</span>")
user.visible_message(span_danger("[user] invades [M]'s personal space, thrusting [src] into their face with an insistent huff."),span_danger("You invade [M]'s personal space, thrusting [src] into their face with an insistent huff."))
user.do_attack_animation(M)
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //to prevent spam
@@ -843,9 +843,9 @@
if(isliving(user))
if(stored_name)
user.visible_message("<span class='notice'>[user] displays their [src].\nIt reads: [stored_name], [badge_string].</span>","<span class='notice'>You display your [src].\nIt reads: [stored_name], [badge_string].</span>")
user.visible_message(span_notice("[user] displays their [src].\nIt reads: [stored_name], [badge_string]."),span_notice("You display your [src].\nIt reads: [stored_name], [badge_string]."))
else
user.visible_message("<span class='notice'>[user] displays their [src].\nIt reads: [badge_string].</span>","<span class='notice'>You display your [src]. It reads: [badge_string].</span>")
user.visible_message(span_notice("[user] displays their [src].\nIt reads: [badge_string]."),span_notice("You display your [src]. It reads: [badge_string]."))
/obj/item/card/id/fluff/xennith
name = "\improper Amy Lessen's Central Command ID (Xenobiology Director)"
@@ -876,7 +876,7 @@
H.monkeyize()
qdel(src) //One time use.
else //If not, do nothing.
to_chat(user, "<span class='warning'>You are unable to inject other people.</span>")
to_chat(user, span_warning("You are unable to inject other people."))
/obj/item/fluff/injector/numb_bite
name = "Numbing Venom Injector"
@@ -890,7 +890,7 @@
H.species.give_numbing_bite() //This was annoying, but this is the easiest way of performing it.
qdel(src) //One time use.
else //If not, do nothing.
to_chat(user, "<span class='warning'>You are unable to inject other people.</span>")
to_chat(user, span_warning("You are unable to inject other people."))
//For 2 handed fluff weapons.
/obj/item/material/twohanded/fluff //Twohanded fluff items.
@@ -948,7 +948,7 @@
/obj/item/melee/baton/fluff/stunstaff/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
if(wielded && default_parry_check(user, attacker, damage_source) && prob(30))
user.visible_message("<span class='danger'>\The [user] parries [attack_text] with \the [src]!</span>")
user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!"))
playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1)
return 1
return 0
@@ -971,14 +971,14 @@
/obj/item/melee/baton/fluff/stunstaff/attack_self(mob/user)
if(bcell && bcell.charge > hitcost)
status = !status
to_chat(user, "<span class='notice'>[src] is now [status ? "on" : "off"].</span>")
to_chat(user, span_notice("[src] is now [status ? "on" : "off"]."))
if(status == 0)
playsound(src, 'sound/weapons/saberoff.ogg', 50, 1)
else
playsound(src, 'sound/weapons/saberon.ogg', 50, 1)
else
status = 0
to_chat(user, "<span class='warning'>[src] is out of charge.</span>")
to_chat(user, span_warning("[src] is out of charge."))
update_held_icon()
add_fingerprint(user)
@@ -1040,8 +1040,8 @@
/obj/item/melee/fluffstuff/attack_self(mob/living/user as mob)
if (active)
if ((CLUMSY in user.mutations) && prob(50))
user.visible_message("<span class='danger'>\The [user] accidentally cuts \himself with \the [src].</span>",\
"<span class='danger'>You accidentally cut yourself with \the [src].</span>")
user.visible_message(span_danger("\The [user] accidentally cuts \himself with \the [src]."),\
span_danger("You accidentally cut yourself with \the [src]."))
user.take_organ_damage(5,5)
deactivate(user)
else
@@ -1082,7 +1082,7 @@
/obj/item/melee/fluffstuff/wolfgirlsword/activate(mob/living/user)
if(!active)
to_chat(user, "<span class='notice'>The [src] is now sharpened. It will cut!</span>")
to_chat(user, span_notice("The [src] is now sharpened. It will cut!"))
..()
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -1094,7 +1094,7 @@
/obj/item/melee/fluffstuff/wolfgirlsword/deactivate(mob/living/user)
if(active)
to_chat(user, "<span class='notice'>The [src] grows dull!</span>")
to_chat(user, span_notice("The [src] grows dull!"))
..()
attack_verb = list("bapped", "thwapped", "bonked", "whacked")
icon_state = initial(icon_state)
@@ -1174,7 +1174,7 @@
/obj/item/clothing/glasses/welding/tiemgogs/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(H.ckey != "radiantaurora")
to_chat(H, "<span class='warning'>These don't look like they were made to fit you...</span>")
to_chat(H, span_warning("These don't look like they were made to fit you..."))
return 0
else
return 1
@@ -1213,7 +1213,7 @@
/obj/item/rig/nikki/attackby(obj/item/W, mob/living/user)
//This thing accepts ONLY mounted sizeguns. That's IT. Nothing else!
if(open && istype(W,/obj/item/rig_module) && !istype(W,/obj/item/rig_module/mounted/sizegun))
to_chat(user, "<span class='danger'>\The [src] only accepts mounted size gun modules.</span>")
to_chat(user, span_danger("\The [src] only accepts mounted size gun modules."))
return
..()
@@ -1222,7 +1222,7 @@
if (M.ckey == "ryumi")
return 1
else if (M.get_active_hand() == src)
to_chat(M, "<span class='warning'>For some reason, the necklace seems to never quite get past your head when you try to put it on... Weird, it looked like it would fit.</span>")
to_chat(M, span_warning("For some reason, the necklace seems to never quite get past your head when you try to put it on... Weird, it looked like it would fit."))
return 0
//Nickcrazy - Damon Bones Xrim
@@ -1318,13 +1318,13 @@
like a sponge scrubbing away a stain.</span>")
user.hair_accessory_style = null
for(var/datum/sprite_accessory/hair_accessory/verie_hair_glow/V in user)
to_chat(user, "<span class='warning'>found a V to delete!</span>")
to_chat(user, span_warning("found a V to delete!"))
qdel(V)
user.update_hair()
else
to_chat(user, "<span class='warning'>\The [src] isn't compatible with your body as it is now.</span>")
to_chat(user, span_warning("\The [src] isn't compatible with your body as it is now."))
End CHOMP Removal*/
@@ -1433,7 +1433,7 @@ End CHOMP Removal*/
desc = "A hard drive containing knowledge of various languages."
/obj/item/implant/language/fluff/m41l/post_implant(mob/M)
to_chat(M,"<span class='notice'>LANGUAGES - LOADING</span>")
to_chat(M,span_notice("LANGUAGES - LOADING"))
M.add_language(LANGUAGE_SKRELLIAN)
M.add_language(LANGUAGE_UNATHI)
M.add_language(LANGUAGE_SIIK)
@@ -1450,7 +1450,7 @@ End CHOMP Removal*/
M.add_language(LANGUAGE_SPACER)
M.add_language(LANGUAGE_TAVAN)
M.add_language(LANGUAGE_ECHOSONG)
to_chat(M,"<span class='notice'>LANGUAGES - INITIALISED</span>")
to_chat(M,span_notice("LANGUAGES - INITIALISED"))
//thedavestdave - Lucky
/obj/item/clothing/suit/armor/combat/crusader_costume/lucky
@@ -1543,16 +1543,16 @@ End CHOMP Removal*/
if(world.time - last_message <= 5 SECONDS)
return
if(user.a_intent == I_HELP)
user.visible_message("<span class='notice'><b>\The [user]</b> hugs [src]!</span>","<span class='notice'>You hug [src]!</span>")
user.visible_message(span_notice("<b>\The [user]</b> hugs [src]!"),span_notice("You hug [src]!"))
icon_state = "pandorba"
else if (user.a_intent == I_HURT)
user.visible_message("<span class='warning'><b>\The [user]</b> punches [src]!</span>","<span class='warning'>You punch [src]!</span>")
user.visible_message(span_warning("<b>\The [user]</b> punches [src]!"),span_warning("You punch [src]!"))
icon_state = "pandorba_h"
else if (user.a_intent == I_GRAB)
user.visible_message("<span class='warning'><b>\The [user]</b> attempts to strangle [src]!</span>","<span class='warning'>You attempt to strangle [src]!</span>")
user.visible_message(span_warning("<b>\The [user]</b> attempts to strangle [src]!"),span_warning("You attempt to strangle [src]!"))
icon_state = "pandorba_g"
else
user.visible_message("<span class='notice'><b>\The [user]</b> pokes [src].</span>","<span class='notice'>You poke [src].</span>")
user.visible_message(span_notice("<b>\The [user]</b> pokes [src]."),span_notice("You poke [src]."))
icon_state = "pandorba_d"
playsound(src, 'sound/items/drop/plushie.ogg', 25, 0)
visible_message("[src] says, \"[pokephrase]\"")