cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 23:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds Holy Water Darts to Cargo (#25468)

Browse Source 
* die monster you do not belong in this world

* Update code/game/objects/items/weapons/storage/boxes.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com>

* Update code/modules/projectiles/ammunition/ammo_casings.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com>

---------

Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
Marm
2024-05-30 16:57:35 +01:00
committed by GitHub
parent 9b9d96190b
commit 0d1eb5110d
6 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/ammo_casings.dm
+9
View File
@@ -306,6 +306,15 @@
muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL
materials = list(MAT_METAL=250)
/obj/item/ammo_casing/shotgun/holy
name = "holy water darts"
desc = "A 12 gauge dart shell loaded with holy water."
icon_state = "hshell"
projectile_type = /obj/item/projectile/bullet/dart/syringe/holy
muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL
muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL
materials = list(MAT_METAL=250)
/obj/item/ammo_casing/shotgun/confetti
name = "confettishot"
desc = "A 12 gauge shell loaded with... confetti?"
code/modules/projectiles/projectile/bullets.dm
+6
View File
@@ -269,6 +269,12 @@
..()
reagents.add_reagent("haloperidol", 15)
/obj/item/projectile/bullet/dart/syringe/holy
/obj/item/projectile/bullet/dart/syringe/holy/New()
..()
reagents.add_reagent("holywater", 10)
/obj/item/projectile/bullet/neurotoxin
name = "neurotoxin spit"
icon_state = "neurotoxin"
code/modules/supply/supply_packs/pack_security.dm
+7
View File
@@ -283,6 +283,13 @@
cost = 400
containername = "tranquilizer shell crate"
/datum/supply_packs/security/armory/holyammo
name = "Holy Water Shell Crate"
contains = list(/obj/item/storage/box/holy,
/obj/item/storage/box/holy)
cost = 400
containername = "holy water shell crate"
/datum/supply_packs/security/armory/disablersmg
name = "WT-450 Disabler SMG Crate"
contains = list(/obj/item/gun/energy/disabler/smg,