shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #601 from Citadel-Station-13/upstream-merge-26557

Browse Source 
[MIRROR] Minor IV/bloodbag grammar fixes
This commit is contained in:
LetterJay
2017-04-27 12:47:50 -05:00
committed by GitHub
parent 0ebbadbe6c 870ee9ca6c
commit dcf1c72cfc
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/iv_drip.dm
View File

@@ -200,7 +200,7 @@
if(beaker.reagents && beaker.reagents.reagent_list.len)
to_chat(usr, "<span class='notice'>Attached is \a [beaker] with [beaker.reagents.total_volume] units of liquid.</span>")
else
to_chat(usr, "<span class='notice'>Attached is an empty [beaker].</span>")
to_chat(usr, "<span class='notice'>Attached is an empty [beaker.name].</span>")
else
to_chat(usr, "<span class='notice'>No chemicals are attached.</span>")

11
code/modules/reagents/reagent_containers/blood_pack.dm
View File

@@ -25,13 +25,10 @@
/obj/item/weapon/reagent_containers/blood/proc/update_pack_name()
if(!labelled)
if(volume)
if(blood_type)
name = "blood pack [blood_type]"
else
name = "blood pack"
if(blood_type)
name = "blood pack - [blood_type]"
else
name = "empty blood pack"
name = "blood pack"
/obj/item/weapon/reagent_containers/blood/update_icon()
var/percent = round((reagents.total_volume / volume) * 100)
@@ -69,7 +66,7 @@
blood_type = "L"
/obj/item/weapon/reagent_containers/blood/empty
name = "empty blood pack"
name = "blood pack"
icon_state = "empty"
/obj/item/weapon/reagent_containers/blood/attackby(obj/item/I, mob/user, params)