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

Adds orderable flaregun crate

Browse Source 
Mainly to make double-barrelled shotguns orderable.
This commit is contained in:
mwerezak
2015-03-09 16:00:49 -04:00
parent b9d2517d83
commit 645910947b
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/datums/supplypacks.dm
View File

@@ -710,6 +710,17 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
access = access_security access = access_security
group = "Security" group = "Security"
/datum/supply_packs/flareguns
name = "Flare guns crate"
contains = list(/obj/item/weapon/gun/projectile/sec/flash,
/obj/item/ammo_magazine/c45m/flash,
/obj/item/weapon/gun/projectile/shotgun/doublebarrel/flare,
/obj/item/weapon/storage/box/flashshells)
cost = 25
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Flare gun crate"
access = access_security
group = "Security"
/datum/supply_packs/eweapons /datum/supply_packs/eweapons
name = "Experimental weapons crate" name = "Experimental weapons crate"

5
code/modules/projectiles/guns/projectile/shotgun.dm
View File

@@ -65,6 +65,11 @@
origin_tech = "combat=3;materials=1" origin_tech = "combat=3;materials=1"
ammo_type = /obj/item/ammo_casing/shotgun/beanbag ammo_type = /obj/item/ammo_casing/shotgun/beanbag
/obj/item/weapon/gun/projectile/shotgun/doublebarrel/flare
name = "signal shotgun"
desc = "A double-barreled shotgun meant to fire signal flash shells."
ammo_type = /obj/item/ammo_casing/shotgun/flash
//this is largely hacky and bad :( -Pete //this is largely hacky and bad :( -Pete
/obj/item/weapon/gun/projectile/shotgun/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob) /obj/item/weapon/gun/projectile/shotgun/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob)
if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter)) if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter))