cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-23 20:16:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation into DarkTheme

Browse Source
This commit is contained in:
Jon
2018-12-22 14:46:19 +00:00
parent 9952e2cd9c 6184ac662e
commit ab60a12b38
24 changed files with 168 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/fluffstuff/custom_guns_vr.dm
+8
View File
@@ -157,6 +157,14 @@
else
..()
//Tomtyph : Sarika
/obj/item/weapon/gun/projectile/revolver/mateba/fluff/tasald_corlethian/tomtyph
name = "\improper \"Black Iron\" revolver"
desc = "A single-action .357 revolver with a wooden grip and black iron receiver. A faded name is etched onto the handle. All you can make out is a single T. "
icon_state = "black_iron"
item_state = "revolver"
fire_sound = 'sound/weapons/pistol.ogg'
// wankersonofjerkin : Glenn Pink
/obj/item/weapon/gun/projectile/revolver/fluff/admiral_pink_revolver
name = "Admiral Pink's 'Devilgun'"