mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-24 05:23:22 +01:00
Unloaded Armory (#20309)
* All the ballistic weapons in the armory now start unloaded. Magazines and rounds that would've spawned in the weapon now spawns in the ammo lockers. In effect, two beanbags shells have been added to the armory.
This commit is contained in:
@@ -136,6 +136,9 @@
|
||||
suppressor_x_offset = 10
|
||||
suppressor_y_offset = -1
|
||||
|
||||
/obj/item/gun/projectile/automatic/wt550/unloaded
|
||||
magazine_type = null
|
||||
|
||||
/obj/item/gun/projectile/automatic/wt550/lethal
|
||||
magazine_type = /obj/item/ammo_magazine/mc9mmt
|
||||
|
||||
@@ -434,6 +437,9 @@
|
||||
list(mode_name="2-round bursts", burst=2, burst_accuracy=list(1, 1))
|
||||
)
|
||||
|
||||
/obj/item/gun/projectile/automatic/rifle/jingya/unloaded
|
||||
magazine_type = null
|
||||
|
||||
/obj/item/gun/projectile/automatic/rifle/jingya/update_icon()
|
||||
..()
|
||||
if(ammo_magazine)
|
||||
|
||||
@@ -148,3 +148,6 @@
|
||||
to_chat(user, SPAN_WARNING("You can't fire without stabilizing \the [src]!"))
|
||||
return 0
|
||||
return ..()
|
||||
|
||||
/obj/item/gun/projectile/peac/unloaded
|
||||
ammo_type = null
|
||||
|
||||
@@ -113,6 +113,9 @@
|
||||
else
|
||||
icon_state = "secgun-e"
|
||||
|
||||
/obj/item/gun/projectile/sec/unloaded
|
||||
magazine_type = null
|
||||
|
||||
/obj/item/gun/projectile/sec/lethal
|
||||
magazine_type = /obj/item/ammo_magazine/c45m
|
||||
|
||||
|
||||
@@ -111,6 +111,9 @@
|
||||
loaded -= AC //Remove casing from loaded list.
|
||||
chambered = AC
|
||||
|
||||
/obj/item/gun/projectile/shotgun/pump/unloaded
|
||||
ammo_type = null
|
||||
|
||||
/obj/item/gun/projectile/shotgun/pump/combat
|
||||
name = "combat shotgun"
|
||||
desc = "Built for close quarters combat, the Hephaestus Industries KS-40 is widely regarded as a weapon of choice for repelling boarders."
|
||||
|
||||
Reference in New Issue
Block a user