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

allow vorebelly display names (#18314)

Browse Source 
* allow vorebelly display names

* move lowertext

* .

* .

* .

* ,

* .

* example implementation

* .

* .

* absorbed

* .

* .

* .

* .

* also fix that

* useRef

* key it

* .

* fix those too
This commit is contained in:
Kashargul
2025-08-30 14:14:31 +02:00
committed by GitHub
parent fbb107fad2
commit aba797cc03
35 changed files with 225 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/say.dm
+3 -3
View File
@@ -115,9 +115,9 @@
var/obj/belly/B = loc
if(B.absorbedrename_enabled)
var/formatted_name = B.absorbedrename_name
formatted_name = replacetext(formatted_name,"%pred",B.owner)
formatted_name = replacetext(formatted_name,"%belly",B.name)
formatted_name = replacetext(formatted_name,"%prey",name)
formatted_name = replacetext(formatted_name,"%pred", B.owner)
formatted_name = replacetext(formatted_name,"%belly", B.get_belly_name())
formatted_name = replacetext(formatted_name,"%prey", name)
return formatted_name
return real_name
code/modules/mob/living/carbon/human/species/lleill/lleill_abilities.dm
+1 -1
View File
@@ -234,7 +234,7 @@
for(var/mob/living/M in target_list)
if(M.devourable && M.can_be_drop_prey)
M.forceMove(vore_selected)
to_chat(M,span_vwarning("In a bright flash of white light, you suddenly find yourself trapped in \the [src]'s [vore_selected.name]!"))
to_chat(M,span_vwarning("In a bright flash of white light, you suddenly find yourself trapped in \the [src]'s [vore_selected.get_belly_name()]!"))
species.update_lleill_hud(src)
/datum/power/lleill/contact
code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm
+1 -1
View File
@@ -387,7 +387,7 @@
if(target.buckled)
target.buckled.unbuckle_mob(target, force = TRUE)
target.forceMove(vore_selected)
to_chat(target,span_warning("\The [src] quickly engulfs you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!"))
to_chat(target,span_warning("\The [src] quickly engulfs you, [vore_selected.vore_verb]ing you into their [vore_selected.get_belly_name()]!"))
update_canmove()
/mob/living/simple_mob/protean_blob/update_canmove()
code/modules/mob/living/carbon/human/species/station/station_special_abilities.dm
+2 -2
View File
@@ -734,8 +734,8 @@
if(target.buckled) //how are you buckled in the water?!
target.buckled.unbuckle_mob()
target.visible_message(span_vwarning("\The [target] suddenly disappears, being dragged into the water!"),\
span_vdanger("You are dragged below the water and feel yourself slipping directly into \the [src]'s [vore_selected]!"))
to_chat(src, span_vnotice("You successfully drag \the [target] into the water, slipping them into your [vore_selected]."))
span_vdanger("You are dragged below the water and feel yourself slipping directly into \the [src]'s [vore_selected.get_belly_name()]!"))
to_chat(src, span_vnotice("You successfully drag \the [target] into the water, slipping them into your [vore_selected.get_belly_name()]."))
target.forceMove(src.vore_selected)
/mob/living/carbon/human/proc/toggle_pain_module()
code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm
+2 -2
View File
@@ -61,7 +61,7 @@
var/mob/living/target = pick(potentials)
if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected)
target.forceMove(vore_selected)
to_chat(target,span_vwarning("\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!"))
to_chat(target,span_vwarning("\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.get_belly_name()]!"))
// Do this after the potential vore, so we get the belly
update_icon()
@@ -205,7 +205,7 @@
var/mob/living/target = pick(potentials)
if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected)
target.forceMove(vore_selected)
to_chat(target,span_vwarning("\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!"))
to_chat(target,span_vwarning("\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.get_belly_name()]!"))
// Do this after the potential vore, so we get the belly
update_icon()
code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
+1 -1
View File
@@ -221,7 +221,7 @@
if(target.buckled)
target.buckled.unbuckle_mob(target, force = TRUE)
target.forceMove(vore_selected)
to_chat(target,span_vwarning("\The [src] quickly engulfs you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!"))
to_chat(target,span_vwarning("\The [src] quickly engulfs you, [vore_selected.vore_verb]ing you into their [vore_selected.get_belly_name()]!"))
else
..()
code/modules/mob/say_vr.dm
+9 -9
View File
@@ -80,9 +80,9 @@
var/obj/belly/B = src.loc
if(B.absorbedrename_enabled)
var/formatted_name = B.absorbedrename_name
formatted_name = replacetext(formatted_name,"%pred",B.owner)
formatted_name = replacetext(formatted_name,"%belly",B.name)
formatted_name = replacetext(formatted_name,"%prey",name)
formatted_name = replacetext(formatted_name,"%pred", B.owner)
formatted_name = replacetext(formatted_name,"%belly", B.get_belly_name())
formatted_name = replacetext(formatted_name,"%prey", name)
message = span_emote_subtle(span_bold("[formatted_name]") + " " + span_italics("[input]"))
if(!(subtle_mode == "Adjacent Turfs (Default)"))
message = span_bold("(T) ") + message
@@ -298,9 +298,9 @@
var/obj/belly/B = M.loc
if(B.absorbedrename_enabled)
formatted_name = B.absorbedrename_name
formatted_name = replacetext(formatted_name,"%pred",B.owner)
formatted_name = replacetext(formatted_name,"%belly",B.name)
formatted_name = replacetext(formatted_name,"%prey","\The [M]")
formatted_name = replacetext(formatted_name,"%pred", B.owner)
formatted_name = replacetext(formatted_name,"%belly", B.get_belly_name())
formatted_name = replacetext(formatted_name,"%prey", "\The [M]")
to_chat(pb, span_psay("[formatted_name] thinks, \"[message]\""))
else
to_chat(pb, span_psay("\The [M] thinks, \"[message]\"")) //To our pred if absorbed
@@ -404,9 +404,9 @@
var/obj/belly/B = M.loc
if(B.absorbedrename_enabled)
formatted_name = B.absorbedrename_name
formatted_name = replacetext(formatted_name,"%pred",B.owner)
formatted_name = replacetext(formatted_name,"%belly",B.name)
formatted_name = replacetext(formatted_name,"%prey","\The [M]")
formatted_name = replacetext(formatted_name,"%pred", B.owner)
formatted_name = replacetext(formatted_name,"%belly", B.get_belly_name())
formatted_name = replacetext(formatted_name,"%prey", "\The [M]")
to_chat(pb, span_pemote("[formatted_name] [message]"))
else
to_chat(pb, span_pemote("\The [M] [message]")) //To our pred if absorbed