Merge pull request #1159 from tigercat2000/MetaStationPort

MetaStation V41A II port
This commit is contained in:
ZomgPonies
2015-06-05 17:49:13 -04:00
20 changed files with 13675 additions and 4 deletions
+2 -2
View File
@@ -1,11 +1,11 @@
/obj/effect/spawner/lootdrop
/obj/effect/spawner/away/lootdrop
icon = 'icons/mob/screen1.dmi'
icon_state = "x2"
var/lootcount = 1 //how many items will be spawned
var/lootdoubles = 0 //if the same item can be spawned twice
var/loot = "" //a list of possible items to spawn- a string of paths
/obj/effect/spawner/lootdrop/initialize()
/obj/effect/spawner/away/lootdrop/initialize()
var/list/things = params2list(loot)
if(things && things.len)
@@ -24,6 +24,10 @@
if(10 to 50) icon_state = "half"
if(51 to INFINITY) icon_state = "full"
/obj/item/weapon/reagent_containers/blood/random/New()
blood_type = pick("A+", "A-", "B+", "B-", "O+", "O-")
..()
/obj/item/weapon/reagent_containers/blood/APlus
blood_type = "A+"
@@ -503,6 +503,15 @@
mode = SYRINGE_INJECT
update_icon()
/obj/item/weapon/reagent_containers/syringe/epinephrine
name = "Syringe (Epinephrine)"
desc = "Contains epinephrine - used to stabilize patients."
New()
..()
reagents.add_reagent("epinephrine", 15)
mode = SYRINGE_INJECT
update_icon()
/obj/item/weapon/reagent_containers/syringe/insulin
name = "Syringe (insulin)"
desc = "Contains insulin - used to treat diabetes."