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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

Browse Source
This commit is contained in:
Ghommie
2020-01-12 19:18:03 +01:00
parent 686a76dd1d 8c50b578b4
commit c14439494a
1472 changed files with 218564 additions and 214937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm
+2 -2
View File
@@ -4,7 +4,7 @@
if(!ninjacost(0,N_ADRENALINE))
var/mob/living/carbon/human/H = affecting
H.do_adrenaline(150, TRUE, 0, 0, TRUE, list("inaprovaline" = 3, "synaptizine" = 10, "omnizine" = 10), "<span class='boldnotice'>You feel a sudden surge of energy!</span>")
H.do_adrenaline(150, TRUE, 0, 0, TRUE, list(/datum/reagent/medicine/inaprovaline = 3, /datum/reagent/medicine/synaptizine = 10, /datum/reagent/medicine/omnizine = 10), "<span class='boldnotice'>You feel a sudden surge of energy!</span>")
H.say(pick("A CORNERED FOX IS MORE DANGEROUS THAN A JACKAL!","HURT ME MOOORRREEE!","IMPRESSIVE!"), forced = "ninjaboost")
@@ -15,5 +15,5 @@
/obj/item/clothing/suit/space/space_ninja/proc/ninjaboost_after()
var/mob/living/carbon/human/H = affecting
H.reagents.add_reagent("radium", a_transfer)
H.reagents.add_reagent(/datum/reagent/radium, a_transfer)
to_chat(H, "<span class='danger'>You are beginning to feel the after-effect of the injection.</span>")
code/modules/ninja/suit/suit_attackby.dm
+4 -4
View File
@@ -5,13 +5,13 @@
return ..()
if(istype(I, /obj/item/reagent_containers/glass))//If it's a glass beaker.
if(I.reagents.has_reagent("radium", a_transfer) && a_boost < a_maxamount)
I.reagents.remove_reagent("radium", a_transfer)
if(I.reagents.has_reagent(/datum/reagent/radium, a_transfer) && a_boost < a_maxamount)
I.reagents.remove_reagent(/datum/reagent/radium, a_transfer)
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)
if(I.reagents.has_reagent(/datum/reagent/smoke_powder, a_transfer) && s_bombs < s_maxamount)
I.reagents.remove_reagent(/datum/reagent/smoke_powder, a_transfer)
s_bombs++;
to_chat(U, "<span class='notice'>There are now [s_bombs] smoke bombs remaining.</span>")
return