cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

spans and \the

Browse Source
This commit is contained in:
Fox-McCloud
2016-07-22 19:07:23 -04:00
parent 7bfd7931b4
commit 25faa3b90a
8 changed files with 48 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Machinery.dm
+8 -9
View File
@@ -207,7 +207,7 @@
S.use(1)
else
if(!user.drop_item())
to_chat(user, "<span class='warning'>\The [B] is stuck to you!</span>")
to_chat(user, "<span class='warning'>[B] is stuck to you!</span>")
return
qdel(B)
broken_requirements -= broken_requirements[1]
@@ -221,7 +221,7 @@
if(istype(B, /obj/item/weapon/reagent_containers/glass) || istype(B, /obj/item/weapon/reagent_containers/food/drinks))
beaker = B
if(!user.drop_item())
to_chat(user, "<span class='warning'>\The [B] is stuck to you!</span>")
to_chat(user, "<span class='warning'>[B] is stuck to you!</span>")
return
B.forceMove(src)
to_chat(user, "<span class='notice'>You set [B] on the machine.</span>")
@@ -362,10 +362,10 @@
playsound(src, 'sound/items/Ratchet.ogg', 50, 1)
if(anchored)
anchored = 0
to_chat(user, "<span class='caution'>\The [src] can now be moved.</span>")
to_chat(user, "<span class='caution'>[src] can now be moved.</span>")
else if(!anchored)
anchored = 1
to_chat(user, "<span class='caution'>\The [src] is now secured.</span>")
to_chat(user, "<span class='caution'>[src] is now secured.</span>")
if(panel_open)
if(istype(I, /obj/item/weapon/crowbar))
@@ -434,7 +434,7 @@
to_chat(user, "<span class='warning'>A beaker is already loaded into the machine.</span>")
return
if(!user.drop_item())
to_chat(user, "<span class='warning'>\The [B] is stuck to you!</span>")
to_chat(user, "<span class='warning'>[B] is stuck to you!</span>")
return
beaker = B
B.forceMove(src)
@@ -449,7 +449,7 @@
return
if(!user.drop_item())
to_chat(user, "<span class='warning'>\The [B] is stuck to you!</span>")
to_chat(user, "<span class='warning'>[B] is stuck to you!</span>")
return
loaded_pill_bottle = B
B.forceMove(src)
@@ -478,8 +478,7 @@
if(href_list["print_p"])
if(!(printing))
printing = 1
for(var/mob/O in viewers(usr))
O.show_message("\blue \the [src] rattles and prints out a sheet of paper.", 1)
visible_message("<span class='notice'>[src] rattles and prints out a sheet of paper.</span>")
playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1)
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(loc)
P.info = "<CENTER><B>Chemical Analysis</B></CENTER><BR>"
@@ -884,7 +883,7 @@
return 1
else
if(!user.drop_item())
to_chat(user, "<span class='warning'>\The [O] is stuck to you!</span>")
to_chat(user, "<span class='warning'>[O] is stuck to you!</span>")
return
beaker = O
O.forceMove(src)
code/modules/reagents/newchem/toxins.dm
+1 -1
View File
@@ -335,7 +335,7 @@
if(!O.unacidable)
var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(O.loc)
I.desc = "Looks like this was \an [O] some time ago."
O.visible_message("<span class='warning'>\the [O] melts.</span>")
O.visible_message("<span class='warning'>[O] melts.</span>")
qdel(O)
/datum/chemical_reaction/facid
code/modules/reagents/oldchem/reagents/reagents_toxin.dm
+12 -12
View File
@@ -53,7 +53,7 @@
/datum/reagent/slimejelly/on_mob_life(mob/living/M)
if(prob(10))
to_chat(M, "\red Your insides are burning!")
to_chat(M, "<span class='danger'>Your insides are burning!</span>")
M.adjustToxLoss(rand(20,60)*REM)
else if(prob(40))
M.adjustBruteLoss(-5*REM)
@@ -70,10 +70,10 @@
if(ishuman(M))
var/mob/living/carbon/human/human = M
if(human.species.name != "Shadow")
to_chat(M, "\red Your flesh rapidly mutates!")
to_chat(M, "<b>You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.</b>")
to_chat(M, "\red Your body reacts violently to light. \green However, it naturally heals in darkness.")
to_chat(M, "Aside from your new traits, you are mentally unchanged and retain your prior obligations.")
to_chat(M, "<span class='danger'>Your flesh rapidly mutates!</span>")
to_chat(M, "<span class='danger'>You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.</span>")
to_chat(M, "<span class='danger'>Your body reacts violently to light. \green However, it naturally heals in darkness.</span>")
to_chat(M, "<span class='danger'>Aside from your new traits, you are mentally unchanged and retain your prior obligations.</span>")
human.set_species("Shadow")
..()
@@ -224,11 +224,11 @@
if(volume > 25)
if(H.wear_mask)
to_chat(H, "\red Your mask protects you from the acid!")
to_chat(H, "<span class='danger'>Your mask protects you from the acid!</span>")
return
if(H.head)
to_chat(H, "\red Your helmet protects you from the acid!")
to_chat(H, "<span class='danger'>Your helmet protects you from the acid!</span>")
return
if(!M.unacidable)
@@ -272,7 +272,7 @@
if(!O.unacidable)
var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(O.loc)
I.desc = "Looks like this was \an [O] some time ago."
O.visible_message("<span class='warning'>\the [O] melts.</span>")
O.visible_message("<span class='warning'>[O] melts.</span>")
qdel(O)
@@ -379,10 +379,10 @@
if( !safe_thing )
safe_thing = victim.glasses
if( eyes_covered && mouth_covered )
to_chat(victim, "\red Your [safe_thing] protects you from the pepperspray!")
to_chat(victim, "<span class='danger'>Your [safe_thing] protects you from the pepperspray!</span>")
return
else if( mouth_covered ) // Reduced effects if partially protected
to_chat(victim, "\red Your [safe_thing] protect you from most of the pepperspray!")
to_chat(victim, "<span class='danger'>Your [safe_thing] protect you from most of the pepperspray!</span>")
if(prob(5))
victim.emote("scream")
victim.eye_blurry = max(M.eye_blurry, 3)
@@ -393,14 +393,14 @@
victim.drop_item()
return
else if( eyes_covered ) // Eye cover is better than mouth cover
to_chat(victim, "\red Your [safe_thing] protects your eyes from the pepperspray!")
to_chat(victim, "<span class='danger'>Your [safe_thing] protects your eyes from the pepperspray!</span>")
victim.eye_blurry = max(M.eye_blurry, 3)
victim.damageoverlaytemp = 30
return
else // Oh dear :D
if(prob(5))
victim.emote("scream")
to_chat(victim, "\red You're sprayed directly in the eyes with pepperspray!")
to_chat(victim, "<span class='danger'>You're sprayed directly in the eyes with pepperspray!</span>")
victim.eye_blurry = max(M.eye_blurry, 5)
victim.eye_blind = max(M.eye_blind, 2)
victim.confused = max(M.confused, 6)
code/modules/reagents/reagent_containers.dm
+1 -1
View File
@@ -80,7 +80,7 @@
/obj/item/weapon/reagent_containers/wash(mob/user, atom/source)
if(is_open_container())
if(reagents.total_volume >= volume)
to_chat(user, "<span class='warning'>\The [src] is full.</span>")
to_chat(user, "<span class='warning'>[src] is full.</span>")
return
else
reagents.add_reagent("water", min(volume - reagents.total_volume, amount_per_transfer_from_this))
code/modules/reagents/reagent_containers/dropper.dm
+9 -11
View File
@@ -18,11 +18,11 @@
if(filled)
if(target.reagents.total_volume >= target.reagents.maximum_volume)
to_chat(user, "\red [target] is full.")
to_chat(user, "<span class='warning'>[target] is full.</span>")
return
if(!target.is_open_container() && !ismob(target) && !istype(target,/obj/item/weapon/reagent_containers/food) && !istype(target, /obj/item/clothing/mask/cigarette)) //You can inject humans and food but you cant remove the shit.
to_chat(user, "\red You cannot directly fill this object.")
to_chat(user, "<span class='warning'>You cannot directly fill this object.</span>")
return
var/trans = 0
@@ -47,22 +47,20 @@
safe_thing.create_reagents(100)
trans = reagents.trans_to(safe_thing, amount_per_transfer_from_this)
for(var/mob/O in viewers(world.view, user))
O.show_message(text("\red <B>[] tries to squirt something into []'s eyes, but fails!</B>", user, target), 1)
visible_message("<span class='danger'>[user] tries to squirt something into [victim]'s eyes, but fails!</span>")
spawn(5)
reagents.reaction(safe_thing, TOUCH)
to_chat(user, "\blue You transfer [trans] units of the solution.")
to_chat(user, "<span class='notice'>You transfer [trans] units of the solution.</span>")
if(reagents.total_volume<=0)
filled = 0
icon_state = "[initial(icon_state)]"
return
for(var/mob/O in viewers(world.view, user))
O.show_message(text("\red <B>[] squirts something into []'s eyes!</B>", user, target), 1)
visible_message("<span class='danger'>[user] squirts something into [target]'s eyes!</span>")
reagents.reaction(target, TOUCH)
var/mob/living/M = target
@@ -81,7 +79,7 @@
M.LAssailant = user
trans = reagents.trans_to(target, amount_per_transfer_from_this)
to_chat(user, "\blue You transfer [trans] units of the solution.")
to_chat(user, "<span class='notice'>You transfer [trans] units of the solution.</span>")
if(reagents.total_volume<=0)
filled = 0
icon_state = "[initial(icon_state)]"
@@ -89,16 +87,16 @@
else
if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers))
to_chat(user, "\red You cannot directly remove reagents from [target].")
to_chat(user, "<span class='warning'>You cannot directly remove reagents from [target].</span>")
return
if(!target.reagents.total_volume)
to_chat(user, "\red [target] is empty.")
to_chat(user, "<span class='warning'>[target] is empty.</span>")
return
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this)
to_chat(user, "\blue You fill the [src] with [trans] units of the solution.")
to_chat(user, "<span class='notice'>You fill [src] with [trans] units of the solution.</span>")
filled = 1
icon_state = "[initial(icon_state)][filled]"
code/modules/reagents/reagent_containers/glass_containers.dm
+4 -4
View File
@@ -54,10 +54,10 @@
/obj/item/weapon/reagent_containers/glass/attack_self()
..()
if(is_open_container())
to_chat(usr, "<span class='notice'>You put the lid on \the [src].</span>")
to_chat(usr, "<span class='notice'>You put the lid on [src].</span>")
flags ^= OPENCONTAINER
else
to_chat(usr, "<span class='notice'>You take the lid off \the [src].</span>")
to_chat(usr, "<span class='notice'>You take the lid off [src].</span>")
flags |= OPENCONTAINER
update_icon()
@@ -208,7 +208,7 @@
if(usr.incapacitated())
return
if(assembly)
to_chat(usr, "<span class='notice'>You detach [assembly] from \the [src]</span>")
to_chat(usr, "<span class='notice'>You detach [assembly] from [src]</span>")
usr.put_in_hands(assembly)
assembly = null
update_icon()
@@ -223,7 +223,7 @@
/obj/item/weapon/reagent_containers/glass/beaker/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/device/assembly_holder) && can_assembly)
if(assembly)
to_chat(usr, "<span class='warning'>The [src] already has an assembly.</span>")
to_chat(usr, "<span class='warning'>[src] already has an assembly.</span>")
return ..()
assembly = W
user.drop_item()
code/modules/reagents/reagent_containers/spray.dm
+5 -5
View File
@@ -27,19 +27,19 @@
if(istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1) //this block copypasted from reagent_containers/glass, for lack of a better solution
if(!A.reagents.total_volume && A.reagents)
to_chat(user, "<span class='notice'>\The [A] is empty.</span>")
to_chat(user, "<span class='notice'>[A] is empty.</span>")
return
if(reagents.total_volume >= reagents.maximum_volume)
to_chat(user, "<span class='notice'>\The [src] is full.</span>")
to_chat(user, "<span class='notice'>[src] is full.</span>")
return
var/trans = A.reagents.trans_to(src, A:amount_per_transfer_from_this)
to_chat(user, "<span class='notice'>You fill \the [src] with [trans] units of the contents of \the [A].</span>")
to_chat(user, "<span class='notice'>You fill [src] with [trans] units of the contents of [A].</span>")
return
if(reagents.total_volume < amount_per_transfer_from_this)
to_chat(user, "<span class='notice'>\The [src] is empty!</span>")
to_chat(user, "<span class='notice'>[src] is empty!</span>")
return
spray(A)
@@ -95,7 +95,7 @@
if(alert(usr, "Are you sure you want to empty that?", "Empty Bottle:", "Yes", "No") != "Yes")
return
if(isturf(usr.loc) && loc == usr)
to_chat(usr, "<span class='notice'>You empty \the [src] onto the floor.</span>")
to_chat(usr, "<span class='notice'>You empty [src] onto the floor.</span>")
reagents.reaction(usr.loc)
reagents.clear_reagents()
code/modules/reagents/reagent_dispenser.dm
+8 -8
View File
@@ -26,12 +26,12 @@
/obj/structure/reagent_dispensers/examine(mob/user)
if(!..(user, 2))
return
to_chat(user, "\blue It contains:")
to_chat(user, "<span class='notice'>It contains:</span>")
if(reagents && reagents.reagent_list.len)
for(var/datum/reagent/R in reagents.reagent_list)
to_chat(user, "\blue [R.volume] units of [R.name]")
to_chat(user, "<span class='notice'>[R.volume] units of [R.name]</span>")
else
to_chat(user, "\blue Nothing.")
to_chat(user, "<span class='notice'>Nothing.</span>")
/obj/structure/reagent_dispensers/verb/set_APTFT() //set amount_per_transfer_from_this
set name = "Set transfer amount"
@@ -132,9 +132,9 @@
/obj/structure/reagent_dispensers/fueltank/attack_hand()
if(rig)
usr.visible_message("[usr] begins to detach [rig] from \the [src].", "You begin to detach [rig] from \the [src]")
usr.visible_message("[usr] begins to detach [rig] from [src].</span>", "You begin to detach [rig] from [src].</span>")
if(do_after(usr, 20, target = src))
usr.visible_message("\blue [usr] detaches [rig] from \the [src].", "\blue You detach [rig] from \the [src]")
usr.visible_message("<span class='notice'>[usr] detaches [rig] from [src].</span>", "<span class='notice'>You detach [rig] from [src].</span>")
rig.loc = get_turf(usr)
rig = null
overlays = new/list()
@@ -142,11 +142,11 @@
/obj/structure/reagent_dispensers/fueltank/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W,/obj/item/device/assembly_holder) && accepts_rig)
if(rig)
to_chat(user, "\red There is another device in the way.")
to_chat(user, "<span class='warning'>There is another device in the way.</span>")
return ..()
user.visible_message("[user] begins rigging [W] to \the [src].", "You begin rigging [W] to \the [src]")
user.visible_message("[user] begins rigging [W] to [src].", "You begin rigging [W] to [src]")
if(do_after(user, 20, target = src))
user.visible_message("\blue [user] rigs [W] to \the [src].", "\blue You rig [W] to \the [src]")
user.visible_message("<span class='notice'>[user] rigs [W] to [src].</span>", "<span class='notice'>You rig [W] to [src].</span>")
var/obj/item/device/assembly_holder/H = W
if(istype(H.a_left,/obj/item/device/assembly/igniter) || istype(H.a_right,/obj/item/device/assembly/igniter))