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

un

Browse Source
This commit is contained in:
zerothebigboy
2021-02-09 18:49:45 -05:00
parent 7d60d27a6f
commit 097666a71a
5 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weaponry.dm
+1 -1
View File
@@ -612,7 +612,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
name = "shock throwing star" name = "shock throwing star"
desc = "An aerodynamic disc designed to cause excruciating pain when stuck inside fleeing targets, hopefully without causing fatal harm." desc = "An aerodynamic disc designed to cause excruciating pain when stuck inside fleeing targets, hopefully without causing fatal harm."
throwforce = 5 throwforce = 5
embedding = list("pain_chance" = 5, "embed_chance" = 100, "fall_chance" = 0, "jostle_chance" = 10, "pain_stam_pct" = 20, "jostle_pain_mult" = 3) embedding = list("pain_chance" = 5, "embed_chance" = 100, "fall_chance" = 0, "jostle_chance" = 10, "pain_stam_pct" = 0.8, "jostle_pain_mult" = 3)
/obj/item/throwing_star/toy /obj/item/throwing_star/toy
name = "toy throwing star" name = "toy throwing star"
code/modules/ninja/outfit.dm
+2 -1
View File
@@ -9,8 +9,9 @@
shoes = /obj/item/clothing/shoes/space_ninja shoes = /obj/item/clothing/shoes/space_ninja
gloves = /obj/item/clothing/gloves/space_ninja gloves = /obj/item/clothing/gloves/space_ninja
l_pocket = /obj/item/grenade/plastic/c4/ninja l_pocket = /obj/item/grenade/plastic/c4/ninja
r_pocket = /obj/item/hypospray/mkii/CMO/combat
suit_store = /obj/item/tank/internals/oxygen suit_store = /obj/item/tank/internals/oxygen
internals_slot = ITEM_SLOT_SUITSTORE internals_slot = SLOT_S_STORE
belt = /obj/item/energy_katana belt = /obj/item/energy_katana
implants = list(/obj/item/implant/explosive) implants = list(/obj/item/implant/explosive)
code/modules/ninja/suit/ninja_equipment_actions/ninja_adrenaline.dm
-1
View File
@@ -30,7 +30,6 @@
ninja.say(pick("A CORNERED FOX IS MORE DANGEROUS THAN A JACKAL!","HURT ME MOOORRREEE!","IMPRESSIVE!"), forced = "ninjaboost") ninja.say(pick("A CORNERED FOX IS MORE DANGEROUS THAN A JACKAL!","HURT ME MOOORRREEE!","IMPRESSIVE!"), forced = "ninjaboost")
a_boost = FALSE a_boost = FALSE
to_chat(ninja, "<span class='notice'>You have used the adrenaline boost.</span>") to_chat(ninja, "<span class='notice'>You have used the adrenaline boost.</span>")
s_coold = 6
addtimer(CALLBACK(src, .proc/ninjaboost_after), 70) addtimer(CALLBACK(src, .proc/ninjaboost_after), 70)
/** /**
code/modules/ninja/suit/ninja_equipment_actions/ninja_suit_initialisation.dm
-3
View File
@@ -68,9 +68,6 @@ GLOBAL_LIST_INIT(ninja_deinitialize_messages, list(
if(!lock_suit(ninja))//To lock the suit onto wearer. if(!lock_suit(ninja))//To lock the suit onto wearer.
s_busy = FALSE s_busy = FALSE
return return
if (NINJA_ICON_GENERATE_PHASE)
lockIcons(ninja)//Check for icons.
ninja.regenerate_icons()
if (NINJA_COMPLETE_PHASE - 1) if (NINJA_COMPLETE_PHASE - 1)
message += "<B>[DisplayEnergy(cell.charge)]</B>." message += "<B>[DisplayEnergy(cell.charge)]</B>."
if (NINJA_COMPLETE_PHASE) if (NINJA_COMPLETE_PHASE)
code/modules/ninja/suit/suit.dm
+3 -3
View File
@@ -174,10 +174,10 @@
affecting = null affecting = null
REMOVE_TRAIT(src, TRAIT_NODROP, NINJA_SUIT_TRAIT) REMOVE_TRAIT(src, TRAIT_NODROP, NINJA_SUIT_TRAIT)
slowdown = 1 slowdown = 1
icon_state = "s-ninja" icon_state = "ninja_new"
if(n_hood)//Should be attached, might not be attached. if(n_hood)//Should be attached, might not be attached.
REMOVE_TRAIT(n_hood, TRAIT_NODROP, NINJA_SUIT_TRAIT) REMOVE_TRAIT(n_hood, TRAIT_NODROP, NINJA_SUIT_TRAIT)
n_hood.icon_state = "s-ninja" n_hood.icon_state = "ninja_newcowl"
if(n_shoes) if(n_shoes)
REMOVE_TRAIT(n_shoes, TRAIT_NODROP, NINJA_SUIT_TRAIT) REMOVE_TRAIT(n_shoes, TRAIT_NODROP, NINJA_SUIT_TRAIT)
n_shoes.slowdown++ n_shoes.slowdown++
@@ -189,7 +189,7 @@
REMOVE_TRAIT(ninja, TRAIT_NOGUNS, NINJA_SUIT_TRAIT) REMOVE_TRAIT(ninja, TRAIT_NOGUNS, NINJA_SUIT_TRAIT)
if(n_mask) if(n_mask)
n_mask.icon_state = "s-ninja" n_mask.icon_state = "ninja_new"
/** /**
* Proc used to delete all the attachments and itself. * Proc used to delete all the attachments and itself.