Merge branch 'master' into upstream-merge-30113

2017-08-29 20:02:14 -07:00
parent cd11c01c42 0b82132443
commit 1b0bbb8c86
431 changed files with 1841 additions and 5611 deletions
@@ -1,10 +0,0 @@
-diff a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm	(rejected hunks)
-@@ -6,7 +6,7 @@
- 	amount_per_transfer_from_this = 5
- 	possible_transfer_amounts = list(1, 2, 3, 4, 5)
- 	volume = 5
-	container_type = TRANSPARENT
-+	container_type = TRANSPARENT_1
- 
- /obj/item/reagent_containers/dropper/afterattack(obj/target, mob/user , proximity)
- 	if(!proximity) return
@@ -1,28 +0,0 @@
-diff a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm	(rejected hunks)
-@@ -169,7 +169,7 @@
- 	volume = 100
- 	amount_per_transfer_from_this = 10
- 	possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
-	flags = OPENCONTAINER
-+	flags_1 = OPENCONTAINER_1
- 
- /obj/item/reagent_containers/glass/beaker/noreact
- 	name = "cryostasis beaker"
-@@ -180,7 +180,7 @@
- 	volume = 50
- 	amount_per_transfer_from_this = 10
- 	origin_tech = "materials=2;engineering=3;plasmatech=3"
-	flags = OPENCONTAINER
-+	flags_1 = OPENCONTAINER_1
- 
- /obj/item/reagent_containers/glass/beaker/noreact/Initialize()
- 	. = ..()
-@@ -196,7 +196,7 @@
- 	volume = 300
- 	amount_per_transfer_from_this = 10
- 	possible_transfer_amounts = list(5,10,15,20,25,30,50,100,300)
-	flags = OPENCONTAINER
-+	flags_1 = OPENCONTAINER_1
- 	origin_tech = "bluespace=5;materials=4;plasmatech=4"
- 
- /obj/item/reagent_containers/glass/beaker/cryoxadone
@@ -1,12 +0,0 @@
-diff a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm	(rejected hunks)
-@@ -77,8 +77,8 @@
- 	amount_per_transfer_from_this = 10
- 	volume = 10
- 	ignore_flags = 1 //so you can medipen through hardsuits
-	container_type = DRAWABLE
-	flags = null
-+	container_type = DRAWABLE_1
-+	flags_1 = null
- 	list_reagents = list("epinephrine" = 10)
- 
- /obj/item/reagent_containers/hypospray/medipen/attack(mob/M, mob/user)
@@ -167,7 +167,7 @@
 /obj/item/reagent_containers/spray/pepper
 	name = "pepperspray"
 	desc = "Manufactured by UhangInc, used to blind and down an opponent quickly."
-	icon = 'icons/obj/weapons.dmi'
+	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "pepperspray"
 	item_state = "pepperspray"
 	lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
@@ -1,10 +0,0 @@
-diff a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm	(rejected hunks)
-@@ -16,7 +16,7 @@
- 	var/busy = FALSE		// needed for delayed drawing of blood
- 	var/proj_piercing = 0 //does it pierce through thick clothes when shot with syringe gun
- 	materials = list(MAT_METAL=10, MAT_GLASS=20)
-	container_type = TRANSPARENT
-+	container_type = TRANSPARENT_1
- 
- /obj/item/reagent_containers/syringe/Initialize()
- 	. = ..()