cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-29 11:31:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

changelog and span tags

Browse Source
This commit is contained in:
SinTwo
2016-07-07 20:38:46 -04:00
parent 386ceb2bc5
commit 5c4c283b80
3 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/reagents/reagent_containers/food/drinks.dm
View File

@@ -221,6 +221,7 @@
var/obj/structure/reagent_dispensers/water_cooler/W = over_object
if(W.cupholder && W.cups < 10)
W.cups++
usr << "<span class='notice'>You put the [src] in the cup dispenser.</span>"
qdel(src)
W.update_icon()
else

18
code/modules/reagents/reagent_dispenser.dm
View File

@@ -26,12 +26,12 @@
examine(mob/user)
if(!..(user, 2))
return
user << "\blue It contains:"
user << "<span class='notice'>It contains:</span>"
if(reagents && reagents.reagent_list.len)
for(var/datum/reagent/R in reagents.reagent_list)
user << "\blue [R.volume] units of [R.name]"
user << "<span class='notice'>[R.volume] units of [R.name]</span>"
else
user << "\blue Nothing."
user << "<span class='notice'>Nothing.</span>"
verb/set_APTFT() //set amount_per_transfer_from_this
set name = "Set transfer amount"
@@ -92,7 +92,7 @@
if(!..(user, 2))
return
if (modded)
user << "\red Fuel faucet is wrenched open, leaking the fuel!"
user << "<span class='warning'>Fuel faucet is wrenched open, leaking the fuel!</span>"
if(rig)
user << "<span class='notice'>There is some kind of device rigged to the tank.</span>"
@@ -100,7 +100,7 @@
if (rig)
usr.visible_message("[usr] begins to detach [rig] from \the [src].", "You begin to detach [rig] from \the [src]")
if(do_after(usr, 20))
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 \the [src].</span>", "<span class='notice'>You detach [rig] from \the [src]</span>")
rig.loc = get_turf(usr)
rig = null
overlays = new/list()
@@ -117,11 +117,11 @@
leak_fuel(amount_per_transfer_from_this)
if (istype(W,/obj/item/device/assembly_holder))
if (rig)
user << "\red There is another device in the way."
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]")
if(do_after(user, 20))
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 \the [src].</span>", "<span class='notice'>You rig [W] to \the [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))
@@ -220,7 +220,7 @@
/obj/structure/reagent_dispensers/water_cooler/examine(mob/user)
..()
if(cupholder)
user << "\blue There are [cups] cups in the cup dispenser."
user << "<span class='notice'>There are [cups] cups in the cup dispenser.</span>"
/obj/structure/reagent_dispensers/water_cooler/attackby(obj/item/I as obj, mob/user as mob)
if(istype(I, /obj/item/weapon/wrench))
@@ -277,7 +277,7 @@
if(do_after(user, 20))
bottle = 1
update_icon()
user << "<span class='notice'>You screw the bottle onto the water-cooler but accidently spill some!</span>" //you spill some because it for somereason transfers 5 units to the bottle after it gets attached but before it's deleted...
user << "<span class='notice'>You screw the bottle onto the water-cooler!</span>"
for(var/datum/reagent/R in G.reagents.reagent_list)
var/total_reagent = G.reagents.get_reagent_amount(R.id)
reagents.add_reagent(R.id, total_reagent)