VOREStation Specific Merge Changes

* PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004
* Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters
* Keep lights on explorer hoods
* Don't map in anti-xeno tasers from Polaris lore.
This commit is contained in:
Leshana
2018-02-17 16:56:31 -05:00
parent 5edfc7516b
commit ef3df27528
12 changed files with 18 additions and 27 deletions
+1 -1
View File
@@ -152,7 +152,7 @@
prob(4);/obj/item/weapon/storage/pill_bottle/zoom,\
prob(4);/obj/item/weapon/material/butterfly,\
prob(2);/obj/item/weapon/material/butterfly/switchblade,\
prob(2);/obj/item/weapon/material/knuckledusters,\
prob(2);/obj/item/clothing/gloves/knuckledusters,\
prob(2);/obj/item/weapon/reagent_containers/syringe/drugs,\
prob(1);/obj/item/weapon/material/knife/tacknife,\
prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc,\