cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Touches up the Makarov sprites one last time, totally doesn't add a shadowy fake 10mm Makarov. [MDB IGNORE] (#14888)

Browse Source 
* Touches up the Makarov sprites one last time, totally doesn't add a shadowy fake 10mm Makarov.

* Apply suggestions from code review

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-07-13 15:21:42 +00:00
committed by GitHub
co-authored by necromanceranne Tom
parent 9992bffe1c
commit ba89cb633c
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/ballistic/pistol.dm
+12 -3
View File
@@ -1,5 +1,5 @@
/obj/item/gun/ballistic/automatic/pistol
name = "makarov pistol"
name = "\improper Makarov pistol"
// desc = "A small, easily concealable 9mm handgun. Has a threaded barrel for suppressors." // SKYRAT EDIT: Original
desc = "A small, easily concealable 9x25mm Mk.12 handgun. Has a threaded barrel for suppressors." // SKYRAT EDIT: Calibre rename
icon_state = "pistol"
@@ -22,7 +22,8 @@
bolt_drop_sound = 'sound/weapons/gun/pistol/drop_small.ogg'
fire_sound_volume = 90
bolt_wording = "slide"
suppressor_x_offset = 4
suppressor_x_offset = 10
suppressor_y_offset = -1
/obj/item/gun/ballistic/automatic/pistol/no_mag
spawnwithmagazine = FALSE
@@ -35,6 +36,14 @@
var/obj/item/suppressor/S = new(src)
install_suppressor(S)
/obj/item/gun/ballistic/automatic/pistol/clandestine
name = "\improper Ansem pistol"
desc = "The spiritual successor of the Makarov, or maybe someone just dropped their gun in a bucket of paint. The gun is chambered in 10mm."
icon_state = "pistol_evil"
mag_type = /obj/item/ammo_box/magazine/m10mm
empty_indicator = TRUE
suppressor_x_offset = 12
/obj/item/gun/ballistic/automatic/pistol/m1911 //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE
name = "\improper M1911"
desc = "A classic .45 handgun with a small magazine capacity."
@@ -77,7 +86,7 @@
// SKYRAT EDIT END
/obj/item/gun/ballistic/automatic/pistol/aps
name = "stechkin APS machine pistol"
name = "\improper Stechkin APS machine pistol"
desc = "A modernized reproduction of an old Soviet machine pistol. It fires quickly, but kicks like a mule. Uses 9mm ammo. Has a threaded barrel for suppressors." //SKYRAT EDIT
icon_state = "aps"
w_class = WEIGHT_CLASS_NORMAL