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

Suppressors now can be attached to toy guns (#20415)

Browse Source 
* Suppressors now can be attached to toy guns

* Same sound while suppressed, but lower volume

* better description

* GDN review
This commit is contained in:
Henri215
2023-03-04 05:44:16 -03:00
committed by GitHub
parent a31299d49e
commit 0e6da50c3f
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/projectiles/guns/projectile/toy.dm
View File

@@ -6,10 +6,10 @@
item_state = "saber"
mag_type = /obj/item/ammo_box/magazine/toy/smg
fire_sound = 'sound/weapons/gunshots/gunshot_smg.ogg'
suppressed_sound = 'sound/weapons/gunshots/gunshot_smg.ogg'
force = 0
throwforce = 0
burst_size = 3
can_suppress = FALSE
clumsy_check = FALSE
needs_permit = FALSE
@@ -24,15 +24,12 @@
w_class = WEIGHT_CLASS_SMALL
mag_type = /obj/item/ammo_box/magazine/toy/pistol
fire_sound = 'sound/weapons/gunshots/gunshot.ogg'
can_suppress = FALSE
suppressed_sound = 'sound/weapons/gunshots/gunshot.ogg'
burst_size = 1
fire_delay = 0
can_holster = TRUE
actions_types = list()
/obj/item/gun/projectile/automatic/toy/pistol/update_icon_state()
icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"]"
/obj/item/gun/projectile/automatic/toy/pistol/riot
name = "foam force riot pistol"
desc = "RIOT! Ages 8 and up."
@@ -50,6 +47,8 @@
/obj/item/gun/projectile/automatic/toy/pistol/enforcer/update_overlays()
. = ..()
if(suppressed)
. += image(icon = 'icons/obj/guns/projectile.dmi', icon_state = "enforcer_supp", pixel_x = 5)
if(gun_light)
var/flashlight = "Enforcer_light"
if(gun_light.on)
@@ -97,7 +96,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 = FALSE
suppressed_sound = 'sound/weapons/gunshots/gunshot_smg.ogg'
needs_permit = FALSE
mag_type = /obj/item/ammo_box/magazine/toy/smgm45

4
code/modules/projectiles/guns/projectile_gun.dm
View File

@@ -9,6 +9,8 @@
var/mag_type = /obj/item/ammo_box/magazine/m10mm //Removes the need for max_ammo and caliber info
var/obj/item/ammo_box/magazine/magazine
var/can_tactical = FALSE //check to see if the gun can tactically reload
/// The sound it will make when the gun suppression is TRUE
var/suppressed_sound = 'sound/weapons/gunshots/gunshot_silenced.ogg'
/obj/item/gun/projectile/Initialize(mapload)
. = ..()
@@ -122,7 +124,7 @@
suppressed = A
S.oldsound = fire_sound
S.initial_w_class = w_class
fire_sound = 'sound/weapons/gunshots/gunshot_silenced.ogg'
fire_sound = suppressed_sound
w_class = WEIGHT_CLASS_NORMAL //so pistols do not fit in pockets when suppressed
A.loc = src
update_icon()