diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm
index 7dd229fb7c0..f6c4092ed1d 100644
--- a/code/_helpers/global_lists_vr.dm
+++ b/code/_helpers/global_lists_vr.dm
@@ -30,7 +30,7 @@ var/global/list/important_items = list(
/obj/item/weapon/disk/nuclear)
/* TODOPOLARIS - Depends on porting object
- /obj/item/weapon/card/id/digested)
+ ///obj/item/weapon/card/id/digested)
*/
var/global/list/digestion_sounds = list(
diff --git a/code/modules/client/preference_setup/vore/01_ears.dm b/code/modules/client/preference_setup/vore/01_ears.dm
index db3e806822a..3e3f559e61b 100644
--- a/code/modules/client/preference_setup/vore/01_ears.dm
+++ b/code/modules/client/preference_setup/vore/01_ears.dm
@@ -81,12 +81,7 @@
if(tail_styles_list[pref.tail_style])
var/datum/sprite_accessory/tail/T = tail_styles_list[pref.tail_style]
if (T.do_colouration)
- . += "Change Color \
- \
-
"
+ . += "Change Color
"
. += "Custom Species "
. += "[pref.custom_species ? pref.custom_species : "None"]
"
diff --git a/code/modules/mob/living/carbon/human/examine_vr.dm b/code/modules/mob/living/carbon/human/examine_vr.dm
index 7c43bde705f..eae95fae481 100644
--- a/code/modules/mob/living/carbon/human/examine_vr.dm
+++ b/code/modules/mob/living/carbon/human/examine_vr.dm
@@ -3,7 +3,7 @@
switch(weight)
if(0 to 74)
- message = "\red They are terribly lithe and frail!\n" //I couldn't get the t.he, t_he, or \he to work, so... Let's just use they!
+ message = "They are terribly lithe and frail!\n"
if(75 to 99)
message = "They have a very slender frame.\n"
if(100 to 124)
@@ -19,9 +19,9 @@
if(325 to 374)
message = "They have a very fat frame with a bulging potbelly, squishy rolls of pudge, very wide hips, and plump set of jiggling thighs.\n"
if(375 to 474)
- message = "\red They are incredibly obese. Their massive potbelly sags over their waistline while their fat ass would probably require two chairs to sit down comfortably!\n"
+ message = "They are incredibly obese. Their massive potbelly sags over their waistline while their fat ass would probably require two chairs to sit down comfortably!\n"
else
- message += "\red They are so morbidly obese, you wonder how they can even stand, let alone waddle around the station. They can't get any fatter without being immobilized.\n"
+ message += "They are so morbidly obese, you wonder how they can even stand, let alone waddle around the station. They can't get any fatter without being immobilized.\n"
return message //Credit to Aronai for helping me actually get this working!
/mob/living/carbon/human/proc/examine_nutrition()
@@ -29,21 +29,21 @@
switch(nutrition)
if(0 to 49)
- message = "\red They are starving! You can hear their stomach snarling from across the room!\n"
+ message = "They are starving! You can hear their stomach snarling from across the room!\n"
if(50 to 99)
- message = "\red They are extremely hungry. A deep growl occasionally rumbles from their empty stomach.\n"
+ message = "They are extremely hungry. A deep growl occasionally rumbles from their empty stomach.\n"
if(100 to 499)
return message //Well that's pretty normal, really.
if(500 to 864) // Fat.
message = "They have a stuffed belly, bloated fat and round from eating too much.\n"
if(1200 to 1934) // One person fully digested.
- message = "\red They are sporting a large, round, sagging stomach. It's contains at least their body weight worth of glorping slush.\n"
+ message = "They are sporting a large, round, sagging stomach. It's contains at least their body weight worth of glorping slush.\n"
if(1935 to 3004) // Two people.
- message = "\red They are engorged with a huge stomach that sags and wobbles as they move. They must have consumed at least twice their body weight. It looks incredibly soft.\n"
+ message = "They are engorged with a huge stomach that sags and wobbles as they move. They must have consumed at least twice their body weight. It looks incredibly soft.\n"
if(3005 to 4074) // Three people.
- message = "\red Their stomach is firmly packed with digesting slop. They must have eaten at least a few times worth their body weight! It looks hard for them to stand, and their gut jiggles when they move.\n"
+ message = "Their stomach is firmly packed with digesting slop. They must have eaten at least a few times worth their body weight! It looks hard for them to stand, and their gut jiggles when they move.\n"
if(4075 to 10000) // Four or more people.
- message = "\red They are so absolutely stuffed that you aren't sure how it's possible to move. They can't seem to swell any bigger. The surface of their belly looks sorely strained!\n"
+ message = "They are so absolutely stuffed that you aren't sure how it's possible to move. They can't seem to swell any bigger. The surface of their belly looks sorely strained!\n"
return message
/mob/living/carbon/human/proc/examine_bellies()
diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
index 3c58ec7442c..0641476189e 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
@@ -79,15 +79,15 @@
user.visible_message("[user] sniffs the air.", "You sniff the air...")
- user << "\blue Smells like:"
+ user << "Smells like:"
if(abs(pressure - ONE_ATMOSPHERE) < 10)
- user << "\blue Pressure: [round(pressure,0.1)] kPa"
+ user << "Pressure: [round(pressure,0.1)] kPa"
else
- user << "\red Pressure: [round(pressure,0.1)] kPa"
+ user << "Pressure: [round(pressure,0.1)] kPa"
if(total_moles)
for(var/g in environment.gas)
- user << "\blue [gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]%"
- user << "\blue Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)"
+ user << "[gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]%"
+ user << "Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)"
/obj/item/device/dogborg/boop_module/afterattack(obj/O, mob/user as mob, proximity)
if(!proximity)
@@ -103,14 +103,14 @@
var/dat = ""
if(O.reagents.reagent_list.len > 0)
for (var/datum/reagent/R in O.reagents.reagent_list)
- dat += "\n \t \blue [R]"
+ dat += "\n \t [R]"
if(dat)
- user << "\blue Your BOOP module indicates: [dat]"
+ user << "Your BOOP module indicates: [dat]"
else
- user << "\blue No active chemical agents smelled in [O]."
+ user << "No active chemical agents smelled in [O]."
else
- user << "\blue No significant chemical agents smelled in [O]."
+ user << "No significant chemical agents smelled in [O]."
return
diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
index 1d2746bdecd..1640ca8f5bc 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
@@ -30,10 +30,10 @@
if(!ishuman(target))
return
if(target.buckled)
- user << "\red The user is buckled and can not be put into your [src.name]."
+ user << "The user is buckled and can not be put into your [src.name]."
return
if(patient)
- user << "\red Your [src.name] is already occupied."
+ user << "Your [src.name] is already occupied."
return
user.visible_message("[hound.name] is ingesting [target.name] into their [src.name].", "You start ingesting [target] into your [src]...")
if(!patient && ishuman(target) && !target.buckled && do_after (user, 50))
@@ -144,12 +144,19 @@
else
dat += "DEAD"
- dat += text("[]\t-Pulse, bpm: []
", (patient.pulse == PULSE_NONE || patient.pulse == PULSE_THREADY ? "" : ""), patient.get_pulse(GETPULSE_TOOL))
- dat += text("[]\t-Overall Health %: []
", (patient.health > 0 ? "" : ""), round(patient.health))
- dat += text("[]\t-Brute Damage %: []
", (patient.getBruteLoss() < 60 ? "" : ""), patient.getBruteLoss())
- dat += text("[]\t-Respiratory Damage %: []
", (patient.getOxyLoss() < 60 ? "" : ""), patient.getOxyLoss())
- dat += text("[]\t-Toxin Content %: []
", (patient.getToxLoss() < 60 ? "" : ""), patient.getToxLoss())
- dat += text("[]\t-Burn Severity %: []
", (patient.getFireLoss() < 60 ? "" : ""), patient.getFireLoss())
+ var/pulsecolor = (patient.pulse == PULSE_NONE || patient.pulse == PULSE_THREADY ? "color:red;" : "color:white;")
+ var/healthcolor = (patient.health > 0 ? "color:white;" : "color:red;")
+ var/brutecolor = (patient.getBruteLoss() < 60 ? "color:gray;" : "color:red;")
+ var/o2color = (patient.getOxyLoss() < 60 ? "color:gray;" : "color:red;")
+ var/toxcolor = (patient.getToxLoss() < 60 ? "color:gray;" : "color:red;")
+ var/burncolor = (patient.getFireLoss() < 60 ? "color:gray;" : "color:red;")
+
+ dat += "\t-Pulse, bpm: [patient.get_pulse(GETPULSE_TOOL)]
"
+ dat += "\t-Overall Health %: [round(patient.health)]
"
+ dat += "\t-Brute Damage %: [patient.getBruteLoss()]
"
+ dat += "\t-Respiratory Damage %: [patient.getOxyLoss()]
"
+ dat += "\t-Toxin Content %: [patient.getToxLoss()]
"
+ dat += "\t-Burn Severity %: [patient.getFireLoss()]
"
if(round(patient.paralysis / 4) >= 1)
dat += text("
Patient paralyzed for: []
", round(patient.paralysis / 4) >= 1 ? "[round(patient.paralysis / 4)] seconds" : "None")
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi_vr.dm b/code/modules/mob/living/simple_animal/friendly/corgi_vr.dm
index e7c13f0e9e6..cff32274395 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi_vr.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi_vr.dm
@@ -21,13 +21,13 @@
//helmet and armor = 100% protection
if( istype(inventory_head,/obj/item/clothing/head/helmet) && istype(inventory_back,/obj/item/clothing/suit/armor) )
if( O.force )
- usr << "\red This animal is wearing too much armor. You can't cause /him any damage."
+ usr << "This animal is wearing too much armor. You can't cause them any damage."
for (var/mob/M in viewers(src, null))
- M.show_message("\red \b [user] hits [src] with the [O], however [src] is too armored.")
+ M.show_message("[user] hits [src] with the [O], however [src] is too armored.")
else
- usr << "\red This animal is wearing too much armor. You can't reach its skin."
+ usr << "This animal is wearing too much armor. You can't reach its skin."
for (var/mob/M in viewers(src, null))
- M.show_message("\red [user] gently taps [src] with the [O]. ")
+ M.show_message("[user] gently taps [src] with the [O].")
if(prob(15))
visible_emote("looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression on \his face")
return
@@ -72,12 +72,12 @@
return
var/add_to = href_list["add_inv"]
if(!usr.get_active_hand())
- usr << "\red You have nothing in your hand to put on its [add_to]."
+ usr << "You have nothing in your hand to put on its [add_to]."
return
switch(add_to)
if("head")
if(inventory_head)
- usr << "\red It's is already wearing something."
+ usr << "It's is already wearing something."
return
else
place_on_head(usr.get_active_hand())
@@ -91,11 +91,7 @@
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/head/caphat,
/obj/item/clothing/head/that,
-// /obj/item/clothing/head/accessory/kitty,
-// /obj/item/clothing/head/collectable/kitty,
-// /obj/item/clothing/head/accessory/bunny,
/obj/item/clothing/head/beret,
-// /obj/item/clothing/head/det_hat,
/obj/item/clothing/head/nursehat,
/obj/item/clothing/head/pirate,
/obj/item/clothing/head/ushanka,
@@ -119,7 +115,7 @@
)
if( ! ( item_to_add.type in allowed_types ) )
- usr << "\red It doesn't seem too keen on wearing that item."
+ usr << "It doesn't seem too keen on wearing that item."
return
usr.drop_item()
@@ -128,7 +124,7 @@
if("back")
if(inventory_back)
- usr << "\red It's already wearing something."
+ usr << "It's already wearing something."
return
else
var/obj/item/item_to_add = usr.get_active_hand()
@@ -144,15 +140,13 @@
)
if( ! ( item_to_add.type in allowed_types ) )
- usr << "\red This object won't fit."
+ usr << "This object won't fit."
return
usr.drop_item()
item_to_add.loc = src
src.inventory_back = item_to_add
regenerate_icons()
-
- //show_inv(usr) //Commented out because changing Ian's name and then calling up his inventory opens a new inventory...which is annoying.
else
..()
diff --git a/code/modules/vore/appearance/spider_taur_powers_vr.dm b/code/modules/vore/appearance/spider_taur_powers_vr.dm
index e90003b3cdd..020b482a8c8 100644
--- a/code/modules/vore/appearance/spider_taur_powers_vr.dm
+++ b/code/modules/vore/appearance/spider_taur_powers_vr.dm
@@ -23,7 +23,7 @@ mob/proc/weaveWeb()
set name = "Weave Web"
set category = "Species Powers"
if(nutrition >= 500) //People decided to abuse it. Sorry. It was asked to be made so it couldn't be spammed, and what do ya know, people are spamming it everywhere.
- src.visible_message("\blue \the [src] weaves a web from their spinneret silk.")
+ src.visible_message("\the [src] weaves a web from their spinneret silk.")
nutrition -= 500
spawn(30) //3 seconds to form
new /obj/effect/spider/stickyweb(src.loc)
@@ -35,7 +35,7 @@ mob/proc/weaveWebBindings()
set name = "Weave Web Bindings"
set category = "Species Powers"
if(nutrition >= 30) //This isn't a huge problem. This is so you can bind people up.
- src.visible_message("\blue \the [src] pulls silk from their spinneret and delicately weaves it into bindings.")
+ src.visible_message("\the [src] pulls silk from their spinneret and delicately weaves it into bindings.")
nutrition -= 30
spawn(30) //5 seconds to weave the bindings~
var/obj/item/clothing/suit/web_bindings/bindings = new() //This sprite is amazing, I must say.
diff --git a/code/modules/vore/eating/simple_animal_vr.dm b/code/modules/vore/eating/simple_animal_vr.dm
index b68ba316ddc..ddd8b017d60 100644
--- a/code/modules/vore/eating/simple_animal_vr.dm
+++ b/code/modules/vore/eating/simple_animal_vr.dm
@@ -25,7 +25,7 @@
var/datum/belly/B = vore_organs[vore_selected]
if(faction != usr.faction)
- usr << "\red This predator isn't friendly, and doesn't give a shit about your opinions of it digesting you."
+ usr << "This predator isn't friendly, and doesn't give a shit about your opinions of it digesting you."
return
if(B.digest_mode == "Hold")
var/confirm = alert(usr, "Enabling digestion on [name] will cause it to digest all stomach contents. Using this to break OOC prefs is against the rules. Digestion will disable itself after 20 minutes.", "Enabling [name]'s Digestion", "Enable", "Cancel")
diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm
index f25c9cebaf2..66cb7aceeb4 100644
--- a/code/modules/vore/eating/vorepanel_vr.dm
+++ b/code/modules/vore/eating/vorepanel_vr.dm
@@ -77,36 +77,34 @@
else
dat += "[B.name]"
+ var/spanstyle
switch(B.digest_mode)
if(DM_HOLD)
- dat += ""
+ spanstyle = ""
if(DM_DIGEST)
- dat += ""
+ spanstyle = "color:red;"
if(DM_HEAL)
- dat += ""
+ spanstyle = "color:green;"
if(DM_ABSORB)
- dat += ""
+ spanstyle = "color:purple;"
if(DM_TRANSFORM_MALE)
- dat += ""
+ spanstyle = "color:purple;"
if(DM_TRANSFORM_FEMALE)
- dat += ""
+ spanstyle = "color:purple;"
if(DM_TRANSFORM_KEEP_GENDER)
- dat += ""
+ spanstyle = "color:purple;"
if(DM_TRANSFORM_CHANGE_SPECIES)
- dat += ""
+ spanstyle = "color:purple;"
if(DM_TRANSFORM_CHANGE_SPECIES_EGG)
- dat += ""
+ spanstyle = "color:purple;"
if(DM_TRANSFORM_KEEP_GENDER_EGG)
- dat += ""
+ spanstyle = "color:purple;"
if(DM_TRANSFORM_MALE_EGG)
- dat += ""
+ spanstyle = "color:purple;"
if(DM_TRANSFORM_FEMALE_EGG)
- dat += ""
+ spanstyle = "color:purple;"
- else
- dat += ""
-
- dat += " ([B.internal_contents.len])"
+ dat += " ([B.internal_contents.len])"
if(user.vore_organs.len < 10)
dat += "New+"
@@ -207,7 +205,7 @@
user << "You begin to push [M] to freedom!"
M << "[usr] begins to push you to freedom!"
- M.loc << "Someone is trying to escape from inside you!"
+ M.loc << "Someone is trying to escape from inside you!"
sleep(50)
if(prob(33))
OB.release_specific_contents(M)
diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm
index 4f166a925f1..9922686901b 100644
--- a/code/modules/vore/fluffstuff/custom_guns_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_guns_vr.dm
@@ -96,7 +96,7 @@
consume_next_projectile()
if(chambered)
return chambered.BB
- usr << "\red It's a single action revolver, pull the hammer back!"
+ usr << "It's a single action revolver, pull the hammer back!"
return null
attack_self(mob/living/user as mob)
@@ -237,13 +237,13 @@
switch(mode)
if(0)
mode = 1
- user.visible_message("\red [src.name] folds up into a cool looking rifle.")
+ user.visible_message("[src.name] folds up into a cool looking rifle.")
force = 5
throwforce = 2
modifystate = crestrose_fold
if(1)
mode = 0 // I feel like this mode should prevent it from shooting. Otherwise, what's the point? -Spades ||Probably need assistance in that. Original design of Crescent Rose is to shoot no matter what form it was in. Perhaps lowering accuracy will provide a con buffer here. -- Joan
- user.visible_message("\red [src.name] changes into a very intimidating looking weapon.")
+ user.visible_message("[src.name] changes into a very intimidating looking weapon.")
force = 40
throwforce = 10
modifystate = crestrose
diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm
index d2609ccd93a..e1a0b6aa070 100644
--- a/code/modules/vore/fluffstuff/custom_items_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_items_vr.dm
@@ -60,7 +60,7 @@
return
playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1)
var/N = new to_type(O.loc)
- user.visible_message("\red [user] opens \the [src] and modifies \the [O] into \the [N].","\red You open \the [src] and modify \the [O] into \the [N].")
+ user.visible_message("[user] opens \the [src] and modifies \the [O] into \the [N].","You open \the [src] and modify \the [O] into \the [N].")
qdel(O)
parts &= ~flag
if(!parts)
@@ -99,11 +99,11 @@
attack_self(mob/user as mob)
if(isliving(user))
- user.visible_message("\red [user] flashes their golden security badge.\nIt reads:NT Security.","\red You display the faded badge.\nIt reads: NT Security.")
+ user.visible_message("[user] flashes their golden security badge.\nIt reads:NT Security.","You display the faded badge.\nIt reads: NT Security.")
attack(mob/living/carbon/human/M, mob/living/user)
if(isliving(user))
- user.visible_message("\red [user] invades [M]'s personal space, thrusting [src] into their face insistently.","\red You invade [M]'s personal space, thrusting [src] into their face insistently.")
+ user.visible_message("[user] invades [M]'s personal space, thrusting [src] into their face insistently.","You invade [M]'s personal space, thrusting [src] into their face insistently.")
//JoanRisu:Joan Risu
/obj/item/device/pda/heads/hos/fluff/joanpda