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

Merge pull request #10280 from TDSSS/silencer-tech

Browse Source 
Moved silencers, gave them their own folder + tech origin
This commit is contained in:
variableundefined
2018-11-20 19:19:02 +08:00
committed by GitHub
parent 749b664996 92991726ec
commit 6f96aa0a5c
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/gun_attachments.dm
+19
View File
@@ -0,0 +1,19 @@
//Put all your tacticool gun gadgets here. So far it's pretty empty
/obj/item/suppressor
name = "suppressor"
desc = "A universal syndicate small-arms suppressor for maximum espionage."
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "suppressor"
item_state = "suppressor"
w_class = WEIGHT_CLASS_SMALL
var/oldsound = null
var/initial_w_class = null
origin_tech = "combat=2;engineering=2"
/obj/item/suppressor/specialoffer
name = "cheap suppressor"
desc = "A foreign knock-off suppressor, it feels flimsy, cheap, and brittle. Still fits all weapons."
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "suppressor"
code/modules/projectiles/guns/projectile.dm
+1 -17
View File
@@ -183,20 +183,4 @@
for(var/obj/item/ammo_casing/AC in magazine.stored_ammo)
if(AC.BB)
process_fire(user, user,0)
. = 1
/obj/item/suppressor
name = "suppressor"
desc = "A universal syndicate small-arms suppressor for maximum espionage."
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "suppressor"
item_state = "suppressor"
w_class = WEIGHT_CLASS_SMALL
var/oldsound = null
var/initial_w_class = null
/obj/item/suppressor/specialoffer
name = "cheap suppressor"
desc = "A foreign knock-off suppressor, it feels flimsy, cheap, and brittle. Still fits all weapons."
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "suppressor"
. = 1