mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-22 12:29:46 +01:00
Removes all \red and \blue's (#2309)
Removes all \red's and \blues in favor of span classes. \red things that were bold were replaced with danger because it's warning but bold.
This commit is contained in:
@@ -433,22 +433,22 @@ var/list/global/slot_flags_enumeration = list(
|
||||
if(!usr.canmove || usr.stat || usr.restrained() || !Adjacent(usr))
|
||||
return
|
||||
if((!istype(usr, /mob/living/carbon)) || (istype(usr, /mob/living/carbon/brain)))//Is humanoid, and is not a brain
|
||||
usr << "\red You can't pick things up!"
|
||||
usr << "<span class='warning'>You can't pick things up!</span>"
|
||||
return
|
||||
if( usr.stat || usr.restrained() )//Is not asleep/dead and is not restrained
|
||||
usr << "\red You can't pick things up!"
|
||||
usr << "<span class='warning'>You can't pick things up!</span>"
|
||||
return
|
||||
if(I.anchored) //Object isn't anchored
|
||||
usr << "\red You can't pick that up!"
|
||||
usr << "<span class='warning'>You can't pick that up!</span>"
|
||||
return
|
||||
if(!usr.hand && usr.r_hand) //Right hand is not full
|
||||
usr << "\red Your right hand is full."
|
||||
usr << "<span class='warning'>Your right hand is full.</span>"
|
||||
return
|
||||
if(usr.hand && usr.l_hand) //Left hand is not full
|
||||
usr << "\red Your left hand is full."
|
||||
usr << "<span class='warning'>Your left hand is full.</span>"
|
||||
return
|
||||
if(!istype(I.loc, /turf)) //Object is on a turf
|
||||
usr << "\red You can't pick that up!"
|
||||
usr << "<span class='warning'>You can't pick that up!</span>"
|
||||
return
|
||||
//All checks are done, time to pick it up!
|
||||
usr.UnarmedAttack(I)
|
||||
|
||||
@@ -138,7 +138,7 @@
|
||||
break
|
||||
|
||||
if (!bulb)
|
||||
user << "\red There are no more working lights left in the box!"
|
||||
user << "<span class='warning'>There are no more working lights left in the box!</span>"
|
||||
return
|
||||
|
||||
if (do_after(user, load_interval, needhand = 0) && boxstartloc == box.loc && ourstartloc == src.loc)
|
||||
@@ -148,7 +148,7 @@
|
||||
box.remove_from_storage(bulb,get_turf(box))
|
||||
qdel(bulb)
|
||||
else
|
||||
user << "\red You need to keep the [src] close to the box!"
|
||||
user << "<span class='warning'>You need to keep the [src] close to the box!</span>"
|
||||
return
|
||||
|
||||
user << "<span class='notice'>The [src]'s refill light shines a solid green, indicating it's full and ready to go!</span>"
|
||||
|
||||
@@ -162,17 +162,17 @@
|
||||
|
||||
if (istype(A, /obj/item/toy/ammo/gun))
|
||||
if (src.bullets >= 7)
|
||||
user << "\blue It's already fully loaded!"
|
||||
user << "<span class='notice'>It's already fully loaded!</span>"
|
||||
return 1
|
||||
if (A.amount_left <= 0)
|
||||
user << "\red There is no more caps!"
|
||||
user << "<span class='warning'>There is no more caps!</span>"
|
||||
return 1
|
||||
if (A.amount_left < (7 - src.bullets))
|
||||
src.bullets += A.amount_left
|
||||
user << text("\red You reload [] caps\s!", A.amount_left)
|
||||
user << text("<span class='warning'>You reload [] caps\s!</span>", A.amount_left)
|
||||
A.amount_left = 0
|
||||
else
|
||||
user << text("\red You reload [] caps\s!", 7 - src.bullets)
|
||||
user << text("<span class='warning'>You reload [] caps\s!</span>", 7 - src.bullets)
|
||||
A.amount_left -= 7 - src.bullets
|
||||
src.bullets = 7
|
||||
A.update_icon()
|
||||
@@ -183,17 +183,17 @@
|
||||
if (flag)
|
||||
return
|
||||
if (!usr.IsAdvancedToolUser())
|
||||
usr << "\red You don't have the dexterity to do this!"
|
||||
usr << "<span class='warning'>You don't have the dexterity to do this!</span>"
|
||||
return
|
||||
src.add_fingerprint(user)
|
||||
if (src.bullets < 1)
|
||||
user.show_message("\red *click* *click*", 2)
|
||||
user.show_message("<span class='warning'>*click* *click*</span>", 2)
|
||||
playsound(user, 'sound/weapons/empty.ogg', 100, 1)
|
||||
return
|
||||
playsound(user, 'sound/weapons/Gunshot.ogg', 100, 1)
|
||||
src.bullets--
|
||||
for(var/mob/O in viewers(user, null))
|
||||
O.show_message(text("\red <B>[] fires a cap gun at []!</B>", user, target), 1, "\red You hear a gunshot", 2)
|
||||
O.show_message(text("<span class='danger'>[] fires a cap gun at []!</span>", user, target), 1, "<span class='warning'>You hear a gunshot</span>", 2)
|
||||
|
||||
/obj/item/toy/ammo/gun
|
||||
name = "ammo-caps"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
if(istype(I,/obj/item/weapon/screwdriver))
|
||||
machine_dir = turn(machine_dir, 90)
|
||||
init_dirs = machine_dir
|
||||
user.visible_message("\blue \The [user] adjusts the jumper on the [src]'s port configuration pins.", "\blue You adjust the jumper on the port configuration pins. Now set to [dir2text(machine_dir)].")
|
||||
user.visible_message("<span class='notice'>\The [user] adjusts the jumper on the [src]'s port configuration pins.</span>", "<span class='notice'>You adjust the jumper on the port configuration pins. Now set to [dir2text(machine_dir)].</span>")
|
||||
return
|
||||
|
||||
/obj/item/weapon/circuitboard/unary_atmos/examine()
|
||||
|
||||
@@ -159,10 +159,10 @@
|
||||
if(istype(A,/obj/structure/window))
|
||||
var/obj/structure/window/W = A
|
||||
W.shatter()
|
||||
<<<<<<< HEAD:code/game/objects/items/weapons/material/twohanded.dm
|
||||
<<<<<<< HEAD:code/game/objects/items/weapons/material/twohanded.dm
|
||||
|
||||
/*
|
||||
=======
|
||||
=======
|
||||
else if(istype(A,/obj/structure/grille))
|
||||
qdel(A)
|
||||
else if(istype(A,/obj/effect/plant))
|
||||
@@ -170,7 +170,7 @@
|
||||
P.die_off()
|
||||
|
||||
qdel(A)
|
||||
>>>>>>> 284d1cc1f5c67503fe0da89ce01985d73bb02038:code/game/objects/items/weapons/twohanded.dm
|
||||
>>>>>>> 284d1cc1f5c67503fe0da89ce01985d73bb02038:code/game/objects/items/weapons/twohanded.dm
|
||||
/*
|
||||
* Double-Bladed Energy Swords - Cheridan
|
||||
*/
|
||||
@@ -199,7 +199,7 @@
|
||||
/obj/item/weapon/material/twohanded/dualsaber/attack(target as mob, mob/living/user as mob)
|
||||
..()
|
||||
if((CLUMSY in user.mutations) && (wielded) &&prob(40))
|
||||
user << "\red You twirl around a bit before losing your balance and impaling yourself on the [src]."
|
||||
user << "<span class='warning'>You twirl around a bit before losing your balance and impaling yourself on the [src].</span>"
|
||||
user.take_organ_damage(20,25)
|
||||
return
|
||||
if((wielded) && prob(50))
|
||||
|
||||
@@ -142,12 +142,12 @@
|
||||
/obj/item/weapon/melee/energy/glaive/activate(mob/living/user)
|
||||
..()
|
||||
icon_state = "eglaive1"
|
||||
user << "\blue \The [src] is now energised."
|
||||
user << "<span class='notice'>\The [src] is now energised.</span>"
|
||||
|
||||
/obj/item/weapon/melee/energy/glaive/deactivate(mob/living/user)
|
||||
..()
|
||||
icon_state = initial(icon_state)
|
||||
user << "\blue \The [src] is de-energised."
|
||||
user << "<span class='notice'>\The [src] is de-energised.</span>"
|
||||
|
||||
/*
|
||||
* Energy Axe
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
|
||||
/*
|
||||
/obj/item/weapon/melee/chainsword/suicide_act(mob/user)
|
||||
viewers(user) << "\red <b>[user] is slicing \himself apart with the [src.name]! It looks like \he's trying to commit suicide.</b>"
|
||||
viewers(user) << "<span class='danger'>[user] is slicing \himself apart with the [src.name]! It looks like \he's trying to commit suicide.</span>"
|
||||
return (BRUTELOSS|OXYLOSS)
|
||||
*/
|
||||
|
||||
|
||||
@@ -61,9 +61,9 @@
|
||||
handle_item_insertion(L, 1)//value of 1 suppresses confirmation messages from this one
|
||||
|
||||
if (count)
|
||||
user << "\blue You empty [count] broken bulbs into the trashbag."
|
||||
user << "<span class='notice'>You empty [count] broken bulbs into the trashbag.</span>"
|
||||
else if (!bagfull)
|
||||
user << "\blue There are no broken bulbs to empty out."
|
||||
user << "<span class='notice'>There are no broken bulbs to empty out.</span>"
|
||||
return 1
|
||||
..()
|
||||
|
||||
|
||||
@@ -457,7 +457,7 @@
|
||||
var/obj/item/weapon/tray/T = W
|
||||
if(T.current_weight > 0)
|
||||
T.spill(user)
|
||||
user << "\red Trying to place a loaded tray into [src] was a bad idea."
|
||||
user << "<span class='warning'>Trying to place a loaded tray into [src] was a bad idea.</span>"
|
||||
return
|
||||
|
||||
W.add_fingerprint(user)
|
||||
|
||||
@@ -121,7 +121,7 @@
|
||||
return
|
||||
|
||||
else if (!issilicon(M))//No eye or head protection, tough luck!
|
||||
M << "\red You get slammed in the face with the tray!"
|
||||
M << "<span class='danger'>You get slammed in the face with the tray!</span>"
|
||||
if(prob(33))
|
||||
src.add_blood(M)
|
||||
var/turf/location = H.loc
|
||||
|
||||
@@ -35,19 +35,19 @@
|
||||
var/mob/living/K = M
|
||||
if(cult && (K.mind in cult.current_antagonists) && prob(33))
|
||||
if(do_after(user, 15))
|
||||
K.visible_message("<span class='danger'>\The [user] waves \the [src] over \the [K]'s head, [K] looks captivated by it.</span>", "\red [user] wave's the [src] over your head. <b>You see a foreign light, asking you to follow it. Its presence burns and blinds.</b>")
|
||||
K.visible_message("<span class='danger'>\The [user] waves \the [src] over \the [K]'s head, [K] looks captivated by it.</span>", "<span class='warning'>[user] wave's the [src] over your head. <b>You see a foreign light, asking you to follow it. Its presence burns and blinds.</b></span>")
|
||||
var/choice = alert(K,"Do you want to give up your goal?","Become cleansed","Resist","Give in")
|
||||
switch(choice)
|
||||
if("Resist")
|
||||
K.visible_message("\red The gaze in [K]'s eyes remains determined.", "\blue You turn away from the light, remaining true to your dark lord. <b>Anathema!</b>")
|
||||
K.visible_message("<span class='warning'>The gaze in [K]'s eyes remains determined.</span>", "<span class='notice'>You turn away from the light, remaining true to your dark lord. <b>Anathema!</b></span>")
|
||||
K.say("*scream")
|
||||
K.take_overall_damage(5, 15)
|
||||
if("Give in")
|
||||
K.visible_message("\blue [K]'s eyes become clearer, the evil gone, but not without leaving scars.")
|
||||
K.visible_message("<span class='notice'>[K]'s eyes become clearer, the evil gone, but not without leaving scars.</span>")
|
||||
K.take_overall_damage(15, 30)
|
||||
cult.remove_antagonist(K.mind)
|
||||
else
|
||||
user.visible_message("\red [user]'s concentration is broken!", "\red Your concentration is broken! You and your target need to stay uninterrupted for longer!")
|
||||
user.visible_message("<span class='warning'>[user]'s concentration is broken!</span>", "<span class='warning'>Your concentration is broken! You and your target need to stay uninterrupted for longer!</span>")
|
||||
return
|
||||
else if(prob(10))
|
||||
user << "<span class='danger'>The rod slips in your hand.</span>"
|
||||
|
||||
@@ -125,7 +125,7 @@ var/const/MAX_ACTIVE_TIME = 400
|
||||
if(CONSCIOUS)
|
||||
user << "<span class='warning'>[src] seems to be active.</span>"
|
||||
if (sterile)
|
||||
user << "<span class='warning'> It looks like the proboscis has been removed.</span>"
|
||||
user << "<span class='warning'>It looks like the proboscis has been removed.</span>"
|
||||
return
|
||||
|
||||
/obj/item/clothing/mask/lamarr/attackby(obj/item/I, mob/user)
|
||||
|
||||
Reference in New Issue
Block a user