cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-15 20:12:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds most shotgun ammo boxes to cargo. Allows them to be crafted. (#30837)

Browse Source 
* pope why didn't you test it haughughuugughuhguhguhgh

* ok let us be real it doesn't need 50 more what was I thinking

* oop

* a static shock

* spelling

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* so full of order of operations yum

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
Qwertytoforty
2025-11-08 17:11:53 -05:00
committed by GitHub
parent c656f53727
commit 746de75bdd
7 changed files with 172 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/projectiles/ammunition/ammo_casings.dm
View File

@@ -267,7 +267,7 @@
/obj/item/ammo_casing/shotgun/laserslug
name = "laser slug"
desc = "A rudimentary 12 gauge shotgun shell that replicates the effects of a laser weapon with a low-powered laser."
icon_state = "laser"
icon_state = "improvised"
projectile_type = /obj/item/projectile/beam/laser
muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL
muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL
@@ -329,7 +329,7 @@
/obj/item/ammo_casing/shotgun/holy
name = "holy water dart"
desc = "A 12 gauge dart shell loaded with holy water."
icon_state = "dart"
icon_state = "holydart"
projectile_type = /obj/item/projectile/bullet/dart/syringe/holy
muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL
muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL

42
code/modules/supply/supply_packs/pack_security.dm
View File

@@ -302,6 +302,27 @@
containertype = /obj/structure/closet/crate/secure/plasma
containername = "lever action rifle crate"
/datum/supply_packs/security/armory/beanammo
name = "Beanbag Shell Crate"
contains = list(/obj/item/storage/fancy/shell/beanbag,
/obj/item/storage/fancy/shell/beanbag)
cost = 175 // Just print them at cargo
containername = "beanbag shell crate"
/datum/supply_packs/security/armory/rubberammo
name = "Rubbershot Shell Crate"
contains = list(/obj/item/storage/fancy/shell/rubbershot,
/obj/item/storage/fancy/shell/rubbershot)
cost = 175 // Just print them at cargo
containername = "rubbershot shell crate"
/datum/supply_packs/security/armory/incendiaryammo
name = "Incendiary Shell Crate"
contains = list(/obj/item/storage/fancy/shell/incendiary,
/obj/item/storage/fancy/shell/incendiary)
cost = 225 // This is cargo printable, but slightly increased in cost due to it being lethal
containername = "incendiary shell crate"
/datum/supply_packs/security/armory/tranqammo
name = "Tranquilizer Shell Crate"
contains = list(/obj/item/storage/fancy/shell/tranquilizer,
@@ -316,6 +337,27 @@
cost = 400
containername = "holy water shell crate"
/datum/supply_packs/security/armory/dragonsbreathammo
name = "Dragonsbreath Shell Crate"
contains = list(/obj/item/storage/fancy/shell/dragonsbreath,
/obj/item/storage/fancy/shell/dragonsbreath)
cost = 400
containername = "dragonsbreath shell crate"
/datum/supply_packs/security/armory/ionshotammo
name = "Ionshot Shell Crate"
contains = list(/obj/item/storage/fancy/shell/ion,
/obj/item/storage/fancy/shell/ion)
cost = 400
containername = "ionshot shell crate"
/datum/supply_packs/security/armory/lasershotammo
name = "Lasershot Shell Crate"
contains = list(/obj/item/storage/fancy/shell/lasershot,
/obj/item/storage/fancy/shell/lasershot)
cost = 400
containername = "lasershot shell crate"
/datum/supply_packs/security/armory/disablersmg
name = "WT-450 Disabler SMG Crate"
contains = list(/obj/item/gun/energy/disabler/smg,