Merge pull request #1159 from Kelenius/playingWithTravis

Attempts to port bay's travis update attempts
This commit is contained in:
Datraen
2016-03-26 13:18:55 -04:00
29 changed files with 257 additions and 196 deletions
+2 -2
View File
@@ -111,8 +111,8 @@
/*
* Parapens
*/
/obj/item/weapon/pen/reagent/paralysis
origin_tech = "materials=2;syndicate=5"
/obj/item/weapon/pen/reagent/paralysis
origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5)
/obj/item/weapon/pen/reagent/paralysis/New()
..()