diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 2777fc1f75..01b9b81186 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -612,7 +612,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 name = "shock throwing star" desc = "An aerodynamic disc designed to cause excruciating pain when stuck inside fleeing targets, hopefully without causing fatal harm." throwforce = 5 - embedding = list("pain_chance" = 5, "embed_chance" = 100, "fall_chance" = 0, "jostle_chance" = 10, "pain_stam_pct" = 0.8, "jostle_pain_mult" = 3) + embedding = list("pain_chance" = 5, "embed_chance" = 100, "fall_chance" = 0, "jostle_chance" = 10, "pain_stam_pct" = 5, "jostle_pain_mult" = 3) /obj/item/throwing_star/toy name = "toy throwing star" diff --git a/code/modules/events/space_ninja.dm b/code/modules/events/space_ninja.dm index 23326ca167..19ac7d1c8e 100644 --- a/code/modules/events/space_ninja.dm +++ b/code/modules/events/space_ninja.dm @@ -48,4 +48,4 @@ random_human_options.real_name = "[pick(GLOB.ninja_titles)] [pick(GLOB.ninja_names)]" random_human_options.copy_to(new_ninja) new_ninja.dna.update_dna_identity() - return new_ninja \ No newline at end of file + return new_ninja diff --git a/code/modules/ninja/suit/gloves.dm b/code/modules/ninja/suit/gloves.dm index 77bf80216b..5a580b3290 100644 --- a/code/modules/ninja/suit/gloves.dm +++ b/code/modules/ninja/suit/gloves.dm @@ -11,8 +11,8 @@ /obj/item/clothing/gloves/space_ninja desc = "These nano-enhanced gloves insulate from electricity and provide fire resistance." name = "ninja gloves" - icon_state = "black" - item_state = "ninja_new" + icon_state = "s-ninja" + item_state = "s-ninja" siemens_coefficient = 0 cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT diff --git a/code/modules/ninja/suit/head.dm b/code/modules/ninja/suit/head.dm index 55701a799d..6f9bc7ef4c 100644 --- a/code/modules/ninja/suit/head.dm +++ b/code/modules/ninja/suit/head.dm @@ -9,8 +9,8 @@ /obj/item/clothing/head/helmet/space/space_ninja desc = "What may appear to be a simple black garment is in fact a highly sophisticated nano-weave helmet. Standard issue ninja gear." name = "ninja hood" - icon_state = "ninja_newcowl" - item_state = "ninja_newcowl" + icon_state = "s-ninja" + item_state = "s-ninja_mask" armor = list(MELEE = 40, BULLET = 30, LASER = 20,ENERGY = 15, BOMB = 30, BIO = 30, RAD = 25, FIRE = 100, ACID = 100) resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF blockTracking = TRUE//Roughly the only unique thing about this helmet. diff --git a/code/modules/ninja/suit/mask.dm b/code/modules/ninja/suit/mask.dm index 237b252030..111f76ae65 100644 --- a/code/modules/ninja/suit/mask.dm +++ b/code/modules/ninja/suit/mask.dm @@ -9,8 +9,8 @@ /obj/item/clothing/mask/gas/space_ninja name = "ninja mask" desc = "A close-fitting mask that acts both as an air filter and a post-modern fashion statement." - icon_state = "ninja_new" - item_state = "ninja_new" + icon_state = "s-ninja" + item_state = "s-ninja_mask" strip_delay = 120 resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF modifies_speech = TRUE diff --git a/code/modules/ninja/suit/ninja_equipment_actions/ninja_adrenaline.dm b/code/modules/ninja/suit/ninja_equipment_actions/ninja_adrenaline.dm index 35d69563b6..cc0915a5ae 100644 --- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_adrenaline.dm +++ b/code/modules/ninja/suit/ninja_equipment_actions/ninja_adrenaline.dm @@ -7,6 +7,7 @@ desc = "Inject a secret chemical that will counteract all movement-impairing effect." button_icon_state = "adrenal" icon_icon = 'icons/obj/implants.dmi' + required_mobility_flags = NONE /** * Proc called to activate space ninja's adrenaline. diff --git a/code/modules/ninja/suit/ninja_equipment_actions/ninja_glove_toggle.dm b/code/modules/ninja/suit/ninja_equipment_actions/ninja_glove_toggle.dm index d78984fa37..ec5bf078a5 100644 --- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_glove_toggle.dm +++ b/code/modules/ninja/suit/ninja_equipment_actions/ninja_glove_toggle.dm @@ -1,7 +1,7 @@ /datum/action/item_action/toggle_glove name = "Toggle interaction" desc = "Switch between normal interaction and drain mode." - button_icon_state = "ninja_new" + button_icon_state = "s-ninjan" icon_icon = 'icons/obj/clothing/gloves.dmi' /** diff --git a/code/modules/ninja/suit/ninja_equipment_actions/ninja_suit_initialisation.dm b/code/modules/ninja/suit/ninja_equipment_actions/ninja_suit_initialisation.dm index 041fe88710..c1a3c77814 100644 --- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_suit_initialisation.dm +++ b/code/modules/ninja/suit/ninja_equipment_actions/ninja_suit_initialisation.dm @@ -72,6 +72,7 @@ GLOBAL_LIST_INIT(ninja_deinitialize_messages, list( message += "[DisplayEnergy(cell.charge)]." if (NINJA_COMPLETE_PHASE) message += "[ninja.real_name]." + ninja.regenerate_icons() s_initialized = TRUE s_busy = FALSE diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm index 6dc2c5dda6..40b6d21975 100644 --- a/code/modules/ninja/suit/suit.dm +++ b/code/modules/ninja/suit/suit.dm @@ -11,8 +11,8 @@ /obj/item/clothing/suit/space/space_ninja name = "ninja suit" desc = "A unique, vacuum-proof suit of nano-enhanced armor designed specifically for Spider Clan assassins." - icon_state = "ninja_new" - item_state = "ninja_new" + icon_state = "s-ninja" + item_state = "s-ninja_suit" allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/stock_parts/cell) slowdown = 1 resistance_flags = LAVA_PROOF | ACID_PROOF @@ -149,6 +149,7 @@ affecting = ninja ADD_TRAIT(src, TRAIT_NODROP, NINJA_SUIT_TRAIT) //colons make me go all |= slowdown = 0 + icon_state = "s-ninjan" n_hood = ninja.head ADD_TRAIT(n_hood, TRAIT_NODROP, NINJA_SUIT_TRAIT) n_shoes = ninja.shoes @@ -156,12 +157,15 @@ n_shoes.slowdown-- n_gloves = ninja.gloves ADD_TRAIT(n_gloves, TRAIT_NODROP, NINJA_SUIT_TRAIT) + n_gloves.icon_state = "s-ninjan" + n_gloves.item_state = "s-ninjan" n_mask = ninja.wear_mask + n_mask.icon_state = "s-ninjan" + n_mask.item_state = "s-ninjan" ADD_TRAIT(ninja, TRAIT_NOGUNS, NINJA_SUIT_TRAIT) return TRUE - /** * Proc called to unlock all the gear off space ninja's body. * @@ -174,22 +178,24 @@ affecting = null REMOVE_TRAIT(src, TRAIT_NODROP, NINJA_SUIT_TRAIT) slowdown = 1 - icon_state = "ninja_new" + icon_state = "s-ninja" if(n_hood)//Should be attached, might not be attached. REMOVE_TRAIT(n_hood, TRAIT_NODROP, NINJA_SUIT_TRAIT) - n_hood.icon_state = "ninja_newcowl" + n_hood.icon_state = "s-ninja" if(n_shoes) REMOVE_TRAIT(n_shoes, TRAIT_NODROP, NINJA_SUIT_TRAIT) n_shoes.slowdown++ if(n_gloves) - n_gloves.icon_state = "black" + n_gloves.icon_state = "s-ninja" + n_gloves.item_state = "s-ninja" REMOVE_TRAIT(n_gloves, TRAIT_NODROP, NINJA_SUIT_TRAIT) n_gloves.candrain = FALSE n_gloves.draining = FALSE + if(n_mask) + n_mask.icon_state = "s-ninja" + n_mask.item_state = "s-ninja" REMOVE_TRAIT(ninja, TRAIT_NOGUNS, NINJA_SUIT_TRAIT) - if(n_mask) - n_mask.icon_state = "ninja_new" /** * Proc used to delete all the attachments and itself. diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index adcd7b64e1..80c18d863a 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi index 82c3700349..858aabef6c 100644 Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index c1e29e2845..809d86e27d 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi index cee2c53e7c..9e8629b97b 100644 Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 16399357c9..533d2f3ef4 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index c5b43b3b3c..261fed7eea 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index fd1ed97582..7a00deddab 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 96bea9965e..8952f42892 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 8039c3a78d..9354fba466 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ