From 6cf010f7377fc87eb5a0dbfbee8bda5d6a699226 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sun, 28 Dec 2014 02:06:02 -0500 Subject: [PATCH] Converts \green macro to span tag --- .../species/xenomorphs/alien_facehugger.dm | 2 +- .../human/species/xenomorphs/alien_powers.dm | 28 +++++++++---------- .../human/species/xenomorphs/alien_species.dm | 4 +-- code/stylesheet.dm | 5 ++++ 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm index dcc3af220e..6079a3c044 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm @@ -97,7 +97,7 @@ var/const/MAX_ACTIVE_TIME = 400 if(stat == CONSCIOUS) icon_state = "[initial(icon_state)]" throwing = 0 - GoIdle(30,50) //stunned for a few seconds - allows throwing them to be useful for positioning but not as an offensive action (unless you're setting up a trap) + GoIdle(30,100) //stunned for a few seconds - allows throwing them to be useful for positioning but not as an offensive action (unless you're setting up a trap) /obj/item/clothing/mask/facehugger/proc/Attach(M as mob) diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm index 470ab5773b..0f942f3c4d 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm @@ -59,12 +59,12 @@ set category = "Abilities" if (get_dist(src,M) <= 1) - src << "\green You need to be closer." + src << "You need to be closer." return var/datum/organ/internal/xenos/plasmavessel/I = M.internal_organs_by_name["plasma vessel"] if(!istype(I)) - src << "\green Their plasma vessel is missing." + src << "Their plasma vessel is missing." return var/amount = input("Amount:", "Transfer Plasma to [M]") as num @@ -72,8 +72,8 @@ amount = abs(round(amount)) if(check_alien_ability(amount,0,"plasma vessel")) M.gain_plasma(amount) - M << "\green [src] has transfered [amount] plasma to you." - src << "\green You have transferred [amount] plasma to [M]" + M << "[src] has transfered [amount] plasma to you." + src << "You have transferred [amount] plasma to [M]." return // Queen verbs. @@ -93,7 +93,7 @@ return if(check_alien_ability(75,1,"egg sac")) - visible_message("\green [src] has laid an egg!") + visible_message("[src] has laid an egg!") new /obj/effect/alien/egg(loc) return @@ -109,7 +109,7 @@ return if(check_alien_ability(500)) - visible_message("\green [src] begins to twist and contort!", "\green You begin to evolve!") + visible_message("[src] begins to twist and contort!", "You begin to evolve!") src.set_species("Xenomorph Queen") return @@ -120,7 +120,7 @@ set category = "Abilities" if(check_alien_ability(50,1,"resin spinner")) - visible_message("\green [src] has planted some alien weeds!") + visible_message("[src] has planted some alien weeds!") new /obj/effect/alien/weeds/node(loc) return @@ -130,14 +130,14 @@ set category = "Abilities" if(!O in oview(1)) - src << "\green [O] is too far away." + src << "[O] is too far away." return // OBJ CHECK if(isobj(O)) var/obj/I = O if(I.unacidable) //So the aliens don't destroy energy fields/singularies/other aliens/etc with their acid. - src << "\green You cannot dissolve this object." + src << "You cannot dissolve this object." return // TURF CHECK @@ -145,18 +145,18 @@ var/turf/T = O // R WALL if(istype(T, /turf/simulated/wall/r_wall)) - src << "\green You cannot dissolve this object." + src << "You cannot dissolve this object." return // R FLOOR if(istype(T, /turf/simulated/floor/engine)) - src << "\green You cannot dissolve this object." + src << "You cannot dissolve this object." return else// Not a type we can acid. return if(check_alien_ability(200,0,"acid gland")) new /obj/effect/alien/acid(get_turf(O), O) - visible_message("\green [src] vomits globs of vile stuff all over [O]. It begins to sizzle and melt under the bubbling mess of acid!") + visible_message("[src] vomits globs of vile stuff all over [O]. It begins to sizzle and melt under the bubbling mess of acid!") return @@ -172,7 +172,7 @@ src << "You cannot spit neurotoxin in your current state." return - visible_message("[src] spits neurotoxin at [target]!", "\green You spit neurotoxin at [target].") + visible_message("[src] spits neurotoxin at [target]!", "You spit neurotoxin at [target].") //I'm not motivated enough to revise this. Prjectile code in general needs update. // Maybe change this to use throw_at? ~ Z @@ -210,7 +210,7 @@ if(!check_alien_ability(75,1,"resin spinner")) return - visible_message("[src] vomits up a thick purple substance and begins to shape it!", "\green You shape a [choice].") + visible_message("[src] vomits up a thick purple substance and begins to shape it!", "You shape a [choice].") switch(choice) if("resin door") new /obj/structure/mineral_door/resin(loc) diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm index 86593e6e8f..029ca336e2 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm @@ -106,7 +106,7 @@ H.adjustOxyLoss(-heal_rate) H.adjustToxLoss(-heal_rate) if (prob(5)) - H << "\green You feel a soothing sensation come over you..." + H << "You feel a soothing sensation come over you..." return 1 //next mend broken bones, approx 10 ticks each @@ -114,7 +114,7 @@ if (E.status & ORGAN_BROKEN) if (prob(mend_prob)) if (E.mend_fracture()) - H << "\green You feel something mend itself inside your [E.display_name]." + H << "You feel something mend itself inside your [E.display_name]." return 1 return 0 diff --git a/code/stylesheet.dm b/code/stylesheet.dm index c722d86dd5..8a3eaf1a40 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -63,6 +63,8 @@ h1.alert, h2.alert {color: #000000;} .emote {font-style: italic;} +/* Game Messages */ + .attack {color: #ff0000;} .moderate {color: #CC0000;} .disarm {color: #990000;} @@ -73,6 +75,9 @@ h1.alert, h2.alert {color: #000000;} .rose {color: #ff5050;} .info {color: #0000CC;} .notice {color: #000099;} +.alium {color: #00ff00;} + +/* Languages */ .alien {color: #543354;} .tajaran {color: #803B56;}