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

Merge pull request #5532 from Citadel-Station-13/upstream-merge-35689

Browse Source 
[MIRROR] Space Ninja smoke bomb refill
This commit is contained in:
LetterJay
2018-02-16 12:10:18 -06:00
committed by GitHub
parent b949355888 24e8ec8bcb
commit e57623ca76
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/ninja/suit/suit.dm
View File

@@ -45,13 +45,14 @@ Contents:
var/s_delay = 40//How fast the suit does certain things, lower is faster. Can be overridden in specific procs. Also determines adverse probability.
var/a_transfer = 20//How much radium is used per adrenaline boost.
var/a_maxamount = 7//Maximum number of adrenaline boosts.
var/s_maxamount = 20//Maximum number of smoke bombs.
//Support function variables.
var/s_active = 0//Stealth off.
var/s_busy = FALSE//Is the suit busy with a process? Like AI hacking. Used for safety functions.
//Ability function variables.
var/s_bombs = 10//Number of starting ninja smoke bombs.
var/s_bombs = 10//Number of smoke bombs.
var/a_boost = 3//Number of adrenaline boosters.

6
code/modules/ninja/suit/suit_attackby.dm
View File

@@ -10,6 +10,12 @@
a_boost++;
to_chat(U, "<span class='notice'>There are now [a_boost] adrenaline boosts remaining.</span>")
return
if(I.reagents.has_reagent("smoke_powder", a_transfer) && s_bombs < s_maxamount)
I.reagents.remove_reagent("smoke_powder", a_transfer)
s_bombs++;
to_chat(U, "<span class='notice'>There are now [s_bombs] smoke bombs remaining.</span>")
return
else if(istype(I, /obj/item/stock_parts/cell))
var/obj/item/stock_parts/cell/CELL = I