cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 16:13:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed fixed spans.

Browse Source 
Turns out they weren't fixed afterall...
This commit is contained in:
Mieszko Jędrzejczak
2016-02-23 00:27:05 +01:00
parent 7efbab93e8
commit d3573135d2
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/food/drinks.dm
+17 -17
View File
@@ -23,7 +23,7 @@
var/fillevel = gulp_size
if(!R.total_volume || !R)
user << "<span class = 'warning'> None of [src] left, oh no!</span>"
user << "<span class='warning'> None of [src] left, oh no!</span>"
return 0
if(M == user)
@@ -35,9 +35,9 @@
user << "Where do you intend to put \the [src]? You don't have a mouth!"
return
else
M << "<span class = 'notice'> You pour a bit of liquid from [src] into your connection port.</span>"
M << "<span class='notice'> You pour a bit of liquid from [src] into your connection port.</span>"
else
M << "<span class = 'notice'> You swallow a gulp of [src].</span>"
M << "<span class='notice'> You swallow a gulp of [src].</span>"
if(reagents.total_volume)
reagents.reaction(M, INGEST)
spawn(0)
@@ -53,10 +53,10 @@
return
for(var/mob/O in viewers(world.view, user))
O.show_message("<span class = 'warning'> [user] attempts to feed [M] [src].</span>", 1)
O.show_message("<span class='warning'> [user] attempts to feed [M] [src].</span>", 1)
if(!do_mob(user, M)) return
for(var/mob/O in viewers(world.view, user))
O.show_message("<span class = 'warning'> [user] feeds [M] [src].</span>", 1)
O.show_message("<span class='warning'> [user] feeds [M] [src].</span>", 1)
M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been fed [src.name] by [key_name(user)] Reagents: [reagentlist(src)]</font>")
user.attack_log += text("\[[time_stamp()]\] <font color='red'>Fed [M.name] by [key_name(M)] Reagents: [reagentlist(src)]</font>")
@@ -98,23 +98,23 @@
if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
if(!target.reagents.total_volume)
user << "<span class = 'warning'> [target] is empty.</span>"
user << "<span class='warning'> [target] is empty.</span>"
return
if(reagents.total_volume >= reagents.maximum_volume)
user << "<span class = 'warning'> [src] is full.</span>"
user << "<span class='warning'> [src] is full.</span>"
return
var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this)
user << "<span class = 'notice'> You fill [src] with [trans] units of the contents of [target].</span>"
user << "<span class='notice'> You fill [src] with [trans] units of the contents of [target].</span>"
else if(target.is_open_container()) //Something like a glass. Player probably wants to transfer TO it.
if(!reagents.total_volume)
user << "<span class = 'warning'> [src] is empty.</span>"
user << "<span class='warning'> [src] is empty.</span>"
return
if(target.reagents.total_volume >= target.reagents.maximum_volume)
user << "<span class = 'warning'> [target] is full.</span>"
user << "<span class='warning'> [target] is full.</span>"
return
@@ -126,7 +126,7 @@
refillName = reagents.get_master_reagent_name()
var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
user << "<span class = 'notice'> You transfer [trans] units of the solution to [target].</span>"
user << "<span class='notice'> You transfer [trans] units of the solution to [target].</span>"
if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
if(refill in drinks) // Only synthesize drinks
@@ -155,15 +155,15 @@
if(!..(user, 1))
return
if(!reagents || reagents.total_volume==0)
user << "<span class = 'notice'> \The [src] is empty!</span>"
user << "<span class='notice'> \The [src] is empty!</span>"
else if (reagents.total_volume<=src.volume/4)
user << "<span class = 'notice'> \The [src] is almost empty!</span>"
user << "<span class='notice'> \The [src] is almost empty!</span>"
else if (reagents.total_volume<=src.volume*0.66)
user << "<span class = 'notice'> \The [src] is half full!</span>" // We're all optimistic, right?!
user << "<span class='notice'> \The [src] is half full!</span>" // We're all optimistic, right?!
else if (reagents.total_volume<=src.volume*0.90)
user << "<span class = 'notice'> \The [src] is almost full!</span>"
user << "<span class='notice'> \The [src] is almost full!</span>"
else
user << "<span class = 'notice'> \The [src] is full!</span>"
user << "<span class='notice'> \The [src] is full!</span>"
////////////////////////////////////////////////////////////////////////////////
@@ -407,4 +407,4 @@
desc = "A flask with a Lithium Atom symbol on it."
icon = 'icons/obj/custom_items.dmi'
icon_state = "lithiumflask"
volume = 50
volume = 50