cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

reworks 'sword' crate

Browse Source
This commit is contained in:
Casey
2022-02-18 13:56:51 -05:00
committed by CHOMPStation2
parent 0b0af368d7
commit 9c74404d02
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,6 +160,7 @@
) )
cost = 300 cost = 300
containertype = /obj/structure/closet/crate containertype = /obj/structure/closet/crate
<<<<<<< HEAD
containername = "cordless jukebox speakers crate" containername = "cordless jukebox speakers crate"
/datum/supply_pack/misc/sword /datum/supply_pack/misc/sword
@@ -174,3 +175,6 @@
one_access = TRUE one_access = TRUE
containername = "sword crate" containername = "sword crate"
containertype = /obj/structure/closet/crate/secure/gear containertype = /obj/structure/closet/crate/secure/gear
=======
containername = "cordless jukebox speakers crate"
>>>>>>> 7a653038c17... Merge pull request #12267 from PastelPrinceDan/swordcrate

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(