shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11984 from Hatterhat/fastpump

Browse Source 
The Neo-Russian Rifleman's Primer - a book that makes you pump shotguns and work rifle bolts faster
This commit is contained in:
kevinz000
2020-04-25 17:07:29 -07:00
committed by GitHub
parent 24bac60a95 57eedfbe63
commit af08e0fecf
4 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/projectiles/guns/ballistic/shotgun.dm
View File

@@ -41,9 +41,12 @@
to_chat(user, "<span class='warning'>You're too exhausted for that.</span>")//CIT CHANGE - ditto
return//CIT CHANGE - ditto
pump(user, TRUE)
recentpump = world.time + 10
if(istype(user))//CIT CHANGE - makes pumping shotguns cost a lil bit of stamina.
user.adjustStaminaLossBuffered(2) //CIT CHANGE - DITTO. make this scale inversely to the strength stat when stats/skills are added
if(HAS_TRAIT(user, TRAIT_FAST_PUMP))
recentpump = world.time + 2
else
recentpump = world.time + 10
if(istype(user))//CIT CHANGE - makes pumping shotguns cost a lil bit of stamina.
user.adjustStaminaLossBuffered(2) //CIT CHANGE - DITTO. make this scale inversely to the strength stat when stats/skills are added
return
/obj/item/gun/ballistic/shotgun/blow_up(mob/user)
@@ -90,7 +93,7 @@
fire_delay = 7
mag_type = /obj/item/ammo_box/magazine/internal/shot/riot
sawn_desc = "Come with me if you want to live."
unique_reskin = list("Tatical" = "riotshotgun",
unique_reskin = list("Tactical" = "riotshotgun",
"Wood Stock" = "wood_riotshotgun"
)
@@ -212,7 +215,7 @@
fire_delay = 5
mag_type = /obj/item/ammo_box/magazine/internal/shot/com
w_class = WEIGHT_CLASS_HUGE
unique_reskin = list("Tatical" = "cshotgun",
unique_reskin = list("Tactical" = "cshotgun",
"Slick" = "cshotgun_slick"
)

10
code/modules/uplink/uplink_items/uplink_devices.dm
View File

@@ -188,6 +188,16 @@
item = /obj/item/healthanalyzer/rad_laser
cost = 3
/datum/uplink_item/device_tools/riflery_primer
name = "Riflery Primer"
desc = "An old book with blood and vodka stains on it. Freshly pulled from a dusty crate in some old warehouse, \
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
/datum/uplink_item/device_tools/stimpack
name = "Stimpack"
desc = "Stimpacks, the tool of many great heroes, make you nearly immune to stuns and knockdowns for about \