diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index 1554142c8c..609cc3b719 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -79,7 +79,7 @@ ADD_TRAIT(user, granted_trait, BOOK_TRAIT) /obj/item/book/granter/trait/rifleman - name = "\proper the Neo-Russian Rifleman\'s Primer" + name = "The Neo-Russian Rifleman\'s Primer" desc = "A book with stains of vodka and...blood? The back is hard to read, but says something about bolt-actions. Or pump-actions. Both, maybe." oneuse = FALSE granted_trait = TRAIT_FAST_PUMP diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index bad858aa21..4f65a4597e 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -409,7 +409,7 @@ /obj/item/storage/box/syndie_kit/revolver /obj/item/storage/box/syndie_kit/revolver/PopulateContents() - new /obj/item/gun/ballistic/revolver(src) + new /obj/item/gun/ballistic/revolver/syndicate(src) new /obj/item/ammo_box/a357(src) /obj/item/storage/box/syndie_kit/pistol diff --git a/code/modules/projectiles/boxes_magazines/external/shotgun.dm b/code/modules/projectiles/boxes_magazines/external/shotgun.dm index 1001937678..ed41375aee 100644 --- a/code/modules/projectiles/boxes_magazines/external/shotgun.dm +++ b/code/modules/projectiles/boxes_magazines/external/shotgun.dm @@ -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 diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 289b43a669..a5ed45dd48 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -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 \ No newline at end of file + . += charge_bar diff --git a/code/modules/uplink/uplink_items/uplink_ammo.dm b/code/modules/uplink/uplink_items/uplink_ammo.dm index ce74773f8d..853f6111b2 100644 --- a/code/modules/uplink/uplink_items/uplink_ammo.dm +++ b/code/modules/uplink/uplink_items/uplink_ammo.dm @@ -291,10 +291,17 @@ /datum/uplink_item/ammo/bolt_action name = "Surplus Rifle Clip" desc = "A stripper clip used to quickly load bolt action rifles. Contains 5 rounds." - item = /obj/item/ammo_box/a762 + item = /obj/item/ammo_box/a762 cost = 1 include_modes = list(/datum/game_mode/nuclear) +/datum/uplink_item/ammo/bolt_action_bulk + name = "Surplus Rifle Clip Box" + desc = "An ammo box we found in a warehouse, holding 7 clips of 5 rounds for bolt-action rifles. Yes, the cheap ones." + item = /obj/item/storage/toolbox/ammo + cost = 4 + include_modes = list(/datum/game_mode/nuclear) + /datum/uplink_item/ammo/dark_gygax/bag name = "Dark Gygax Ammo Bag" desc = "A duffel bag containing ammo for three full reloads of the incendiary carbine and flash bang launcher that are equipped on a standard Dark Gygax exosuit." diff --git a/code/modules/uplink/uplink_items/uplink_devices.dm b/code/modules/uplink/uplink_items/uplink_devices.dm index eddf1760ed..5f5eb91a04 100644 --- a/code/modules/uplink/uplink_items/uplink_devices.dm +++ b/code/modules/uplink/uplink_items/uplink_devices.dm @@ -206,9 +206,7 @@ this primer of questionable worth and value is rumored to increase your rifle-bolt-working and/or shotgun \ racking fivefold. Then again, the techniques here only work on bolt-actions and pump-actions..." item = /obj/item/book/granter/trait/rifleman - cost = 3 - restricted_roles = list("Operative") // i want it to be surplusable but i also want it to be mostly nukie only, please advise - surplus = 90 + cost = 3 // fuck it available for everyone /datum/uplink_item/device_tools/stimpack name = "Stimpack" diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index bebb625440..e1caad8279 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 8c50e7da27..9c6df36f49 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ