cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-25 06:07:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

VOREStation Specific Merge Changes

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/l3closet.dm
+1 -1
View File
@@ -38,7 +38,7 @@
..()
new /obj/item/clothing/suit/bio_suit/security(src)
new /obj/item/clothing/head/bio_hood/security(src)
new /obj/item/weapon/gun/energy/taser/xeno/sec(src)
// new /obj/item/weapon/gun/energy/taser/xeno/sec(src) // VOREStation Edit - We don't need these
/obj/structure/closet/l3closet/janitor
icon_state = "bio_janitor"
code/game/objects/structures/trash_pile.dm
+1 -1
View File
@@ -224,7 +224,7 @@
prob(4);/obj/item/weapon/gun/energy/sizegun,
prob(3);/obj/item/weapon/material/butterfly,
prob(3);/obj/item/weapon/material/butterfly/switchblade,
prob(3);/obj/item/weapon/material/knuckledusters,
prob(3);/obj/item/clothing/gloves/knuckledusters,
prob(3);/obj/item/weapon/reagent_containers/syringe/drugs,
prob(2);/obj/item/weapon/handcuffs/fuzzy,
// prob(2);/obj/item/weapon/legcuffs,