cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3699 from CHOMPStation2/upstream-merge-12267

Browse Source 
[MIRROR] reworks 'sword' crate
This commit is contained in:
Nadyr
2022-02-19 18:38:41 -05:00
committed by GitHub
parent b513f79c69 f1c5f657bd
commit c43cd9ea3a
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/datums/supplypacks/misc_vr.dm
View File

@@ -161,16 +161,3 @@
cost = 300 cost = 300
containertype = /obj/structure/closet/crate containertype = /obj/structure/closet/crate
containername = "cordless jukebox speakers crate" containername = "cordless jukebox speakers crate"
/datum/supply_pack/misc/sword
name = "sword"
contains = list(
/obj/item/weapon/material/sword =2
)
cost =100
access = list(access_explorer,
access_security,)
one_access = TRUE
containername = "sword crate"
containertype = /obj/structure/closet/crate/secure/gear

8
code/datums/supplypacks/munitions.dm
View File

@@ -187,6 +187,14 @@
containername = "Magnetic ammunition crate" containername = "Magnetic ammunition crate"
access = access_security access = access_security
/datum/supply_pack/munitions/claymore
name = "Weapons - Melee - Claymores"
contains = list(/obj/item/weapon/material/sword = 2)
cost = 150
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Claymore crate"
access = access_armory //two swords that are a one-hit 40 brute + IB chance should be armory-locked
/datum/supply_pack/munitions/shotgunammo /datum/supply_pack/munitions/shotgunammo
name = "Ammunition - Shotgun shells" name = "Ammunition - Shotgun shells"
contains = list( contains = list(