Adds a random gun option to the uplink, Replaces the renegade's weapon with this kit (#8282)

This commit is contained in:
fernerr
2020-02-23 02:46:34 -03:00
committed by GitHub
parent 1277770019
commit 3dbf50da89
9 changed files with 186 additions and 23 deletions
@@ -85,6 +85,9 @@
magazine_type = /obj/item/ammo_magazine/mc9mmt/rubber
allowed_magazines = list(/obj/item/ammo_magazine/mc9mmt)
/obj/item/gun/projectile/automatic/wt550/lethal
magazine_type = /obj/item/ammo_magazine/mc9mmt
/obj/item/gun/projectile/automatic/wt550/update_icon()
..()
if(ammo_magazine)
@@ -344,6 +344,7 @@
caliber = "10mm"
w_class = 2
ammo_type = /obj/item/ammo_casing/c10mm
magazine_type = /obj/item/ammo_magazine/mc10mm/leyon
max_shells = 5
origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 1)
fire_sound = 'sound/weapons/gunshot/gunshot_pistol.ogg'
@@ -10,6 +10,7 @@
handle_casings = CYCLE_CASINGS
max_shells = 8
ammo_type = /obj/item/ammo_casing/a357
magazine_type = /obj/item/ammo_magazine/a357
fire_sound = 'sound/weapons/gunshot/gunshot_revolver.ogg'
var/chamber_offset = 0 //how many empty chambers in the cylinder until you hit a round
@@ -47,6 +48,7 @@
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
fire_sound = 'sound/weapons/gunshot/gunshot_mateba.ogg'
ammo_type = /obj/item/ammo_casing/a454
magazine_type = /obj/item/ammo_magazine/a454
/obj/item/gun/projectile/revolver/detective
name = "revolver"
@@ -60,6 +62,7 @@
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
ammo_type = /obj/item/ammo_casing/c38
magazine_type = /obj/item/ammo_magazine/c38
/obj/item/gun/projectile/revolver/detective/verb/rename_gun()
set name = "Name Gun"
@@ -90,6 +93,7 @@
item_state = "deckard"
caliber = "38"
ammo_type = /obj/item/ammo_casing/c38
magazine_type = null
fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
/obj/item/gun/projectile/revolver/deckard/update_icon()
@@ -120,6 +124,7 @@
load_method = SINGLE_CASING
max_shells = 2
ammo_type = /obj/item/ammo_casing/a357
magazine_type = null
/obj/item/gun/projectile/revolver/capgun
name = "cap gun"
@@ -157,6 +162,7 @@
caliber = "38"
fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
ammo_type = /obj/item/ammo_casing/c38
magazine_type = /obj/item/ammo_magazine/c38
var/secondary_max_shells = 1
var/secondary_caliber = "shotgun"
var/secondary_ammo_type = /obj/item/ammo_casing/shotgun/pellet
@@ -249,6 +255,7 @@
load_method = SINGLE_CASING
fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
ammo_type = /obj/item/ammo_casing/c38
magazine_type = null
description_fluff = "A simple and reliable double action revolver, favored by the nobility, officers and law enforcement. The design is known for having an outdated reloading \
mechanism, with the need to manually eject each of the used cartridges, and reload one cartridge at a time through a loading gate. However, their cheap manufacturing cost has \
@@ -8,6 +8,7 @@
fire_sound = 'sound/weapons/gunshot/gunshot_rifle.ogg'
caliber = "a762"
ammo_type = /obj/item/ammo_casing/a762
magazine_type = /obj/item/ammo_magazine/boltaction
max_shells = 5
pump_fail_msg = "<span class='warning'>You cannot work the rifle's bolt without gripping it with both hands!</span>"
@@ -62,6 +63,7 @@
handle_casings = HOLD_CASINGS
max_shells = 1
ammo_type = /obj/item/ammo_casing/a556
magazine_type = /obj/item/ammo_magazine/a556
slot_flags = SLOT_BELT|SLOT_HOLSTER
load_method = SINGLE_CASING
fire_sound = 'sound/weapons/gunshot/gunshot3.ogg'
@@ -130,6 +132,7 @@
handle_casings = HOLD_CASINGS
caliber = "vintage"
ammo_type = /obj/item/ammo_casing/vintage
magazine_type = /obj/item/ammo_magazine/boltaction/vintage
can_bayonet = TRUE
var/open_bolt = 0
var/obj/item/ammo_magazine/boltaction/vintage/has_clip