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

Review Concerns

Browse Source
This commit is contained in:
Dave
2019-02-23 22:37:59 -05:00
parent 5664206697
commit e5d01311d6
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/iv_drip.dm
+3 -3
View File
@@ -10,14 +10,14 @@
var/obj/item/reagent_containers/iv_bag/bag = null
/obj/machinery/iv_drip/update_icon()
overlays.Cut()
cut_overlays()
if(bag)
overlays += "hangingbag"
add_overlay("hangingbag")
if(bag.reagents.total_volume)
var/image/filling = image('icons/goonstation/objects/iv.dmi', src, "hangingbag-fluid")
filling.icon += mix_color_from_reagents(bag.reagents.reagent_list)
overlays += filling
add_overlay(overlays)
/obj/machinery/iv_drip/MouseDrop(mob/living/target)
if(usr.incapacitated())
code/game/objects/items/weapons/storage/boxes.dm
+8 -8
View File
@@ -197,14 +197,14 @@
icon_state = "beaker"
/obj/item/storage/box/iv_bags/New()
..()
new /obj/item/reagent_containers/iv_bag( src )
new /obj/item/reagent_containers/iv_bag( src )
new /obj/item/reagent_containers/iv_bag( src )
new /obj/item/reagent_containers/iv_bag( src )
new /obj/item/reagent_containers/iv_bag( src )
new /obj/item/reagent_containers/iv_bag( src )
new /obj/item/reagent_containers/iv_bag( src )
..()
new /obj/item/reagent_containers/iv_bag( src )
new /obj/item/reagent_containers/iv_bag( src )
new /obj/item/reagent_containers/iv_bag( src )
new /obj/item/reagent_containers/iv_bag( src )
new /obj/item/reagent_containers/iv_bag( src )
new /obj/item/reagent_containers/iv_bag( src )
new /obj/item/reagent_containers/iv_bag( src )
/obj/item/storage/box/injectors
name = "\improper DNA injectors"
code/modules/reagents/reagent_containers/iv_bag.dm
+3 -4
View File
@@ -138,11 +138,10 @@
// PRE-FILLED IV BAGS BELOW
/obj/item/reagent_containers/iv_bag/salglu/New()
/obj/item/reagent_containers/iv_bag/salglu
..()
set_label("Saline-Glucose")
reagents = list_reagents = list("salglu_solution" = 200)
update_icon()
name = "\improper IV Bag (Saline Glucose)"
list_reagents = list("salglu_solution" = 200)
/obj/item/reagent_containers/iv_bag/blood // Don't use this - just an abstract type to allow blood bags to have a common blood_type var for ease of creation.
var/blood_type