Merge pull request #12992 from Hatterhat/rifle-book-pt2
unatomic as shit PR about nukie guns
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/obj/item/ammo_box/magazine/m12g
|
||||
name = "shotgun magazine (12g buckshot slugs)"
|
||||
name = "shotgun magazine (12g buckshot)"
|
||||
desc = "A drum magazine."
|
||||
icon_state = "m12gb"
|
||||
ammo_type = /obj/item/ammo_casing/shotgun/buckshot
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
/obj/item/ammo_box/magazine/m12g/slug
|
||||
name = "shotgun magazine (12g slugs)"
|
||||
icon_state = "m12gb" //this may need an unique sprite
|
||||
icon_state = "m12gsl"
|
||||
ammo_type = /obj/item/ammo_casing/shotgun
|
||||
|
||||
/obj/item/ammo_box/magazine/m12g/dragon
|
||||
|
||||
@@ -84,6 +84,11 @@
|
||||
. = ..()
|
||||
. += "[get_ammo(0,0)] of those are live rounds."
|
||||
|
||||
/obj/item/gun/ballistic/revolver/syndicate
|
||||
unique_reskin = list("Default" = "revolver",
|
||||
"Silver" = "russianrevolver",
|
||||
"Robust" = "revolvercit")
|
||||
|
||||
/obj/item/gun/ballistic/revolver/detective
|
||||
name = "\improper .38 Mars Special"
|
||||
desc = "A cheap Martian knock-off of a classic law enforcement firearm. Uses .38-special rounds."
|
||||
@@ -486,4 +491,4 @@
|
||||
for(var/i = 0, i < ratio, i++)
|
||||
var/mutable_appearance/charge_bar = mutable_appearance(icon, "[initial(icon_state)]_charge", color = batt_color)
|
||||
charge_bar.pixel_x = i
|
||||
. += charge_bar
|
||||
. += charge_bar
|
||||
|
||||
Reference in New Issue
Block a user