From 9c1ab2495ade331dee55eb371b598f4c064043b6 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 17 Apr 2017 17:44:04 -0500 Subject: [PATCH] Adds suppression to the foam pistol, smg, and c20r, fixes #26248 --- .../modules/projectiles/guns/ballistic/toy.dm | 10 +++++----- icons/obj/guns/toy.dmi | Bin 2430 -> 3075 bytes 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm index 5588bae937..89f6655d8e 100644 --- a/code/modules/projectiles/guns/ballistic/toy.dm +++ b/code/modules/projectiles/guns/ballistic/toy.dm @@ -9,7 +9,7 @@ force = 0 throwforce = 0 burst_size = 3 - can_suppress = 0 + can_suppress = TRUE clumsy_check = 0 needs_permit = 0 casing_ejector = 0 @@ -24,14 +24,13 @@ w_class = WEIGHT_CLASS_SMALL mag_type = /obj/item/ammo_box/magazine/toy/pistol fire_sound = 'sound/weapons/Gunshot.ogg' - can_suppress = 0 burst_size = 1 fire_delay = 0 actions_types = list() /obj/item/weapon/gun/ballistic/automatic/toy/pistol/update_icon() ..() - icon_state = "[initial(icon_state)][chambered ? "" : "-e"]" + icon_state = "[initial(icon_state)][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]" /obj/item/weapon/gun/ballistic/automatic/toy/pistol/riot mag_type = /obj/item/ammo_box/magazine/toy/pistol/riot @@ -57,6 +56,7 @@ clumsy_check = 0 needs_permit = 0 casing_ejector = 0 + can_suppress = FALSE /obj/item/weapon/gun/ballistic/shotgun/toy/process_chamber(empty_chamber = 0) ..() @@ -81,7 +81,7 @@ name = "donksoft SMG" desc = "A bullpup two-round burst toy SMG, designated 'C-20r'. Ages 8 and up." icon = 'icons/obj/guns/toy.dmi' - can_suppress = 0 + can_suppress = TRUE needs_permit = 0 mag_type = /obj/item/ammo_box/magazine/toy/smgm45 casing_ejector = 0 @@ -93,7 +93,7 @@ name = "donksoft LMG" desc = "A heavily modified toy light machine gun, designated 'L6 SAW'. Ages 8 and up." icon = 'icons/obj/guns/toy.dmi' - can_suppress = 0 + can_suppress = FALSE needs_permit = 0 mag_type = /obj/item/ammo_box/magazine/toy/m762 casing_ejector = 0 diff --git a/icons/obj/guns/toy.dmi b/icons/obj/guns/toy.dmi index 1e1ca047c0229ea6a0f586a97de85304457fc3a4..f41c289746301d13235771a4c6edbcca56edf06d 100644 GIT binary patch delta 2886 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