Merge pull request #232 from improvedname/War

Does #231 but properly
This commit is contained in:
Dahlular
2020-03-22 20:27:55 -06:00
committed by GitHub
14 changed files with 68 additions and 0 deletions
@@ -208,6 +208,21 @@
update_icon()
return
//WARFRAME WEAPONS INSERT
/obj/item/gun/ballistic/automatic/braton
name = "\improper Braton"
desc = "An unusual weapon in design; sporting a high firing rate and capacity, but low damage. There is a lotus decal on the underside of the barrel."
icon_state = "braton"
item_state = "braton"
w_class = WEIGHT_CLASS_HUGE
slot_flags = 0
mag_type = /obj/item/ammo_box/magazine/bratonmag
fire_sound = 'sound/weapons/gunshot_braton.ogg'
can_suppress = FALSE
burst_size = 5
fire_delay = 1
//ENDS HERE
/obj/item/gun/ballistic/automatic/tommygun
name = "\improper Thompson SMG"
desc = "Based on the classic 'Chicago Typewriter'."
@@ -21,6 +21,20 @@
var/obj/item/suppressor/S = new(src)
install_suppressor(S)
//WARFRAME WEAPONS INSERT
/obj/item/gun/ballistic/automatic/pistol/lato
name = "\improper Lato"
desc = "A strange sidearm, sporting low damage but a high firing rate and capacity. There is a lotus decal on the barrel."
icon_state = "lato"
item_state = "lato"
w_class = WEIGHT_CLASS_NORMAL
mag_type = /obj/item/ammo_box/magazine/latomag
can_suppress = FALSE
fire_sound = 'sound/weapons/gunshot_lato.ogg'
fire_delay = 0
//ENDS HERE
/obj/item/gun/ballistic/automatic/pistol/m1911
name = "\improper M1911"
desc = "A classic .45 handgun with a small magazine capacity."