mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-24 09:03:05 +00:00
Macro Replacements. (#3574)
* A preface to my madness Travis failed one of my PR's because I copied old code that used /red /blue /green. Because of this, I am going to find and replace every instance of it that I find. Also this is a test commit to make sure I'm comitting to the correct branch. * /blue /green /red replacements Dear god. A slow and painful death from acid is more fun than this. I wouldn't wish this torture on my worst enemy. And this is only the beginning * Replace part 2. Time to fix the human error. * Fixes mismatches * Sets macro count to 220 One above the current number of macros in the code. * Fixes last of the mismatches. * Removes spaces, replaces \black Removes spaces Replaces \black in a few areas where seen Replaces \bold with <B> </B> where seen * Updating macro count again * More fixes! * Issues fixed! For real this time! I swear! * Fixing all the merge conflict files.
This commit is contained in:
@@ -23,16 +23,16 @@
|
||||
sandwich_limit += 4
|
||||
|
||||
if(istype(W,/obj/item/weapon/material/shard))
|
||||
user << "\blue You hide [W] in \the [src]."
|
||||
user << "<font color='blue'>You hide [W] in \the [src].</font>"
|
||||
user.drop_item()
|
||||
W.loc = src
|
||||
update()
|
||||
return
|
||||
else if(istype(W,/obj/item/weapon/reagent_containers/food/snacks))
|
||||
if(src.contents.len > sandwich_limit)
|
||||
user << "\red If you put anything else on \the [src] it's going to collapse."
|
||||
user << "<font color='red'>If you put anything else on \the [src] it's going to collapse.</font>"
|
||||
return
|
||||
user << "\blue You layer [W] over \the [src]."
|
||||
user << "<font color='blue'>You layer [W] over \the [src].</font>"
|
||||
var/obj/item/weapon/reagent_containers/F = W
|
||||
F.reagents.trans_to_obj(src, F.reagents.total_volume)
|
||||
user.drop_item()
|
||||
@@ -81,7 +81,7 @@
|
||||
/obj/item/weapon/reagent_containers/food/snacks/csandwich/examine(mob/user)
|
||||
..(user)
|
||||
var/obj/item/O = pick(contents)
|
||||
user << "\blue You think you can see [O.name] in there."
|
||||
user << "<font color='blue'>You think you can see [O.name] in there.</font>"
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/csandwich/attack(mob/M as mob, mob/user as mob, def_zone)
|
||||
|
||||
@@ -96,6 +96,6 @@
|
||||
H = M
|
||||
|
||||
if(H && shard && M == user) //This needs a check for feeding the food to other people, but that could be abusable.
|
||||
H << "\red You lacerate your mouth on a [shard.name] in the sandwich!"
|
||||
H.adjustBruteLoss(5) //TODO: Target head if human.
|
||||
H << "<font color='red'>You lacerate your mouth on a [shard.name] in the sandwich!</font>"
|
||||
H.adjustBruteLoss(5) //TODO: Target head if human. //This TODO has been here for 4 years.
|
||||
..()
|
||||
|
||||
@@ -130,11 +130,11 @@
|
||||
if (bitecount==0)
|
||||
return
|
||||
else if (bitecount==1)
|
||||
user << "\blue \The [src] was bitten by someone!"
|
||||
user << "<font color='blue'>\The [src] was bitten by someone!</font>"
|
||||
else if (bitecount<=3)
|
||||
user << "\blue \The [src] was bitten [bitecount] times!"
|
||||
user << "<font color='blue'>\The [src] was bitten [bitecount] times!</font>"
|
||||
else
|
||||
user << "\blue \The [src] was bitten multiple times!"
|
||||
user << "<font color='blue'>\The [src] was bitten multiple times!</font>"
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
if(istype(W,/obj/item/weapon/storage))
|
||||
@@ -149,12 +149,12 @@
|
||||
U.create_reagents(5)
|
||||
|
||||
if (U.reagents.total_volume > 0)
|
||||
user << "\red You already have something on your [U]."
|
||||
user << "<font color='red'>You already have something on your [U].</font>"
|
||||
return
|
||||
|
||||
user.visible_message( \
|
||||
"[user] scoops up some [src] with \the [U]!", \
|
||||
"\blue You scoop up some [src] with \the [U]!" \
|
||||
"<font color='blue'>You scoop up some [src] with \the [U]!</font>" \
|
||||
)
|
||||
|
||||
src.bitecount++
|
||||
@@ -536,7 +536,7 @@
|
||||
..()
|
||||
new/obj/effect/decal/cleanable/egg_smudge(src.loc)
|
||||
src.reagents.splash(hit_atom, reagents.total_volume)
|
||||
src.visible_message("\red [src.name] has been squashed.","\red You hear a smack.")
|
||||
src.visible_message("<font color='red'>[src.name] has been squashed.</font>","<font color='red'>You hear a smack.</font>")
|
||||
qdel(src)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
@@ -545,10 +545,10 @@
|
||||
var/clr = C.colourName
|
||||
|
||||
if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow")))
|
||||
usr << "\blue The egg refuses to take on this color!"
|
||||
usr << "<font color='blue'>The egg refuses to take on this color!</font>"
|
||||
return
|
||||
|
||||
usr << "\blue You color \the [src] [clr]"
|
||||
usr << "<font color='blue'>You color \the [src] [clr]</font>"
|
||||
icon_state = "egg-[clr]"
|
||||
else
|
||||
..()
|
||||
@@ -1262,7 +1262,7 @@
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/popcorn/On_Consume()
|
||||
if(prob(unpopped)) //lol ...what's the point?
|
||||
usr << "\red You bite down on an un-popped kernel!"
|
||||
usr << "<font color='red'>You bite down on an un-popped kernel!</font>"
|
||||
unpopped = max(0, unpopped-1)
|
||||
..()
|
||||
|
||||
|
||||
@@ -258,7 +258,7 @@
|
||||
|
||||
if (target != user && H.getarmor(target_zone, "melee") > 5 && prob(50))
|
||||
for(var/mob/O in viewers(world.view, user))
|
||||
O.show_message(text("\red <B>[user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!</B>"), 1)
|
||||
O.show_message(text("<font color='red'><B>[user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!</B></font>"), 1)
|
||||
user.remove_from_mob(src)
|
||||
qdel(src)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user