From ee3ab47e01a478cdae26fa1a73c84818ed3a3091 Mon Sep 17 00:00:00 2001
From: Fikou <23585223+Fikou@users.noreply.github.com>
Date: Tue, 31 May 2022 23:25:27 +0200
Subject: [PATCH] Adds the Ninja MODsuit (#67220)
Why It's Good For The Game
Ninja code is pretty bad, I think it's best to move away into nice modular stuff instead.
Changelog
cl Fikou, PositiveEntropy, Nerevar, InfraRedBaron
refactor: the ninja space suit is now a modsuit
fix: fixes dash beams not working
/cl
---
code/__DEFINES/antagonists.dm | 3 +
code/__DEFINES/text.dm | 2 +
code/_globalvars/phobias.dm | 27 +-
code/_onclick/other_mobs.dm | 10 -
code/datums/dash_weapon.dm | 10 +-
code/datums/elements/digitalcamo.dm | 2 +-
code/game/objects/items.dm | 44 +-
.../abductor/equipment/abduction_gear.dm | 17 +-
code/modules/antagonists/nukeop/clownop.dm | 4 +-
code/modules/antagonists/nukeop/nukeop.dm | 4 +-
.../antagonists/space_ninja/space_ninja.dm | 2 +-
.../cargo/markets/market_items/clothing.dm | 2 +-
code/modules/clothing/gloves/_gloves.dm | 4 -
code/modules/clothing/head/_head.dm | 1 -
code/modules/clothing/outfits/standard.dm | 2 +
code/modules/events/shuttle_loan.dm | 2 +-
.../mob/living/carbon/human/human_helpers.dm | 9 -
code/modules/mob/living/living.dm | 2 +-
code/modules/mod/mod_control.dm | 6 +-
code/modules/mod/mod_core.dm | 15 +
code/modules/mod/mod_theme.dm | 55 +++
code/modules/mod/mod_types.dm | 25 +-
code/modules/mod/mod_ui.dm | 28 +-
code/modules/mod/modules/_module.dm | 4 +-
.../mod/modules/modules_engineering.dm | 8 +-
code/modules/mod/modules/modules_maint.dm | 2 +-
code/modules/mod/modules/modules_medical.dm | 12 +-
code/modules/mod/modules/modules_ninja.dm | 444 ++++++++++++++++++
code/modules/mod/modules/modules_security.dm | 75 ---
code/modules/ninja/__ninjaDefines.dm | 22 -
code/modules/ninja/energy_katana.dm | 81 +---
.../energy_net_nets.dm | 0
code/modules/ninja/ninjaDrainAct.dm | 311 ++++++++++++
code/modules/ninja/ninja_clothing.dm | 25 +
code/modules/ninja/ninja_explosive.dm | 1 -
.../ninja_stars.dm | 24 -
code/modules/ninja/outfit.dm | 36 +-
code/modules/ninja/suit/gloves.dm | 68 ---
code/modules/ninja/suit/head.dm | 18 -
code/modules/ninja/suit/mask.dm | 16 -
code/modules/ninja/suit/ninjaDrainAct.dm | 311 ------------
.../ninja_adrenaline.dm | 45 --
.../ninja_cost_check.dm | 28 --
.../ninja_equipment_actions/ninja_empulse.dm | 21 -
.../suit/ninja_equipment_actions/ninja_net.dm | 42 --
.../ninja_status_read.dm | 38 --
.../ninja_equipment_actions/ninja_stealth.dm | 46 --
.../ninja_suit_initialisation.dm | 125 -----
.../ninja_sword_recall.dm | 47 --
code/modules/ninja/suit/shoes.dm | 23 -
code/modules/ninja/suit/suit.dm | 255 ----------
code/modules/ninja/suit/suit_attackby.dm | 50 --
code/modules/power/cell.dm | 7 +
icons/mob/clothing/feet.dmi | Bin 22744 -> 23104 bytes
icons/mob/clothing/hands.dmi | Bin 17407 -> 16760 bytes
icons/mob/clothing/head.dmi | Bin 155453 -> 154864 bytes
icons/mob/clothing/mask.dmi | Bin 47270 -> 47911 bytes
icons/mob/clothing/modsuit/mod_clothing.dmi | Bin 121562 -> 125849 bytes
icons/mob/clothing/suit.dmi | Bin 325979 -> 327924 bytes
icons/mob/clothing/under/syndicate.dmi | Bin 17686 -> 18775 bytes
icons/mob/inhands/__inhand_template.dmi | Bin 1045 -> 1044 bytes
icons/mob/inhands/clothing_lefthand.dmi | Bin 67235 -> 66054 bytes
icons/mob/inhands/clothing_righthand.dmi | Bin 68615 -> 67301 bytes
icons/obj/clothing/gloves.dmi | Bin 29373 -> 28486 bytes
icons/obj/clothing/hats.dmi | Bin 84629 -> 83890 bytes
icons/obj/clothing/masks.dmi | Bin 36862 -> 37047 bytes
icons/obj/clothing/modsuit/mod_clothing.dmi | Bin 72469 -> 74722 bytes
icons/obj/clothing/modsuit/mod_modules.dmi | Bin 40841 -> 47147 bytes
icons/obj/clothing/shoes.dmi | Bin 20862 -> 20836 bytes
icons/obj/clothing/suits.dmi | Bin 121393 -> 118183 bytes
icons/obj/clothing/under/syndicate.dmi | Bin 4950 -> 5532 bytes
strings/ninja.json | 13 +
tgstation.dme | 23 +-
tgui/packages/tgui/interfaces/MODsuit.js | 200 +++++++-
74 files changed, 1222 insertions(+), 1475 deletions(-)
create mode 100644 code/modules/mod/modules/modules_ninja.dm
delete mode 100644 code/modules/ninja/__ninjaDefines.dm
rename code/modules/ninja/{suit/ninja_equipment_actions => }/energy_net_nets.dm (100%)
create mode 100644 code/modules/ninja/ninjaDrainAct.dm
create mode 100644 code/modules/ninja/ninja_clothing.dm
rename code/modules/ninja/{suit/ninja_equipment_actions => }/ninja_stars.dm (53%)
delete mode 100644 code/modules/ninja/suit/gloves.dm
delete mode 100644 code/modules/ninja/suit/head.dm
delete mode 100644 code/modules/ninja/suit/mask.dm
delete mode 100644 code/modules/ninja/suit/ninjaDrainAct.dm
delete mode 100644 code/modules/ninja/suit/ninja_equipment_actions/ninja_adrenaline.dm
delete mode 100644 code/modules/ninja/suit/ninja_equipment_actions/ninja_cost_check.dm
delete mode 100644 code/modules/ninja/suit/ninja_equipment_actions/ninja_empulse.dm
delete mode 100644 code/modules/ninja/suit/ninja_equipment_actions/ninja_net.dm
delete mode 100644 code/modules/ninja/suit/ninja_equipment_actions/ninja_status_read.dm
delete mode 100644 code/modules/ninja/suit/ninja_equipment_actions/ninja_stealth.dm
delete mode 100644 code/modules/ninja/suit/ninja_equipment_actions/ninja_suit_initialisation.dm
delete mode 100644 code/modules/ninja/suit/ninja_equipment_actions/ninja_sword_recall.dm
delete mode 100644 code/modules/ninja/suit/shoes.dm
delete mode 100644 code/modules/ninja/suit/suit.dm
delete mode 100644 code/modules/ninja/suit/suit_attackby.dm
create mode 100644 strings/ninja.json
diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm
index 2fd41985569..6a50ffababc 100644
--- a/code/__DEFINES/antagonists.dm
+++ b/code/__DEFINES/antagonists.dm
@@ -196,6 +196,9 @@ GLOBAL_LIST_INIT(ai_employers, list(
/// Checks if the given mob is a nuclear operative
#define IS_NUKE_OP(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/nukeop))
+//Tells whether or not someone is a space ninja
+#define IS_SPACE_NINJA(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/ninja))
+
/// Checks if the given mob is a heretic.
#define IS_HERETIC(mob) (mob.mind?.has_antag_datum(/datum/antagonist/heretic))
/// Check if the given mob is a heretic monster.
diff --git a/code/__DEFINES/text.dm b/code/__DEFINES/text.dm
index 89bf025b2d3..0b00b7dfc4b 100644
--- a/code/__DEFINES/text.dm
+++ b/code/__DEFINES/text.dm
@@ -57,3 +57,5 @@
#define CULT_SHUTTLE_CURSE "cult_shuttle_curse.json"
/// File location for eigenstasium lines
#define EIGENSTASIUM_FILE "eigenstasium.json"
+/// File location for ninja lines
+#define NINJA_FILE "ninja.json"
diff --git a/code/_globalvars/phobias.dm b/code/_globalvars/phobias.dm
index 5745f3bc8bb..453819c37cd 100644
--- a/code/_globalvars/phobias.dm
+++ b/code/_globalvars/phobias.dm
@@ -367,11 +367,9 @@ GLOBAL_LIST_INIT(phobia_objs, list(
)),
"anime" = typecacheof(list(
- /obj/item/clothing/gloves/space_ninja,
/obj/item/clothing/head/kitty/genuine,
- /obj/item/clothing/mask/gas/space_ninja,
- /obj/item/clothing/shoes/space_ninja,
- /obj/item/clothing/suit/space/space_ninja,
+ /obj/item/clothing/mask/gas/ninja,
+ /obj/item/clothing/under/syndicate/ninja,
/obj/item/clothing/under/costume/schoolgirl,
/obj/item/energy_katana,
/obj/item/food/chawanmushi,
@@ -428,27 +426,6 @@ GLOBAL_LIST_INIT(phobia_objs, list(
/obj/structure/beebox,
)),
- "anime" = typecacheof(list(
- /obj/item/clothing/gloves/space_ninja,
- /obj/item/clothing/head/kitty/genuine,
- /obj/item/clothing/mask/gas/space_ninja,
- /obj/item/clothing/shoes/space_ninja,
- /obj/item/clothing/suit/space/space_ninja,
- /obj/item/clothing/under/costume/schoolgirl,
- /obj/item/energy_katana,
- /obj/item/food/chawanmushi,
- /obj/item/food/sashimi,
- /obj/item/highfrequencyblade,
- /obj/item/katana,
- /obj/item/nullrod/claymore/katana,
- /obj/item/nullrod/scythe/vibro,
- /obj/item/reagent_containers/food/drinks/bottle/sake,
- /obj/item/throwing_star,
- /obj/item/toy/katana,
- /obj/structure/mineral_door/paperframe,
- /obj/structure/window/paperframe,
- )),
-
"blood" = typecacheof(list(
/obj/effect/decal/cleanable/blood,
/obj/item/reagent_containers/blood,
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index c65e7aef65e..b618a313076 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -29,12 +29,6 @@
to_chat(src, span_notice("You look at your arm and sigh."))
return
- // Special glove functions:
- // If the gloves do anything, have them return 1 to stop
- // normal attack_hand() here.
- var/obj/item/clothing/gloves/G = gloves // not typecast specifically enough in defines
- if(proximity_flag && istype(G) && G.Touch(A,1,modifiers))
- return
//This signal is needed to prevent gloves of the north star + hulk.
if(SEND_SIGNAL(src, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, A, proximity_flag, modifiers) & COMPONENT_CANCEL_ATTACK_CHAIN)
return
@@ -114,10 +108,6 @@
. = ..()
if(.)
return
- if(gloves)
- var/obj/item/clothing/gloves/G = gloves
- if(istype(G) && G.Touch(A,0,modifiers)) // for magic gloves
- return TRUE
if(isturf(A) && get_dist(src,A) <= 1)
Move_Pulled(A)
diff --git a/code/datums/dash_weapon.dm b/code/datums/dash_weapon.dm
index d4251b414c9..f0062228e4b 100644
--- a/code/datums/dash_weapon.dm
+++ b/code/datums/dash_weapon.dm
@@ -10,6 +10,7 @@
var/dash_sound = 'sound/magic/blink.ogg'
var/recharge_sound = 'sound/magic/charge.ogg'
var/beam_effect = "blur"
+ var/beam_length = 2 SECONDS
var/phasein = /obj/effect/temp_visual/dir_setting/ninja/phase
var/phaseout = /obj/effect/temp_visual/dir_setting/ninja/phase/out
@@ -33,18 +34,19 @@
/// Teleports user to target using do_teleport. Returns TRUE if teleport successful, FALSE otherwise.
/datum/action/innate/dash/proc/teleport(mob/user, atom/target)
if(!IsAvailable())
+ user.balloon_alert(user, "no charges!")
return FALSE
+ var/turf/current_turf = get_turf(user)
var/turf/target_turf = get_turf(target)
if(target in view(user.client.view, user))
if(!do_teleport(user, target_turf, no_effects = TRUE))
user.balloon_alert(user, "dash blocked by location!")
return FALSE
-
- var/obj/spot1 = new phaseout(get_turf(user), user.dir)
+ var/obj/spot1 = new phaseout(current_turf, user.dir)
+ var/obj/spot2 = new phasein(target_turf, user.dir)
+ spot1.Beam(spot2,beam_effect, time = beam_length)
playsound(target_turf, dash_sound, 25, TRUE)
- var/obj/spot2 = new phasein(get_turf(user), user.dir)
- spot1.Beam(spot2,beam_effect,time=2 SECONDS)
current_charges--
owner.update_action_buttons_icon()
addtimer(CALLBACK(src, .proc/charge), charge_rate)
diff --git a/code/datums/elements/digitalcamo.dm b/code/datums/elements/digitalcamo.dm
index dcfbbd3b650..ccd82b9c8be 100644
--- a/code/datums/elements/digitalcamo.dm
+++ b/code/datums/elements/digitalcamo.dm
@@ -44,7 +44,7 @@
to_chat(M, span_warning("[source.p_their()] skin seems to be shifting like something is moving below it."))
-/datum/element/digitalcamo/proc/can_track(datum/source)
+/datum/element/digitalcamo/proc/can_track(datum/source, mob/user)
SIGNAL_HANDLER
return COMPONENT_CANT_TRACK
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index a379108a77b..cf18d34f47f 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -707,29 +707,31 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e
do_drop_animation(location)
/obj/item/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
- if(hit_atom && !QDELETED(hit_atom))
- SEND_SIGNAL(src, COMSIG_MOVABLE_IMPACT, hit_atom, throwingdatum)
- if(get_temperature() && isliving(hit_atom))
- var/mob/living/L = hit_atom
- L.ignite_mob()
- var/itempush = 1
- if(w_class < 4)
- itempush = 0 //too light to push anything
- if(istype(hit_atom, /mob/living)) //Living mobs handle hit sounds differently.
- var/volume = get_volume_by_throwforce_and_or_w_class()
- if (throwforce > 0)
- if (mob_throw_hit_sound)
- playsound(hit_atom, mob_throw_hit_sound, volume, TRUE, -1)
- else if(hitsound)
- playsound(hit_atom, hitsound, volume, TRUE, -1)
- else
- playsound(hit_atom, 'sound/weapons/genhit.ogg',volume, TRUE, -1)
+ if(QDELETED(hit_atom))
+ return
+ if(SEND_SIGNAL(src, COMSIG_MOVABLE_IMPACT, hit_atom, throwingdatum) & COMPONENT_MOVABLE_IMPACT_NEVERMIND)
+ return
+ if(get_temperature() && isliving(hit_atom))
+ var/mob/living/L = hit_atom
+ L.ignite_mob()
+ var/itempush = 1
+ if(w_class < 4)
+ itempush = 0 //too light to push anything
+ if(istype(hit_atom, /mob/living)) //Living mobs handle hit sounds differently.
+ var/volume = get_volume_by_throwforce_and_or_w_class()
+ if (throwforce > 0)
+ if (mob_throw_hit_sound)
+ playsound(hit_atom, mob_throw_hit_sound, volume, TRUE, -1)
+ else if(hitsound)
+ playsound(hit_atom, hitsound, volume, TRUE, -1)
else
- playsound(hit_atom, 'sound/weapons/throwtap.ogg', 1, volume, -1)
-
+ playsound(hit_atom, 'sound/weapons/genhit.ogg',volume, TRUE, -1)
else
- playsound(src, drop_sound, YEET_SOUND_VOLUME, ignore_walls = FALSE)
- return hit_atom.hitby(src, 0, itempush, throwingdatum=throwingdatum)
+ playsound(hit_atom, 'sound/weapons/throwtap.ogg', 1, volume, -1)
+
+ else
+ playsound(src, drop_sound, YEET_SOUND_VOLUME, ignore_walls = FALSE)
+ return hit_atom.hitby(src, 0, itempush, throwingdatum=throwingdatum)
/obj/item/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, gentle = FALSE, quickstart = TRUE)
if(HAS_TRAIT(src, TRAIT_NODROP))
diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm
index 631226b25b3..47b89abbd87 100644
--- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm
+++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm
@@ -733,9 +733,24 @@ Congratulations! You are now trained for invasive xenobiology research!"}
desc = "Abduct with style - spiky style. Prevents digital tracking."
icon_state = "alienhelmet"
inhand_icon_state = "alienhelmet"
- blockTracking = TRUE
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
+/obj/item/clothing/head/helmet/abductor/equipped(mob/living/user, slot)
+ . = ..()
+ if(slot_flags & slot)
+ RegisterSignal(user, COMSIG_LIVING_CAN_TRACK, .proc/can_track)
+ else
+ UnregisterSignal(user, COMSIG_LIVING_CAN_TRACK)
+
+/obj/item/clothing/head/helmet/abductor/dropped(mob/living/user)
+ . = ..()
+ UnregisterSignal(user, COMSIG_LIVING_CAN_TRACK)
+
+/obj/item/clothing/head/helmet/abductor/proc/can_track(datum/source, mob/user)
+ SIGNAL_HANDLER
+
+ return COMPONENT_CANT_TRACK
+
// Operating Table / Beds / Lockers
/obj/structure/bed/abductor
diff --git a/code/modules/antagonists/nukeop/clownop.dm b/code/modules/antagonists/nukeop/clownop.dm
index f0c476c2838..3bed41d605d 100644
--- a/code/modules/antagonists/nukeop/clownop.dm
+++ b/code/modules/antagonists/nukeop/clownop.dm
@@ -68,7 +68,7 @@
/datum/outfit/clown_operative
name = "Clown Operative (Preview only)"
- back = /obj/item/mod/control/pre_equipped/syndicate_empty/honkerative
+ back = /obj/item/mod/control/pre_equipped/empty/syndicate/honkerative
uniform = /obj/item/clothing/under/syndicate
/datum/outfit/clown_operative/post_equip(mob/living/carbon/human/H, visualsOnly)
@@ -79,7 +79,7 @@
/datum/outfit/clown_operative_elite
name = "Clown Operative (Elite, Preview only)"
- back = /obj/item/mod/control/pre_equipped/syndicate_empty/honkerative
+ back = /obj/item/mod/control/pre_equipped/empty/syndicate/honkerative
uniform = /obj/item/clothing/under/syndicate
/datum/outfit/clown_operative_elite/post_equip(mob/living/carbon/human/H, visualsOnly)
diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm
index 28e063d00dd..6658f62fe46 100644
--- a/code/modules/antagonists/nukeop/nukeop.dm
+++ b/code/modules/antagonists/nukeop/nukeop.dm
@@ -191,7 +191,7 @@
/datum/outfit/nuclear_operative
name = "Nuclear Operative (Preview only)"
- back = /obj/item/mod/control/pre_equipped/syndicate_empty
+ back = /obj/item/mod/control/pre_equipped/empty/syndicate
uniform = /obj/item/clothing/under/syndicate
/datum/outfit/nuclear_operative/post_equip(mob/living/carbon/human/H, visualsOnly)
@@ -202,7 +202,7 @@
/datum/outfit/nuclear_operative_elite
name = "Nuclear Operative (Elite, Preview only)"
- back = /obj/item/mod/control/pre_equipped/syndicate_empty/elite
+ back = /obj/item/mod/control/pre_equipped/empty/elite
uniform = /obj/item/clothing/under/syndicate
l_hand = /obj/item/modular_computer/tablet/nukeops
r_hand = /obj/item/shield/energy
diff --git a/code/modules/antagonists/space_ninja/space_ninja.dm b/code/modules/antagonists/space_ninja/space_ninja.dm
index 367214ef1f4..dfadacde7d0 100644
--- a/code/modules/antagonists/space_ninja/space_ninja.dm
+++ b/code/modules/antagonists/space_ninja/space_ninja.dm
@@ -8,7 +8,7 @@
show_to_ghosts = TRUE
antag_moodlet = /datum/mood_event/focused
suicide_cry = "FOR THE SPIDER CLAN!!"
- preview_outfit = /datum/outfit/ninja
+ preview_outfit = /datum/outfit/ninja_preview
///Whether or not this ninja will obtain objectives
var/give_objectives = TRUE
///Whether or not this ninja receives the standard equipment
diff --git a/code/modules/cargo/markets/market_items/clothing.dm b/code/modules/cargo/markets/market_items/clothing.dm
index d750d66431d..fe715a5903c 100644
--- a/code/modules/cargo/markets/market_items/clothing.dm
+++ b/code/modules/cargo/markets/market_items/clothing.dm
@@ -4,7 +4,7 @@
/datum/market_item/clothing/ninja_mask
name = "Space Ninja Mask"
desc = "Apart from being acid, lava, fireproof and being hard to take off someone it does nothing special on it's own."
- item = /obj/item/clothing/mask/gas/space_ninja
+ item = /obj/item/clothing/mask/gas/ninja
price_min = CARGO_CRATE_VALUE
price_max = CARGO_CRATE_VALUE * 2.5
diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm
index f1111075c2b..269a8541695 100644
--- a/code/modules/clothing/gloves/_gloves.dm
+++ b/code/modules/clothing/gloves/_gloves.dm
@@ -41,10 +41,6 @@
var/mob/M = loc
M.update_inv_gloves()
-// Called just before an attack_hand(), in mob/UnarmedAttack()
-/obj/item/clothing/gloves/proc/Touch(atom/A, proximity, mouseparams)
- return FALSE // return 1 to cancel attack_hand()
-
/obj/item/clothing/gloves/wirecutter_act(mob/living/user, obj/item/I)
. = ..()
if(!cut_type)
diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm
index fd298f3bb88..1dabbf0ee5d 100644
--- a/code/modules/clothing/head/_head.dm
+++ b/code/modules/clothing/head/_head.dm
@@ -3,7 +3,6 @@
icon = 'icons/obj/clothing/hats.dmi'
body_parts_covered = HEAD
slot_flags = ITEM_SLOT_HEAD
- var/blockTracking = 0 //For AI tracking
var/can_toggle = null
///Special throw_impact for hats to frisbee hats at people to place them on their heads/attempt to de-hat them.
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index dc6bdacf739..40f8aba297c 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -418,6 +418,8 @@
/datum/outfit/chrono_agent/post_equip(mob/living/carbon/human/agent, visualsOnly)
. = ..()
var/obj/item/mod/control/mod = agent.back
+ if(!istype(mod))
+ return
var/obj/item/mod/module/eradication_lock/lock = locate(/obj/item/mod/module/eradication_lock) in mod.modules
lock.true_owner_ckey = agent.ckey
diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm
index 50ee3ae8d03..8cadb3390ec 100644
--- a/code/modules/events/shuttle_loan.dm
+++ b/code/modules/events/shuttle_loan.dm
@@ -155,7 +155,7 @@
var/turf/T = pick_n_take(empty_shuttle_turfs)
new /obj/effect/decal/remains/human(T)
- new /obj/item/clothing/shoes/space_ninja(T)
+ new /obj/item/clothing/shoes/jackboots/fast(T)
new /obj/item/clothing/mask/balaclava(T)
for(var/i in 1 to 5)
diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm
index 412556f42d4..fadb1f25482 100644
--- a/code/modules/mob/living/carbon/human/human_helpers.dm
+++ b/code/modules/mob/living/carbon/human/human_helpers.dm
@@ -85,15 +85,6 @@
return dna.species.handle_chemicals(R, src, delta_time, times_fired)
// if it returns 0, it will run the usual on_mob_life for that reagent. otherwise, it will stop after running handle_chemicals for the species.
-
-/mob/living/carbon/human/can_track(mob/living/user)
- if(istype(head, /obj/item/clothing/head))
- var/obj/item/clothing/head/hat = head
- if(hat.blockTracking)
- return 0
-
- return ..()
-
/mob/living/carbon/human/can_use_guns(obj/item/G)
. = ..()
if(G.trigger_guard == TRIGGER_GUARD_NORMAL)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 17547597943..e665e40f84d 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1130,7 +1130,7 @@
/mob/living/proc/can_track(mob/living/user)
//basic fast checks go first. When overriding this proc, I recommend calling ..() at the end.
- if(SEND_SIGNAL(src, COMSIG_LIVING_CAN_TRACK, args) & COMPONENT_CANT_TRACK)
+ if(SEND_SIGNAL(src, COMSIG_LIVING_CAN_TRACK, user) & COMPONENT_CANT_TRACK)
return FALSE
var/turf/T = get_turf(src)
if(!T)
diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm
index d4bf56f5803..51c0a6924d8 100644
--- a/code/modules/mod/mod_control.dm
+++ b/code/modules/mod/mod_control.dm
@@ -216,6 +216,7 @@
. += span_notice("You could remove [ai] with an intellicard.")
else
. += span_notice("You could install an AI with an intellicard.")
+ . += span_notice("You could examine it more thoroughly...")
/obj/item/mod/control/examine_more(mob/user)
. = ..()
@@ -507,7 +508,7 @@
return
var/module_reference = display_names[pick]
var/obj/item/mod/module/picked_module = locate(module_reference) in modules
- if(!istype(picked_module) || user.incapacitated())
+ if(!istype(picked_module))
return
picked_module.on_select()
@@ -592,6 +593,9 @@
/obj/item/mod/control/proc/subtract_charge(amount)
return core?.subtract_charge(amount) || FALSE
+/obj/item/mod/control/proc/check_charge(amount)
+ return core?.check_charge(amount) || FALSE
+
/obj/item/mod/control/proc/update_charge_alert()
if(!wearer)
return
diff --git a/code/modules/mod/mod_core.dm b/code/modules/mod/mod_core.dm
index 9d238ed0e2a..f72247f847e 100644
--- a/code/modules/mod/mod_core.dm
+++ b/code/modules/mod/mod_core.dm
@@ -38,6 +38,9 @@
/obj/item/mod/core/proc/subtract_charge(amount)
return FALSE
+/obj/item/mod/core/proc/check_charge(amount)
+ return FALSE
+
/obj/item/mod/core/proc/update_charge_alert()
mod.wearer.clear_alert(ALERT_MODSUIT_CHARGE)
@@ -62,6 +65,9 @@
/obj/item/mod/core/infinite/subtract_charge(amount)
return TRUE
+/obj/item/mod/core/infinite/check_charge(amount)
+ return TRUE
+
/obj/item/mod/core/standard
name = "MOD standard core"
icon_state = "mod-core-standard"
@@ -120,6 +126,9 @@
return FALSE
return charge_source.use(amount, TRUE)
+/obj/item/mod/core/standard/check_charge(amount)
+ return charge_amount() >= amount
+
/obj/item/mod/core/standard/update_charge_alert()
var/obj/item/stock_parts/cell/charge_source = charge_source()
if(!charge_source)
@@ -260,6 +269,9 @@
charge_source.adjust_charge(-amount*charge_modifier)
return TRUE
+/obj/item/mod/core/ethereal/check_charge(amount)
+ return charge_amount() >= amount*charge_modifier
+
/obj/item/mod/core/ethereal/update_charge_alert()
var/obj/item/organ/internal/stomach/ethereal/charge_source = charge_source()
if(charge_source)
@@ -309,6 +321,9 @@
charge = max(0, charge - amount)
return TRUE
+/obj/item/mod/core/plasma/check_charge(amount)
+ return charge_amount() >= amount
+
/obj/item/mod/core/plasma/update_charge_alert()
var/remaining_plasma = charge_amount() / max_charge_amount()
switch(remaining_plasma)
diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm
index eddc7ab7f2a..d6ca4f8303b 100644
--- a/code/modules/mod/mod_theme.dm
+++ b/code/modules/mod/mod_theme.dm
@@ -1012,6 +1012,61 @@
),
)
+/datum/mod_theme/ninja
+ name = "ninja"
+ desc = "A unique, vacuum-proof suit of nano-enhanced armor designed specifically for Spider Clan assassins."
+ extended_desc = "A suit of nano-enhanced armor designed specifically for Spider Clan assassin-saboteurs. \
+ This MODsuit employs the cutting edge of stealth and combat technology, built skin-tight but just as durable as \
+ suits two or three times as thick. The nanomachines making up the outermost layer of armor \
+ are capable of shifting their form into almost-microscopic radiating fins, rendering the suit itself \
+ nigh-immune to even volcanic heat. It's entirely sealed against even the strongest acids, \
+ and the myoelectric artifical muscles of the suit leave it light as a feather during movement."
+ default_skin = "ninja"
+ armor = list(MELEE = 40, BULLET = 30, LASER = 20, ENERGY = 30, BOMB = 30, BIO = 100, FIRE = 100, ACID = 100, WOUND = 10)
+ resistance_flags = LAVA_PROOF|FIRE_PROOF|ACID_PROOF
+ charge_drain = DEFAULT_CHARGE_DRAIN * 0.5
+ siemens_coefficient = 0
+ slowdown_inactive = 0.5
+ slowdown_active = 0
+ ui_theme = "hackerman"
+ inbuilt_modules = list(/obj/item/mod/module/welding/camera_vision, /obj/item/mod/module/hacker, /obj/item/mod/module/weapon_recall, /obj/item/mod/module/adrenaline_boost, /obj/item/mod/module/energy_net)
+ allowed_suit_storage = list(
+ /obj/item/flashlight,
+ /obj/item/tank/internals,
+ /obj/item/gun,
+ /obj/item/ammo_box,
+ /obj/item/ammo_casing,
+ /obj/item/melee/baton,
+ /obj/item/restraints/handcuffs,
+ )
+ skins = list(
+ "ninja" = list(
+ HELMET_FLAGS = list(
+ UNSEALED_LAYER = null,
+ UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ UNSEALED_INVISIBILITY = HIDEEARS|HIDEHAIR,
+ SEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEMASK|HIDEEYES|HIDEFACE|HIDESNOUT,
+ SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
+ ),
+ CHESTPLATE_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ ),
+ GAUNTLETS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ BOOTS_FLAGS = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+ CAN_OVERSLOT = TRUE,
+ ),
+ ),
+ )
+
/datum/mod_theme/prototype
name = "prototype"
desc = "A prototype modular suit powered by locomotives. While it is comfortable and has a big capacity, it remains very bulky and power-inefficient."
diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm
index 9bc81a1246d..05943ab7ae3 100644
--- a/code/modules/mod/mod_types.dm
+++ b/code/modules/mod/mod_types.dm
@@ -214,6 +214,18 @@
/obj/item/mod/module/emp_shield/advanced,
)
+/obj/item/mod/control/pre_equipped/ninja
+ theme = /datum/mod_theme/ninja
+ applied_cell = /obj/item/stock_parts/cell/ninja
+ initial_modules = list(
+ /obj/item/mod/module/noslip,
+ /obj/item/mod/module/stealth/ninja,
+ /obj/item/mod/module/dispenser/ninja,
+ /obj/item/mod/module/dna_lock/reinforced,
+ /obj/item/mod/module/emp_shield/pulse,
+ /obj/item/mod/module/status_readout,
+ )
+
/obj/item/mod/control/pre_equipped/prototype
theme = /datum/mod_theme/prototype
req_access = list(ACCESS_AWAY_GENERAL)
@@ -365,13 +377,18 @@
)
//these exist for the prefs menu
-/obj/item/mod/control/pre_equipped/syndicate_empty
+/obj/item/mod/control/pre_equipped/empty
+
+/obj/item/mod/control/pre_equipped/empty/syndicate
theme = /datum/mod_theme/syndicate
-/obj/item/mod/control/pre_equipped/syndicate_empty/honkerative
+/obj/item/mod/control/pre_equipped/empty/syndicate/honkerative
applied_skin = "honkerative"
-/obj/item/mod/control/pre_equipped/syndicate_empty/elite
+/obj/item/mod/control/pre_equipped/empty/elite
theme = /datum/mod_theme/elite
-INITIALIZE_IMMEDIATE(/obj/item/mod/control/pre_equipped/syndicate_empty)
+/obj/item/mod/control/pre_equipped/empty/ninja
+ theme = /datum/mod_theme/ninja
+
+INITIALIZE_IMMEDIATE(/obj/item/mod/control/pre_equipped/empty)
diff --git a/code/modules/mod/mod_ui.dm b/code/modules/mod/mod_ui.dm
index 9d70bef64d6..eda05225a85 100644
--- a/code/modules/mod/mod_ui.dm
+++ b/code/modules/mod/mod_ui.dm
@@ -21,20 +21,20 @@
data["modules"] = list()
for(var/obj/item/mod/module/module as anything in modules)
var/list/module_data = list(
- name = module.name,
- description = module.desc,
- module_type = module.module_type,
- active = module.active,
- pinned = module.pinned_to[user],
- idle_power = module.idle_power_cost,
- active_power = module.active_power_cost,
- use_power = module.use_power_cost,
- complexity = module.complexity,
- cooldown_time = module.cooldown_time,
- cooldown = round(COOLDOWN_TIMELEFT(module, cooldown_timer), 1 SECONDS),
- id = module.tgui_id,
- ref = REF(module),
- configuration_data = module.get_configuration()
+ "module_name" = module.name,
+ "description" = module.desc,
+ "module_type" = module.module_type,
+ "module_active" = module.active,
+ "pinned" = module.pinned_to[user],
+ "idle_power" = module.idle_power_cost,
+ "active_power" = module.active_power_cost,
+ "use_power" = module.use_power_cost,
+ "module_complexity" = module.complexity,
+ "cooldown_time" = module.cooldown_time,
+ "cooldown" = round(COOLDOWN_TIMELEFT(module, cooldown_timer), 1 SECONDS),
+ "id" = module.tgui_id,
+ "ref" = REF(module),
+ "configuration_data" = module.get_configuration()
)
module_data += module.add_ui_data()
data["modules"] += list(module_data)
diff --git a/code/modules/mod/modules/_module.dm b/code/modules/mod/modules/_module.dm
index 1cf5b66269b..8296ac3a11e 100644
--- a/code/modules/mod/modules/_module.dm
+++ b/code/modules/mod/modules/_module.dm
@@ -225,9 +225,7 @@
/// Checks if there is enough power in the suit
/obj/item/mod/module/proc/check_power(amount)
- if(mod.get_charge() < amount)
- return FALSE
- return TRUE
+ return mod.check_charge(amount)
/// Adds additional things to the MODsuit ui_data()
/obj/item/mod/module/proc/add_ui_data()
diff --git a/code/modules/mod/modules/modules_engineering.dm b/code/modules/mod/modules/modules_engineering.dm
index 87a5c18885a..6c0dc01610f 100644
--- a/code/modules/mod/modules/modules_engineering.dm
+++ b/code/modules/mod/modules/modules_engineering.dm
@@ -8,7 +8,7 @@
immunity against extremities such as spot and arc welding, solar eclipses, and handheld flashlights."
icon_state = "welding"
complexity = 1
- incompatible_modules = list(/obj/item/mod/module/welding)
+ incompatible_modules = list(/obj/item/mod/module/welding, /obj/item/mod/module/armor_booster)
overlay_state_inactive = "module_welding"
/obj/item/mod/module/welding/on_suit_activation()
@@ -168,9 +168,9 @@
/obj/item/mod/module/rad_protection/add_ui_data()
. = ..()
- .["userradiated"] = mod.wearer ? HAS_TRAIT(mod.wearer, TRAIT_IRRADIATED) : 0
- .["usertoxins"] = mod.wearer ? mod.wearer.getToxLoss() : 0
- .["usermaxtoxins"] = mod.wearer ? mod.wearer.getMaxHealth() : 0
+ .["userradiated"] = mod.wearer ? HAS_TRAIT(mod.wearer, TRAIT_IRRADIATED) : FALSE
+ .["usertoxins"] = mod.wearer?.getToxLoss() || 0
+ .["usermaxtoxins"] = mod.wearer?.getMaxHealth() || 0
.["threatlevel"] = perceived_threat_level
/obj/item/mod/module/rad_protection/proc/on_pre_potential_irradiation(datum/source, datum/radiation_pulse_information/pulse_information, insulation_to_target)
diff --git a/code/modules/mod/modules/modules_maint.dm b/code/modules/mod/modules/modules_maint.dm
index dbaa539b696..da8d5e5578d 100644
--- a/code/modules/mod/modules/modules_maint.dm
+++ b/code/modules/mod/modules/modules_maint.dm
@@ -178,7 +178,7 @@
icon_state = "bloon"
module_type = MODULE_USABLE
complexity = 1
- use_power_cost = DEFAULT_CHARGE_DRAIN*0.5
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 0.5
incompatible_modules = list(/obj/item/mod/module/balloon)
cooldown_time = 15 SECONDS
diff --git a/code/modules/mod/modules/modules_medical.dm b/code/modules/mod/modules/modules_medical.dm
index 19284a966fc..0894caa103c 100644
--- a/code/modules/mod/modules/modules_medical.dm
+++ b/code/modules/mod/modules/modules_medical.dm
@@ -25,12 +25,12 @@
/obj/item/mod/module/health_analyzer/add_ui_data()
. = ..()
- .["userhealth"] = mod.wearer ? mod.wearer.health : 0
- .["usermaxhealth"] = mod.wearer ? mod.wearer.getMaxHealth() : 0
- .["userbrute"] = mod.wearer ? mod.wearer.getBruteLoss() : 0
- .["userburn"] = mod.wearer ? mod.wearer.getFireLoss() : 0
- .["usertoxin"] = mod.wearer ? mod.wearer.getToxLoss() : 0
- .["useroxy"] = mod.wearer ? mod.wearer.getOxyLoss() : 0
+ .["userhealth"] = mod.wearer?.health || 0
+ .["usermaxhealth"] = mod.wearer?.getMaxHealth() || 0
+ .["userbrute"] = mod.wearer?.getBruteLoss() || 0
+ .["userburn"] = mod.wearer?.getFireLoss() || 0
+ .["usertoxin"] = mod.wearer?.getToxLoss() || 0
+ .["useroxy"] = mod.wearer?.getOxyLoss() || 0
/obj/item/mod/module/health_analyzer/on_select_use(atom/target)
. = ..()
diff --git a/code/modules/mod/modules/modules_ninja.dm b/code/modules/mod/modules/modules_ninja.dm
new file mode 100644
index 00000000000..896d8cba86e
--- /dev/null
+++ b/code/modules/mod/modules/modules_ninja.dm
@@ -0,0 +1,444 @@
+//Ninja modules for MODsuits
+
+///Cloaking - Lowers the user's visibility, can be interrupted by being touched or attacked.
+/obj/item/mod/module/stealth
+ name = "MOD prototype cloaking module"
+ desc = "A complete retrofitting of the suit, this is a form of visual concealment tech employing esoteric technology \
+ to bend light around the user, as well as mimetic materials to make the surface of the suit match the \
+ surroundings based off sensor data. For some reason, this tech is rarely seen."
+ icon_state = "cloak"
+ module_type = MODULE_TOGGLE
+ complexity = 4
+ active_power_cost = DEFAULT_CHARGE_DRAIN * 2
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 10
+ incompatible_modules = list(/obj/item/mod/module/stealth)
+ cooldown_time = 5 SECONDS
+ /// Whether or not the cloak turns off on bumping.
+ var/bumpoff = TRUE
+ /// The alpha applied when the cloak is on.
+ var/stealth_alpha = 50
+
+/obj/item/mod/module/stealth/on_activation()
+ . = ..()
+ if(!.)
+ return
+ if(bumpoff)
+ RegisterSignal(mod.wearer, COMSIG_LIVING_MOB_BUMP, .proc/unstealth)
+ RegisterSignal(mod.wearer, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, .proc/on_unarmed_attack)
+ RegisterSignal(mod.wearer, COMSIG_ATOM_BULLET_ACT, .proc/on_bullet_act)
+ RegisterSignal(mod.wearer, list(COMSIG_MOB_ITEM_ATTACK, COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_HITBY, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_PAW, COMSIG_CARBON_CUFF_ATTEMPTED), .proc/unstealth)
+ animate(mod.wearer, alpha = stealth_alpha, time = 1.5 SECONDS)
+ drain_power(use_power_cost)
+
+/obj/item/mod/module/stealth/on_deactivation(display_message = TRUE, deleting = FALSE)
+ . = ..()
+ if(!.)
+ return
+ if(bumpoff)
+ UnregisterSignal(mod.wearer, COMSIG_LIVING_MOB_BUMP)
+ UnregisterSignal(mod.wearer, list(COMSIG_HUMAN_MELEE_UNARMED_ATTACK, COMSIG_MOB_ITEM_ATTACK, COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_BULLET_ACT, COMSIG_ATOM_HITBY, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_PAW, COMSIG_CARBON_CUFF_ATTEMPTED))
+ animate(mod.wearer, alpha = 255, time = 1.5 SECONDS)
+
+/obj/item/mod/module/stealth/proc/unstealth(datum/source)
+ SIGNAL_HANDLER
+
+ to_chat(mod.wearer, span_warning("[src] gets discharged from contact!"))
+ do_sparks(2, TRUE, src)
+ drain_power(use_power_cost)
+ on_deactivation(display_message = TRUE, deleting = FALSE)
+
+/obj/item/mod/module/stealth/proc/on_unarmed_attack(datum/source, atom/target)
+ SIGNAL_HANDLER
+
+ if(!isliving(target))
+ return
+ unstealth(source)
+
+/obj/item/mod/module/stealth/proc/on_bullet_act(datum/source, obj/projectile/projectile)
+ SIGNAL_HANDLER
+
+ if(projectile.nodamage)
+ return
+ unstealth(source)
+
+//Advanced Cloaking - Doesn't turf off on bump, less power drain, more stealthy.
+/obj/item/mod/module/stealth/ninja
+ name = "MOD advanced cloaking module"
+ desc = "The latest in stealth technology, this module is a definite upgrade over previous versions. \
+ The field has been tuned to be even more responsive and fast-acting, with enough stability to \
+ continue operation of the field even if the user bumps into others. \
+ The power draw has been reduced drastically, making this perfect for activities like \
+ standing near sentry turrets for extended periods of time."
+ icon_state = "cloak_ninja"
+ bumpoff = FALSE
+ stealth_alpha = 20
+ active_power_cost = DEFAULT_CHARGE_DRAIN
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 5
+ cooldown_time = 3 SECONDS
+
+///Camera Vision - Prevents flashes, blocks tracking.
+/obj/item/mod/module/welding/camera_vision
+ name = "MOD camera vision module"
+ desc = "A module installed into the suit's helmet. This specialized piece of technology is built for subterfuge, \
+ replacing the standard visor with a nanotech display; capable of displaying specialized imagery at \
+ just the right frequency to jam all known forms of camera tracking and facial recognition, \
+ as well as automatically dimming incoming flashes of light to protect the user's eyes. Become the unseen."
+ icon_state = "welding_camera"
+ removable = FALSE
+ complexity = 0
+ overlay_state_inactive = null
+
+/obj/item/mod/module/welding/camera_vision/on_suit_activation()
+ . = ..()
+ RegisterSignal(mod.wearer, COMSIG_LIVING_CAN_TRACK, .proc/can_track)
+
+/obj/item/mod/module/welding/camera_vision/on_suit_deactivation(deleting = FALSE)
+ . = ..()
+ UnregisterSignal(mod.wearer, COMSIG_LIVING_CAN_TRACK)
+
+/obj/item/mod/module/welding/camera_vision/proc/can_track(datum/source, mob/user)
+ SIGNAL_HANDLER
+
+ return COMPONENT_CANT_TRACK
+
+//Ninja Star Dispenser - Dispenses ninja stars.
+/obj/item/mod/module/dispenser/ninja
+ name = "MOD ninja star dispenser module"
+ desc = "This piece of Spider Clan technology can exploit known energy-matter equivalence principles, \
+ using the nanites already hosted in the wearer's suit to transmute into monomolecular shuriken. \
+ While these lack the intense bleeding edge of conventional throwing stars, \
+ they have been set to electrify fleeing targets; and branded with the Spider Clan symbol."
+ dispense_type = /obj/item/throwing_star/stamina/ninja
+ cooldown_time = 0.5 SECONDS
+
+///Hacker - This module hooks onto your right-clicks with empty hands and causes ninja actions.
+/obj/item/mod/module/hacker
+ name = "MOD hacker module"
+ desc = "Built for one purpose, electronic warfare, this module is built into the hands. \
+ Using near-field communication alongside precise electro-stimulation of the wires in machines, \
+ this decker's dream is normally used to pass through doors like a phantom. \
+ It's also capable of non-precise electro-stimulation of an assassin-saboteur's opponents on disarming attacks."
+ icon_state = "hacker"
+ removable = FALSE
+ incompatible_modules = list(/obj/item/mod/module/hacker)
+ /// Minimum amount of power we can drain in a single drain action
+ var/mindrain = 200
+ /// Maximum amount of power we can drain in a single drain action
+ var/maxdrain = 400
+ /// Whether or not the communication console hack was used to summon another antagonist.
+ var/communication_console_hack_success = FALSE
+ /// How many times the module has been used to force open doors.
+ var/door_hack_counter = 0
+
+/obj/item/mod/module/hacker/on_suit_activation()
+ RegisterSignal(mod.wearer, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/hack)
+
+/obj/item/mod/module/hacker/on_suit_deactivation(deleting = FALSE)
+ UnregisterSignal(mod.wearer, COMSIG_HUMAN_EARLY_UNARMED_ATTACK)
+
+/obj/item/mod/module/hacker/proc/hack(mob/living/carbon/human/source, atom/target, proximity, modifiers)
+ SIGNAL_HANDLER
+
+ if(!LAZYACCESS(modifiers, RIGHT_CLICK) || !proximity)
+ return NONE
+ target.add_fingerprint(mod.wearer)
+ return target.ninjadrain_act(mod.wearer, src)
+
+/obj/item/mod/module/hacker/proc/charge_message(atom/drained_atom, drain_amount)
+ if(drain_amount)
+ to_chat(mod.wearer, span_notice("Gained [drain_amount] units of energy from [drained_atom]."))
+ else
+ to_chat(mod.wearer, span_warning("[drained_atom] has run dry of energy, you must find another source!"))
+
+///Weapon Recall - Teleports your katana to you, prevents gun use.
+/obj/item/mod/module/weapon_recall
+ name = "MOD weapon recall module"
+ desc = "The cornerstone of a clanmember's life as a blademaster, and a module symbolizing their eternal bond with their weapon. \
+ This hooks to the micro bluespace drive inside an energy katana's handle, capable of recalling it to the user's \
+ skilled hands wherever they are. However, those that make such a bond with their weapon are cursed to \
+ fusing their existence with acts of combat, with a singular purpose; Cutting Down Their Opponent. \
+ Their hand a hand that is cutting, their body a body that is cutting, their mind, a mind that is cutting. \
+ Ranged weapons are forbidden."
+ icon_state = "recall"
+ removable = FALSE
+ module_type = MODULE_USABLE
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 2
+ incompatible_modules = list(/obj/item/mod/module/weapon_recall)
+ cooldown_time = 0.5 SECONDS
+ /// The item linked to the module that will get recalled.
+ var/obj/item/linked_weapon
+ /// The accepted typepath we can link to.
+ var/accepted_type = /obj/item/energy_katana
+
+/obj/item/mod/module/weapon_recall/on_suit_activation()
+ ADD_TRAIT(mod.wearer, TRAIT_NOGUNS, MOD_TRAIT)
+
+/obj/item/mod/module/weapon_recall/on_suit_deactivation(deleting = FALSE)
+ REMOVE_TRAIT(mod.wearer, TRAIT_NOGUNS, MOD_TRAIT)
+
+/obj/item/mod/module/weapon_recall/on_use()
+ . = ..()
+ if(!.)
+ return
+ if(!linked_weapon)
+ var/obj/item/weapon_to_link = mod.wearer.is_holding_item_of_type(accepted_type)
+ if(!weapon_to_link)
+ balloon_alert(mod.wearer, "can't locate weapon!")
+ return
+ set_weapon(weapon_to_link)
+ balloon_alert(mod.wearer, "[linked_weapon.name] linked")
+ return
+ if(linked_weapon in mod.wearer.get_all_contents())
+ balloon_alert(mod.wearer, "already on self!")
+ return
+ var/distance = get_dist(mod.wearer, linked_weapon)
+ var/in_view = (linked_weapon in view(mod.wearer))
+ if(!in_view && !drain_power(use_power_cost * distance))
+ balloon_alert(mod.wearer, "not enough charge!")
+ return
+ linked_weapon.forceMove(linked_weapon.drop_location())
+ if(in_view)
+ do_sparks(5, FALSE, linked_weapon)
+ mod.wearer.visible_message(span_danger("[linked_weapon] flies towards [mod.wearer]!"),span_warning("You hold out your hand and [linked_weapon] flies towards you!"))
+ linked_weapon.throw_at(mod.wearer, distance+1, linked_weapon.throw_speed, mod.wearer)
+ else
+ recall_weapon()
+
+/obj/item/mod/module/weapon_recall/proc/set_weapon(obj/item/weapon)
+ linked_weapon = weapon
+ RegisterSignal(linked_weapon, COMSIG_MOVABLE_IMPACT, .proc/catch_weapon)
+ RegisterSignal(linked_weapon, COMSIG_PARENT_QDELETING, .proc/deleted_weapon)
+
+/obj/item/mod/module/weapon_recall/proc/recall_weapon(caught = FALSE)
+ linked_weapon.forceMove(get_turf(src))
+ var/alert = ""
+ if(mod.wearer.put_in_hands(linked_weapon))
+ alert = "[linked_weapon.name] teleports to your hand"
+ else if(mod.wearer.equip_to_slot_if_possible(linked_weapon, ITEM_SLOT_BELT, disable_warning = TRUE))
+ alert = "[linked_weapon.name] sheathes itself in your belt"
+ else
+ alert = "[linked_weapon.name] teleports under you"
+ if(caught)
+ if(mod.wearer.is_holding(linked_weapon))
+ alert = "you catch [linked_weapon.name]"
+ else
+ alert = "[linked_weapon.name] lands under you"
+ else
+ do_sparks(5, FALSE, linked_weapon)
+ if(alert)
+ balloon_alert(mod.wearer, alert)
+
+/obj/item/mod/module/weapon_recall/proc/catch_weapon(obj/item/source, atom/hit_atom, datum/thrownthing/thrownthing)
+ SIGNAL_HANDLER
+
+ if(!mod)
+ return
+ if(hit_atom != mod.wearer)
+ return
+ INVOKE_ASYNC(src, .proc/recall_weapon, TRUE)
+ return COMPONENT_MOVABLE_IMPACT_NEVERMIND
+
+/obj/item/mod/module/weapon_recall/proc/deleted_weapon(obj/item/source)
+ SIGNAL_HANDLER
+
+ linked_weapon = null
+
+//Reinforced DNA Lock - Gibs if wrong DNA, emp-proof.
+/obj/item/mod/module/dna_lock/reinforced
+ name = "MOD reinforced DNA lock module"
+ desc = "A module which engages with the various locks and seals tied to the suit's systems, \
+ enabling it to only be worn by someone corresponding with the user's exact DNA profile. \
+ Due to utilizing a skintight dampening shield, this one is entirely sealed against electromagnetic interference; \
+ it also dutifully protects the secrets of the Spider Clan from unknowing outsiders."
+ icon_state = "dnalock_ninja"
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 0.5
+
+/obj/item/mod/module/dna_lock/reinforced/on_mod_activation(datum/source, mob/user)
+ . = ..()
+ if(. != MOD_CANCEL_ACTIVATE || !isliving(user))
+ return
+ var/mob/living/living_user = user
+ to_chat(living_user, span_danger("fATaL EERRoR: 382200-*#00CODE RED\nUNAUTHORIZED USE DETECteD\nCoMMENCING SUB-R0UTIN3 13...\nTERMInATING U-U-USER..."))
+ living_user.gib()
+
+/obj/item/mod/module/dna_lock/reinforced/on_emp(datum/source, severity)
+ return
+
+//EMP Pulse - In addition to normal shielding, can also launch an EMP itself.
+/obj/item/mod/module/emp_shield/pulse
+ name = "MOD EMP pulse module"
+ desc = "This module is normally set to activate on dramatic gestures, inverting and expanding the suit's \
+ EMP dampening shield to cause an electromagnetic pulse of its own. While this won't interfere with the wearer, \
+ it will piss off everyone around them."
+ icon_state = "emp_pulse"
+ module_type = MODULE_USABLE
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 10
+ cooldown_time = 8 SECONDS
+
+/obj/item/mod/module/emp_shield/pulse/on_use()
+ . = ..()
+ if(!.)
+ return
+ playsound(src, 'sound/effects/empulse.ogg', 60, TRUE)
+ empulse(src, heavy_range = 4, light_range = 6)
+ drain_power(use_power_cost)
+
+///Status Readout - Puts a lot of information including health, nutrition, fingerprints, temperature to the suit TGUI.
+/obj/item/mod/module/status_readout
+ name = "MOD status readout module"
+ desc = "A once-common module, this technology went unfortunately out of fashion; \
+ and right into the arachnid grip of the Spider Clan. This hooks into the suit's spine, \
+ capable of capturing and displaying all possible biometric data of the wearer; sleep, nutrition, fitness, fingerprints, \
+ and even useful information such as their overall health and wellness."
+ icon_state = "status"
+ complexity = 1
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 0.1
+ incompatible_modules = list(/obj/item/mod/module/status_readout)
+ tgui_id = "status_readout"
+
+/obj/item/mod/module/status_readout/add_ui_data()
+ . = ..()
+ .["statustime"] = station_time_timestamp()
+ .["statusid"] = GLOB.round_id
+ .["statushealth"] = mod.wearer?.health || 0
+ .["statusmaxhealth"] = mod.wearer?.getMaxHealth() || 0
+ .["statusbrute"] = mod.wearer?.getBruteLoss() || 0
+ .["statusburn"] = mod.wearer?.getFireLoss() || 0
+ .["statustoxin"] = mod.wearer?.getToxLoss() || 0
+ .["statusoxy"] = mod.wearer?.getOxyLoss() || 0
+ .["statustemp"] = mod.wearer?.bodytemperature || 0
+ .["statusnutrition"] = mod.wearer?.nutrition || 0
+ .["statusfingerprints"] = mod.wearer ? md5(mod.wearer.dna.unique_identity) : null
+ .["statusdna"] = mod.wearer?.dna.unique_enzymes
+ .["statusviruses"] = null
+ if(!length(mod.wearer?.diseases))
+ return
+ var/list/viruses = list()
+ for(var/datum/disease/virus as anything in mod.wearer.diseases)
+ var/list/virus_data = list()
+ virus_data["name"] = virus.name
+ virus_data["type"] = virus.spread_text
+ virus_data["stage"] = virus.stage
+ virus_data["maxstage"] = virus.max_stages
+ virus_data["cure"] = virus.cure_text
+ viruses += list(virus_data)
+ .["statusviruses"] = viruses
+
+///Energy Net - Ensnares enemies in a net that prevents movement.
+/obj/item/mod/module/energy_net
+ name = "MOD energy net module"
+ desc = "A custom-built net-thrower. While conventional implementations of this capturing device \
+ tilize monomolecular fibers or cutting razorwire, this uses hardlight technology to deploy a \
+ trapping field capable of immobilizing even the strongest opponents."
+ icon_state = "energy_net"
+ removable = FALSE
+ module_type = MODULE_ACTIVE
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 6
+ incompatible_modules = list(/obj/item/mod/module/energy_net)
+ cooldown_time = 1.5 SECONDS
+
+/obj/item/mod/module/energy_net/on_select_use(atom/target)
+ . = ..()
+ if(!.)
+ return
+ if(!isliving(target))
+ balloon_alert(mod.wearer, "invalid target!")
+ return
+ var/mob/living/living_target = target
+ if(locate(/obj/structure/energy_net) in get_turf(living_target))
+ balloon_alert(mod.wearer, "already trapped!")
+ return
+ for(var/turf/between_turf as anything in get_line(get_turf(mod.wearer), get_turf(living_target)))
+ if(between_turf.density)
+ balloon_alert(mod.wearer, "not through obstacles!")
+ return
+ if(IS_SPACE_NINJA(mod.wearer))
+ mod.wearer.say("Get over here!", forced = type)
+ mod.wearer.Beam(living_target, "n_beam", time = 1.5 SECONDS)
+ var/obj/structure/energy_net/net = new /obj/structure/energy_net(living_target.drop_location())
+ net.affected_mob = living_target
+ mod.wearer.visible_message(span_danger("[mod.wearer] caught [living_target] with an energy net!"), span_notice("You caught [living_target] with an energy net!"))
+ if(living_target.buckled)
+ living_target.buckled.unbuckle_mob(living_target, force = TRUE)
+ net.buckle_mob(living_target, force = TRUE)
+ drain_power(use_power_cost)
+
+///Adrenaline Boost - Stops all stuns the ninja is affected with, increases his speed.
+/obj/item/mod/module/adrenaline_boost
+ name = "MOD adrenaline boost module"
+ desc = "The secrets of the Spider Clan are many. The exact specifications of their suits, \
+ the techniques they use to make every singular cut make their enemies weep with admiration, \
+ but one of their greatest mysteries is the chemical compound their assassin-saboteurs use in times of need. \
+ It's capable of clearing any fatigue whatsoever from the user, any immobilizing effect, and can even \
+ cure total paralysis. All that's known is that the fluid requires radiation to properly 'cook,' \
+ so this module demands radium to be refilled with."
+ icon_state = "adrenaline_boost"
+ removable = FALSE
+ module_type = MODULE_USABLE
+ incompatible_modules = list(/obj/item/mod/module/adrenaline_boost)
+ cooldown_time = 12 SECONDS
+ /// What reagent we need to refill?
+ var/reagent_required = /datum/reagent/uranium/radium
+ /// How much of a reagent we need to refill the boost.
+ var/reagent_required_amount = 20
+
+/obj/item/mod/module/adrenaline_boost/Initialize(mapload)
+ . = ..()
+ create_reagents(reagent_required_amount)
+ reagents.add_reagent(reagent_required, reagent_required_amount)
+
+/obj/item/mod/module/adrenaline_boost/on_use()
+ if(!reagents.has_reagent(reagent_required, reagent_required_amount))
+ balloon_alert(mod.wearer, "no charge!")
+ return
+ . = ..()
+ if(!.)
+ return
+ if(IS_SPACE_NINJA(mod.wearer))
+ mod.wearer.say(pick_list_replacements(NINJA_FILE, "lines"), forced = type)
+ to_chat(mod.wearer, span_notice("You have used the adrenaline boost."))
+ mod.wearer.SetUnconscious(0)
+ mod.wearer.SetStun(0)
+ mod.wearer.SetKnockdown(0)
+ mod.wearer.SetImmobilized(0)
+ mod.wearer.SetParalyzed(0)
+ mod.wearer.adjustStaminaLoss(-200)
+ mod.wearer.remove_status_effect(/datum/status_effect/speech/stutter)
+ mod.wearer.reagents.add_reagent(/datum/reagent/medicine/stimulants, 5)
+ reagents.remove_reagent(reagent_required, reagents.total_volume * 0.75)
+ addtimer(CALLBACK(src, .proc/boost_aftereffects, mod.wearer), 7 SECONDS)
+
+/obj/item/mod/module/adrenaline_boost/on_install()
+ RegisterSignal(mod, COMSIG_PARENT_ATTACKBY, .proc/on_attackby)
+
+/obj/item/mod/module/adrenaline_boost/on_uninstall(deleting)
+ UnregisterSignal(mod, COMSIG_PARENT_ATTACKBY)
+
+/obj/item/mod/module/adrenaline_boost/attackby(obj/item/attacking_item, mob/user, params)
+ if(charge_boost(attacking_item, user))
+ return TRUE
+ return ..()
+
+/obj/item/mod/module/adrenaline_boost/proc/on_attackby(datum/source, obj/item/attacking_item, mob/user)
+ SIGNAL_HANDLER
+
+ if(charge_boost(attacking_item, user))
+ return COMPONENT_NO_AFTERATTACK
+ return NONE
+
+/obj/item/mod/module/adrenaline_boost/proc/charge_boost(obj/item/attacking_item, mob/user)
+ if(!attacking_item.is_open_container())
+ return FALSE
+ if(reagents.has_reagent(reagent_required, reagent_required_amount))
+ balloon_alert(mod.wearer, "already charged!")
+ return FALSE
+ if(!attacking_item.reagents.trans_id_to(src, reagent_required, reagent_required_amount))
+ return FALSE
+ balloon_alert(mod.wearer, "charge [reagents.has_reagent(reagent_required, reagent_required_amount) ? "fully" : "partially"] reloaded")
+ return TRUE
+
+/obj/item/mod/module/adrenaline_boost/proc/boost_aftereffects(mob/affected_mob)
+ if(!affected_mob)
+ return
+ reagents.trans_to(affected_mob, reagents.total_volume)
+ to_chat(affected_mob, span_danger("You are beginning to feel the after-effect of the injection."))
diff --git a/code/modules/mod/modules/modules_security.dm b/code/modules/mod/modules/modules_security.dm
index 32376ec10d2..3055c242cbd 100644
--- a/code/modules/mod/modules/modules_security.dm
+++ b/code/modules/mod/modules/modules_security.dm
@@ -1,80 +1,5 @@
//Security modules for MODsuits
-///Cloaking - Lowers the user's visibility, can be interrupted by being touched or attacked.
-/obj/item/mod/module/stealth
- name = "MOD prototype cloaking module"
- desc = "A complete retrofitting of the suit, this is a form of visual concealment tech employing esoteric technology \
- to bend light around the user, as well as mimetic materials to make the surface of the suit match the \
- surroundings based off sensor data. For some reason, this tech is rarely seen."
- icon_state = "cloak"
- module_type = MODULE_TOGGLE
- complexity = 4
- active_power_cost = DEFAULT_CHARGE_DRAIN * 2
- use_power_cost = DEFAULT_CHARGE_DRAIN * 10
- incompatible_modules = list(/obj/item/mod/module/stealth)
- cooldown_time = 5 SECONDS
- /// Whether or not the cloak turns off on bumping.
- var/bumpoff = TRUE
- /// The alpha applied when the cloak is on.
- var/stealth_alpha = 50
-
-/obj/item/mod/module/stealth/on_activation()
- . = ..()
- if(!.)
- return
- if(bumpoff)
- RegisterSignal(mod.wearer, COMSIG_LIVING_MOB_BUMP, .proc/unstealth)
- RegisterSignal(mod.wearer, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, .proc/on_unarmed_attack)
- RegisterSignal(mod.wearer, COMSIG_ATOM_BULLET_ACT, .proc/on_bullet_act)
- RegisterSignal(mod.wearer, list(COMSIG_ITEM_ATTACK, COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_HITBY, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_PAW, COMSIG_CARBON_CUFF_ATTEMPTED), .proc/unstealth)
- animate(mod.wearer, alpha = stealth_alpha, time = 1.5 SECONDS)
- drain_power(use_power_cost)
-
-/obj/item/mod/module/stealth/on_deactivation(display_message = TRUE, deleting = FALSE)
- . = ..()
- if(!.)
- return
- if(bumpoff)
- UnregisterSignal(mod.wearer, COMSIG_LIVING_MOB_BUMP)
- UnregisterSignal(mod.wearer, list(COMSIG_HUMAN_MELEE_UNARMED_ATTACK, COMSIG_ITEM_ATTACK, COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_BULLET_ACT, COMSIG_ATOM_HITBY, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_PAW, COMSIG_CARBON_CUFF_ATTEMPTED))
- animate(mod.wearer, alpha = 255, time = 1.5 SECONDS)
-
-/obj/item/mod/module/stealth/proc/unstealth(datum/source)
- SIGNAL_HANDLER
-
- to_chat(mod.wearer, span_warning("[src] gets discharged from contact!"))
- do_sparks(2, TRUE, src)
- drain_power(use_power_cost)
- on_deactivation(display_message = TRUE, deleting = FALSE)
-
-/obj/item/mod/module/stealth/proc/on_unarmed_attack(datum/source, atom/target)
- SIGNAL_HANDLER
-
- if(!isliving(target))
- return
- unstealth(source)
-
-/obj/item/mod/module/stealth/proc/on_bullet_act(datum/source, obj/projectile/projectile)
- SIGNAL_HANDLER
-
- if(projectile.nodamage)
- return
- unstealth(source)
-
-/obj/item/mod/module/stealth/ninja
- name = "MOD advanced cloaking module"
- desc = "The latest in stealth technology, this module is a definite upgrade over previous versions. \
- The field has been tuned to be even more responsive and fast-acting, with enough stability to \
- continue operation of the field even if the user bumps into others. \
- The power draw has been reduced drastically, making this perfect for activities like \
- standing near sentry turrets for extended periods of time."
- icon_state = "cloak_ninja"
- bumpoff = FALSE
- stealth_alpha = 20
- active_power_cost = DEFAULT_CHARGE_DRAIN
- use_power_cost = DEFAULT_CHARGE_DRAIN * 5
- cooldown_time = 3 SECONDS
-
///Magnetic Harness - Automatically puts guns in your suit storage when you drop them.
/obj/item/mod/module/magnetic_harness
name = "MOD magnetic harness module"
diff --git a/code/modules/ninja/__ninjaDefines.dm b/code/modules/ninja/__ninjaDefines.dm
deleted file mode 100644
index 8414f9e4244..00000000000
--- a/code/modules/ninja/__ninjaDefines.dm
+++ /dev/null
@@ -1,22 +0,0 @@
-//ninjacost() specificCheck defines
-#define N_STEALTH_CANCEL 1
-#define N_ADRENALINE 2
-
-//ninjaDrainAct() defines for non numerical returns
-#define INVALID_DRAIN "INVALID" //This one is if the drain proc needs to cancel, eg missing variables, etc, it's important.
-#define DRAIN_RD_HACK_FAILED "RDHACKFAIL"
-#define DRAIN_MOB_SHOCK "MOBSHOCK"
-#define DRAIN_MOB_SHOCK_FAILED "MOBSHOCKFAIL"
-
-//Tells whether or not someone is a space ninja
-#define IS_SPACE_NINJA(ninja) (ninja.mind && ninja.mind.has_antag_datum(/datum/antagonist/ninja))
-
-//Defines for the suit's unique abilities
-#define IS_NINJA_SUIT_INITIALIZATION(action) (istype(action, /datum/action/item_action/initialize_ninja_suit))
-#define IS_NINJA_SUIT_STATUS(action) (istype(action, /datum/action/item_action/ninjastatus))
-#define IS_NINJA_SUIT_BOOST(action) (istype(action, /datum/action/item_action/ninjaboost))
-#define IS_NINJA_SUIT_EMP(action) (istype(action, /datum/action/item_action/ninjapulse))
-#define IS_NINJA_SUIT_STAR_CREATION(action) (istype(action, /datum/action/item_action/ninjastar))
-#define IS_NINJA_SUIT_NET_CREATION(action) (istype(action, /datum/action/item_action/ninjanet))
-#define IS_NINJA_SUIT_SWORD_RECALL(action) (istype(action, /datum/action/item_action/ninja_sword_recall))
-#define IS_NINJA_SUIT_STEALTH(action) (istype(action, /datum/action/item_action/ninja_stealth))
diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm
index b8d54857677..07200061ecd 100644
--- a/code/modules/ninja/energy_katana.dm
+++ b/code/modules/ninja/energy_katana.dm
@@ -23,6 +23,8 @@
armour_penetration = 50
w_class = WEIGHT_CLASS_NORMAL
hitsound = 'sound/weapons/bladeslice.ogg'
+ pickup_sound = 'sound/items/unsheath.ogg'
+ drop_sound = 'sound/items/sheath.ogg'
attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT
@@ -39,82 +41,37 @@
spark_system.set_up(5, 0, src)
spark_system.attach(src)
-/obj/item/energy_katana/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+/obj/item/energy_katana/afterattack_secondary(atom/target, mob/user, proximity_flag, click_parameters)
. = ..()
+ if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
+ return
+ if(!target.density)
+ jaunt?.teleport(user, target)
- var/list/modifiers = params2list(click_parameters)
-
- if(LAZYACCESS(modifiers, RIGHT_CLICK) && !target.density)
- jaunt.teleport(user, target)
-
-/obj/item/energy_katana/pickup(mob/living/user)
+/obj/item/energy_katana/equipped(mob/user, slot, initial)
. = ..()
- jaunt.Grant(user, src)
- user.update_icons()
- playsound(src, 'sound/items/unsheath.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ if(!QDELETED(jaunt))
+ jaunt.Grant(user, src)
/obj/item/energy_katana/dropped(mob/user)
. = ..()
- jaunt.Remove(user)
- user.update_icons()
-
-//If we hit the Ninja who owns this Katana, they catch it.
-//Works for if the Ninja throws it or it throws itself or someone tries
-//To throw it at the ninja
-/obj/item/energy_katana/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
- if(ishuman(hit_atom))
- var/mob/living/carbon/human/hit_human = hit_atom
- if(istype(hit_human.wear_suit, /obj/item/clothing/suit/space/space_ninja))
- var/obj/item/clothing/suit/space/space_ninja/ninja_suit = hit_human.wear_suit
- if(ninja_suit.energyKatana == src)
- returnToOwner(hit_human, 0, 1)
- return
-
- ..()
+ if(!QDELETED(jaunt))
+ jaunt.Remove(user)
/obj/item/energy_katana/Destroy()
QDEL_NULL(spark_system)
QDEL_NULL(jaunt)
return ..()
-/**
- * Proc called when the katana is recalled to its space ninja.
- *
- * Proc called when space ninja is hit with its suit's katana or the recall ability is used.
- * Arguments:
- * * user - To whom the katana is returning to.
- * * doSpark - whether or not the katana will spark when it returns.
- * * caught - boolean for whether or not the katana was caught or was teleported back.
- */
-/obj/item/energy_katana/proc/returnToOwner(mob/living/carbon/human/user, doSpark = TRUE, caught = FALSE)
- if(!istype(user))
- return
- forceMove(get_turf(user))
-
- if(doSpark)
- spark_system.start()
- playsound(get_turf(src), SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
-
- var/msg = ""
-
- if(user.put_in_hands(src))
- msg = "Your Energy Katana teleports into your hand!"
- else if(user.equip_to_slot_if_possible(src, ITEM_SLOT_BELT, 0, 1, 1))
- msg = "Your Energy Katana teleports back to you, sheathing itself as it does so!"
- else
- msg = "Your Energy Katana teleports to your location!"
-
- if(caught)
- if(loc == user)
- msg = "You catch your Energy Katana!"
- else
- msg = "Your Energy Katana lands at your feet!"
-
- if(msg)
- to_chat(user, span_notice("[msg]"))
-
/datum/action/innate/dash/ninja
current_charges = 3
max_charges = 3
charge_rate = 200
+ beam_length = 1 SECONDS
recharge_sound = null
+
+/datum/action/innate/dash/ninja/GiveAction(mob/viewer) //this action should be invisible, as its handled by right-click
+ return
+
+/datum/action/innate/dash/ninja/HideFrom(mob/viewer)
+ return
diff --git a/code/modules/ninja/suit/ninja_equipment_actions/energy_net_nets.dm b/code/modules/ninja/energy_net_nets.dm
similarity index 100%
rename from code/modules/ninja/suit/ninja_equipment_actions/energy_net_nets.dm
rename to code/modules/ninja/energy_net_nets.dm
diff --git a/code/modules/ninja/ninjaDrainAct.dm b/code/modules/ninja/ninjaDrainAct.dm
new file mode 100644
index 00000000000..02e66652792
--- /dev/null
+++ b/code/modules/ninja/ninjaDrainAct.dm
@@ -0,0 +1,311 @@
+/**
+ * Atom level proc for space ninja's glove interactions.
+ *
+ * Proc which only occurs when space ninja uses his gloves on an atom.
+ * Does nothing by default, but effects will vary.
+ * Arguments:
+ * * ninja_suit - The offending space ninja's suit.
+ * * ninja - The human mob wearing the suit.
+ * * hacking_module - The offending space ninja's gloves.
+ */
+/atom/proc/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ return NONE
+
+//APC//
+/obj/machinery/power/apc/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ if(!ninja || !hacking_module)
+ return NONE
+ INVOKE_ASYNC(src, .proc/ninjadrain_charge, ninja, hacking_module)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/obj/machinery/power/apc/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ var/maxcapacity = FALSE //Safety check for batteries
+ var/drain = 0 //Drain amount from batteries
+ var/drain_total = 0
+ if(cell?.charge)
+ var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
+ spark_system.set_up(5, 0, loc)
+ while(cell.charge> 0 && !maxcapacity)
+ drain = rand(hacking_module.mindrain, hacking_module.maxdrain)
+ if(cell.charge < drain)
+ drain = cell.charge
+ if(hacking_module.mod.get_charge() + drain > hacking_module.mod.get_max_charge())
+ drain = hacking_module.mod.get_max_charge() - hacking_module.mod.get_charge()
+ maxcapacity = TRUE//Reached maximum battery capacity.
+ if (do_after(ninja, 1 SECONDS, target = src))
+ spark_system.start()
+ playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ cell.use(drain)
+ hacking_module.mod.add_charge(drain)
+ drain_total += drain
+ else
+ break
+ if(!(obj_flags & EMAGGED))
+ flick("apc-spark", hacking_module)
+ playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ obj_flags |= EMAGGED
+ locked = FALSE
+ update_appearance()
+ hacking_module.charge_message(src, drain_total)
+
+//SMES//
+/obj/machinery/power/smes/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ if(!ninja || !hacking_module)
+ return NONE
+ INVOKE_ASYNC(src, .proc/ninjadrain_charge, ninja, hacking_module)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/obj/machinery/power/smes/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ var/maxcapacity = FALSE //Safety check for batteries
+ var/drain = 0 //Drain amount from batteries
+ var/drain_total = 0
+ var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
+ spark_system.set_up(5, 0, loc)
+ while(charge > 0 && !maxcapacity)
+ drain = rand(hacking_module.mindrain, hacking_module.maxdrain)
+ if(charge < drain)
+ drain = charge
+ if(hacking_module.mod.get_charge() + drain > hacking_module.mod.get_max_charge())
+ drain = hacking_module.mod.get_max_charge() - hacking_module.mod.get_charge()
+ maxcapacity = TRUE
+ if (do_after(ninja, 1 SECONDS, target = src))
+ spark_system.start()
+ playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ charge -= drain
+ hacking_module.mod.add_charge(drain)
+ drain_total += drain
+ maxcapacity = TRUE//Reached maximum battery capacity.
+ else
+ break
+ hacking_module.charge_message(src, drain_total)
+
+//CELL//
+/obj/item/stock_parts/cell/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ if(!ninja || !hacking_module)
+ return NONE
+ INVOKE_ASYNC(src, .proc/ninjadrain_charge, ninja, hacking_module)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/obj/item/stock_parts/cell/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ var/drain_total = 0
+ if(charge && !do_after(ninja, 3 SECONDS, target = src))
+ drain_total = charge
+ if(hacking_module.mod.get_charge() + charge > hacking_module.mod.get_max_charge())
+ drain_total = hacking_module.mod.get_max_charge() - hacking_module.mod.get_charge()
+ hacking_module.mod.add_charge(drain_total)
+ use(drain_total)
+ corrupt()
+ update_appearance()
+ hacking_module.charge_message(src, drain_total)
+
+//RD SERVER//
+/obj/machinery/rnd/server/master/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ if(!ninja || !hacking_module)
+ return NONE
+ // If the traitor theft objective is still present, this will destroy it...
+ if(!source_code_hdd)
+ return ..()
+ to_chat(ninja, span_notice("Hacking \the [src]..."))
+ AI_notify_hack()
+ to_chat(ninja, span_notice("Encrypted source code detected. Overloading storage device..."))
+ INVOKE_ASYNC(src, .proc/ninjadrain_charge, ninja, hacking_module)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/obj/machinery/rnd/server/master/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ if(!do_after(ninja, 30 SECONDS, target = src))
+ return
+ overload_source_code_hdd()
+ to_chat(ninja, span_notice("Sabotage complete. Storage device overloaded."))
+ var/datum/antagonist/ninja/ninja_antag = ninja.mind.has_antag_datum(/datum/antagonist/ninja)
+ if(!ninja_antag)
+ return
+ var/datum/objective/research_secrets/objective = locate() in ninja_antag.objectives
+ if(objective)
+ objective.completed = TRUE
+
+/obj/machinery/rnd/server/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ if(!ninja || !hacking_module)
+ return NONE
+ to_chat(ninja, span_notice("Research notes detected. Corrupting data..."))
+ INVOKE_ASYNC(src, .proc/ninjadrain_charge, ninja, hacking_module)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/obj/machinery/rnd/server/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ if(!do_after(ninja, 30 SECONDS, target = src))
+ return
+ SSresearch.science_tech.modify_points_all(0)
+ to_chat(ninja, span_notice("Sabotage complete. Research notes corrupted."))
+ var/datum/antagonist/ninja/ninja_antag = ninja.mind.has_antag_datum(/datum/antagonist/ninja)
+ if(!ninja_antag)
+ return
+ var/datum/objective/research_secrets/objective = locate() in ninja_antag.objectives
+ if(objective)
+ objective.completed = TRUE
+
+//SECURITY CONSOLE//
+/obj/machinery/computer/secure_data/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ if(!ninja || !hacking_module)
+ return NONE
+ AI_notify_hack()
+ INVOKE_ASYNC(src, .proc/ninjadrain_charge, ninja, hacking_module)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/obj/machinery/computer/secure_data/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ if(!do_after(ninja, 20 SECONDS))
+ return
+ for(var/datum/data/record/rec in sort_record(GLOB.data_core.general, sortBy, order))
+ for(var/datum/data/record/security_record in GLOB.data_core.security)
+ security_record.fields["criminal"] = "*Arrest*"
+ var/datum/antagonist/ninja/ninja_antag = ninja.mind.has_antag_datum(/datum/antagonist/ninja)
+ if(!ninja_antag)
+ return
+ var/datum/objective/security_scramble/objective = locate() in ninja_antag.objectives
+ if(objective)
+ objective.completed = TRUE
+
+//COMMUNICATIONS CONSOLE//
+/obj/machinery/computer/communications/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ if(!ninja || !hacking_module)
+ return NONE
+ if(hacking_module.communication_console_hack_success)
+ return NONE
+ if(machine_stat & (NOPOWER|BROKEN))
+ return NONE
+ AI_notify_hack()
+ INVOKE_ASYNC(src, .proc/ninjadrain_charge, ninja, hacking_module)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/obj/machinery/computer/communications/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ if(!do_after(ninja, 30 SECONDS, src))
+ return
+ hack_console(ninja)
+ hacking_module.communication_console_hack_success = TRUE
+ var/datum/antagonist/ninja/ninja_antag = ninja.mind.has_antag_datum(/datum/antagonist/ninja)
+ if(!ninja_antag)
+ return
+ var/datum/objective/terror_message/objective = locate() in ninja_antag.objectives
+ if(objective)
+ objective.completed = TRUE
+
+//AIRLOCK//
+/obj/machinery/door/airlock/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ if(!ninja || !hacking_module)
+ return NONE
+ if(!operating && density && hasPower() && !(obj_flags & EMAGGED))
+ INVOKE_ASYNC(src, /atom.proc/emag_act)
+ hacking_module.door_hack_counter++
+ var/datum/antagonist/ninja/ninja_antag = ninja.mind.has_antag_datum(/datum/antagonist/ninja)
+ if(!ninja_antag)
+ return NONE
+ var/datum/objective/door_jack/objective = locate() in ninja_antag.objectives
+ if(objective && objective.doors_required <= hacking_module.door_hack_counter)
+ objective.completed = TRUE
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+//WIRE//
+/obj/structure/cable/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ if(!ninja || !hacking_module)
+ return NONE
+ INVOKE_ASYNC(src, .proc/ninjadrain_charge, ninja, hacking_module)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/obj/structure/cable/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ var/maxcapacity = FALSE //Safety check
+ var/drain = 0 //Drain amount
+ var/drain_total = 0
+ var/datum/powernet/wire_powernet = powernet
+ while(!maxcapacity && src)
+ drain = (round((rand(hacking_module.mindrain, hacking_module.maxdrain))/2))
+ var/drained = 0
+ if(wire_powernet && do_after(ninja, 1 SECONDS, target = src))
+ drained = min(drain, delayed_surplus())
+ add_delayedload(drained)
+ if(drained < drain)//if no power on net, drain apcs
+ for(var/obj/machinery/power/terminal/affected_terminal in wire_powernet.nodes)
+ if(istype(affected_terminal.master, /obj/machinery/power/apc))
+ var/obj/machinery/power/apc/AP = affected_terminal.master
+ if(AP.operating && AP.cell && AP.cell.charge > 0)
+ AP.cell.charge = max(0, AP.cell.charge - 5)
+ drained += 5
+ else
+ break
+ if(hacking_module.mod.get_charge() + drain > hacking_module.mod.get_max_charge())
+ drain = hacking_module.mod.get_max_charge() - hacking_module.mod.get_charge()
+ maxcapacity = TRUE
+ drain_total += drain
+ hacking_module.mod.add_charge(drain)
+ do_sparks(5, cardinal_only = FALSE, source = hacking_module.mod)
+ hacking_module.charge_message(src, drain_total)
+
+//MECH//
+/obj/vehicle/sealed/mecha/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ if(!ninja || !hacking_module)
+ return NONE
+ to_chat(occupants, "[icon2html(src, occupants)][span_danger("Warning: Unauthorized access through sub-route 4, block H, detected.")]")
+ INVOKE_ASYNC(src, .proc/ninjadrain_charge, ninja, hacking_module)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/obj/vehicle/sealed/mecha/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ var/maxcapacity = FALSE //Safety check
+ var/drain = 0 //Drain amount
+ var/drain_total = 0
+ if(get_charge())
+ while(cell.charge > 0 && !maxcapacity)
+ drain = rand(hacking_module.mindrain, hacking_module.maxdrain)
+ if(cell.charge < drain)
+ drain = cell.charge
+ if(hacking_module.mod.get_charge() + drain > hacking_module.mod.get_max_charge())
+ drain = hacking_module.mod.get_max_charge() - hacking_module.mod.get_charge()
+ maxcapacity = TRUE
+ if (do_after(ninja, 1 SECONDS, target = src))
+ spark_system.start()
+ playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ cell.use(drain)
+ hacking_module.mod.add_charge(drain)
+ drain_total += drain
+ else
+ break
+ hacking_module.charge_message(src, drain_total)
+
+//BORG//
+/mob/living/silicon/robot/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ if(!ninja || !hacking_module || (ROLE_NINJA in faction))
+ return NONE
+
+ to_chat(src, span_danger("Warni-***BZZZZZZZZZRT*** UPLOADING SPYDERPATCHER VERSION 9.5.2..."))
+ INVOKE_ASYNC(src, .proc/ninjadrain_charge, ninja, hacking_module)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/mob/living/silicon/robot/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ if(!do_after(ninja, 6 SECONDS, target = src))
+ return
+ spark_system.start()
+ playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ to_chat(src, span_danger("UPLOAD COMPLETE. NEW CYBORG MODEL DETECTED. INSTALLING..."))
+ faction = list(ROLE_NINJA)
+ bubble_icon = "syndibot"
+ UnlinkSelf()
+ ionpulse = TRUE
+ laws = new /datum/ai_laws/ninja_override()
+ model.transform_to(pick(/obj/item/robot_model/syndicate, /obj/item/robot_model/syndicate_medical, /obj/item/robot_model/saboteur))
+
+ var/datum/antagonist/ninja/ninja_antag = ninja.mind.has_antag_datum(/datum/antagonist/ninja)
+ if(!ninja_antag)
+ return
+ var/datum/objective/cyborg_hijack/objective = locate() in ninja_antag.objectives
+ if(objective)
+ objective.completed = TRUE
+
+//CARBON MOBS//
+/mob/living/carbon/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
+ if(!ninja || !hacking_module)
+ return NONE
+ //Default cell = 10,000 charge, 10,000/1000 = 10 uses without charging/upgrading
+ if(hacking_module.mod.subtract_charge(DEFAULT_CHARGE_DRAIN*10))
+ //Got that electric touch
+ var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
+ spark_system.set_up(5, 0, loc)
+ playsound(src, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ visible_message(span_danger("[ninja] electrocutes [src] with [ninja.p_their()] touch!"), span_userdanger("[ninja] electrocutes you with [ninja.p_their()] touch!"))
+ Knockdown(3 SECONDS)
+ return NONE
diff --git a/code/modules/ninja/ninja_clothing.dm b/code/modules/ninja/ninja_clothing.dm
new file mode 100644
index 00000000000..b093aa80016
--- /dev/null
+++ b/code/modules/ninja/ninja_clothing.dm
@@ -0,0 +1,25 @@
+/**
+ * # Ninja Mask
+ *
+ * Space ninja's mask. Other than looking cool, doesn't do anything.
+ *
+ * A mask which only spawns as a part of space ninja's starting kit. Functions as a gas mask.
+ *
+ */
+/obj/item/clothing/mask/gas/ninja
+ name = "ninja mask"
+ desc = "A close-fitting nano-enhanced mask that acts both as an air filter and a post-modern fashion statement."
+ icon_state = "ninja"
+ strip_delay = 12 SECONDS
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+ flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDESNOUT
+ flags_cover = MASKCOVERSMOUTH | PEPPERPROOF
+ has_fov = FALSE
+
+/obj/item/clothing/under/syndicate/ninja
+ name = "ninja suit"
+ desc = "A nano-enhanced jumpsuit designed for maximum comfort and tacticality."
+ icon_state = "ninja_suit"
+ strip_delay = 12 SECONDS
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+ can_adjust = FALSE
diff --git a/code/modules/ninja/ninja_explosive.dm b/code/modules/ninja/ninja_explosive.dm
index b1a74baf73c..fc7e1e304ed 100644
--- a/code/modules/ninja/ninja_explosive.dm
+++ b/code/modules/ninja/ninja_explosive.dm
@@ -60,7 +60,6 @@
. = ..()
if(!.)
return
-
if (isnull(ninja))
return
var/datum/antagonist/ninja/ninja_antag = ninja.mind.has_antag_datum(/datum/antagonist/ninja)
diff --git a/code/modules/ninja/suit/ninja_equipment_actions/ninja_stars.dm b/code/modules/ninja/ninja_stars.dm
similarity index 53%
rename from code/modules/ninja/suit/ninja_equipment_actions/ninja_stars.dm
rename to code/modules/ninja/ninja_stars.dm
index 2c8adbc5770..2e5817f05df 100644
--- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_stars.dm
+++ b/code/modules/ninja/ninja_stars.dm
@@ -1,27 +1,3 @@
-/datum/action/item_action/ninjastar
- name = "Create Throwing Stars (1E)"
- desc = "Creates a throwing star in your hand, if possible."
- button_icon_state = "throwingstar"
- icon_icon = 'icons/obj/items_and_weapons.dmi'
-
-/**
- * Proc called to create a ninja star in the ninja's hands.
- *
- * Called to create a ninja star in the wearer's hand. The ninja
- * star doesn't do much up-front damage, but deals stamina damage
- * as the target moves around, forcing a finish or flee scenario.
- */
-/obj/item/clothing/suit/space/space_ninja/proc/ninjastar()
- if(ninjacost(10))
- return
- var/mob/living/carbon/human/ninja = affecting
- var/obj/item/throwing_star/stamina/ninja/ninja_star = new(ninja)
- if(ninja.put_in_hands(ninja_star))
- to_chat(ninja, span_notice("A throwing star has been created in your hand!"))
- else
- qdel(ninja_star)
- to_chat(ninja, span_notice("You can't create a throwing star, your hands are full!"))
-
/**
* # Ninja Throwing Star
*
diff --git a/code/modules/ninja/outfit.dm b/code/modules/ninja/outfit.dm
index dca30db4324..7d96a446389 100644
--- a/code/modules/ninja/outfit.dm
+++ b/code/modules/ninja/outfit.dm
@@ -1,25 +1,33 @@
/datum/outfit/ninja
name = "Space Ninja"
- uniform = /obj/item/clothing/under/color/black
- suit = /obj/item/clothing/suit/space/space_ninja
+ uniform = /obj/item/clothing/under/syndicate/ninja
glasses = /obj/item/clothing/glasses/night
- mask = /obj/item/clothing/mask/gas/space_ninja
- head = /obj/item/clothing/head/helmet/space/space_ninja
+ mask = /obj/item/clothing/mask/gas/ninja
ears = /obj/item/radio/headset
- shoes = /obj/item/clothing/shoes/space_ninja
- gloves = /obj/item/clothing/gloves/space_ninja
+ shoes = /obj/item/clothing/shoes/jackboots
l_pocket = /obj/item/grenade/c4/ninja
r_pocket = /obj/item/tank/internals/emergency_oxygen
internals_slot = ITEM_SLOT_RPOCKET
belt = /obj/item/energy_katana
+ back = /obj/item/mod/control/pre_equipped/ninja
implants = list(/obj/item/implant/explosive)
+/datum/outfit/ninja/post_equip(mob/living/carbon/human/ninja)
+ var/obj/item/grenade/c4/ninja/charge = ninja.l_store
+ if(istype(charge))
+ charge.set_detonation_area(ninja.mind?.has_antag_datum(/datum/antagonist/ninja))
+ var/obj/item/mod/control/mod = ninja.back
+ if(!istype(mod))
+ return
+ var/obj/item/mod/module/dna_lock/reinforced/lock = locate(/obj/item/mod/module/dna_lock/reinforced) in mod.modules
+ lock.dna = ninja.dna.unique_enzymes
+ var/obj/item/mod/module/weapon_recall/recall = locate(/obj/item/mod/module/weapon_recall) in mod.modules
+ var/obj/item/weapon = ninja.belt
+ if(!istype(weapon, recall.accepted_type))
+ return
+ recall.set_weapon(weapon)
-/datum/outfit/ninja/post_equip(mob/living/carbon/human/human)
- if(istype(human.wear_suit, suit))
- var/obj/item/clothing/suit/space/space_ninja/ninja_suit = human.wear_suit
- if(istype(human.belt, belt))
- ninja_suit.energyKatana = human.belt
- if(istype(human.l_store, l_pocket))
- var/obj/item/grenade/c4/ninja/charge = human.l_store
- charge.set_detonation_area(human.mind?.has_antag_datum(/datum/antagonist/ninja))
+/datum/outfit/ninja_preview
+ uniform = /obj/item/clothing/under/syndicate/ninja
+ back = /obj/item/mod/control/pre_equipped/empty/ninja
+ belt = /obj/item/energy_katana
diff --git a/code/modules/ninja/suit/gloves.dm b/code/modules/ninja/suit/gloves.dm
deleted file mode 100644
index dbe227f077f..00000000000
--- a/code/modules/ninja/suit/gloves.dm
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * # Ninja Gloves
- *
- * Space ninja's gloves. Gives access to a number of special interactions.
- *
- * Gloves only found from space ninjas. Allows the wearer to access special interactions with various objects.
- * These interactions are detailed in ninjaDrainAct.dm in the suit file.
- * These interactions are toggled by an action tied to the gloves. The interactions will not activate if the user is also not wearing a ninja suit.
- *
- */
-/obj/item/clothing/gloves/space_ninja
- desc = "These nano-enhanced gloves insulate from electricity and provide fire resistance."
- name = "ninja gloves"
- icon_state = "black"
- inhand_icon_state = "s-ninjan"
- siemens_coefficient = 0
- cold_protection = HANDS
- min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
- heat_protection = HANDS
- max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
- strip_delay = 120
- resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
- armor = list(MELEE = 40, BULLET = 30, LASER = 20, ENERGY = 15, BOMB = 30, BIO = 100, FIRE = 100, ACID = 100)
- ///Whether or not we're currently draining something
- var/draining = FALSE
- ///Minimum amount of power we can drain in a single drain action
- var/mindrain = 200
- ///Maximum amount of power we can drain in a single drain action
- var/maxdrain = 400
- ///Whether or not the communication console hack was used to summon another antagonist
- var/communication_console_hack_success = FALSE
- ///How many times the gloves have been used to force open doors.
- var/door_hack_counter = 0
-
-
-/obj/item/clothing/gloves/space_ninja/Touch(atom/A,proximity,modifiers)
- if(!LAZYACCESS(modifiers, RIGHT_CLICK) || draining)
- return FALSE
- if(!ishuman(loc))
- return FALSE //Only works while worn
-
- var/mob/living/carbon/human/wearer = loc
-
- var/obj/item/clothing/suit/space/space_ninja/suit = wearer.wear_suit
- if(!istype(suit))
- return FALSE
- if(isturf(A))
- return FALSE
-
- if(!proximity)
- return FALSE
-
- A.add_fingerprint(wearer)
-
- draining = TRUE
- . = A.ninjadrain_act(suit,wearer,src)
- draining = FALSE
-
- if(isnum(.)) //Numerical values of drained handle their feedback here, Alpha values handle it themselves (Research hacking)
- if(.)
- to_chat(wearer, span_notice("Gained [display_energy(.)] of energy from [A]."))
- else
- to_chat(wearer, span_danger("\The [A] has run dry of energy, you must find another source!"))
- else
- . = FALSE //as to not cancel attack_hand()
-
-/obj/item/clothing/gloves/space_ninja/examine(mob/user)
- . = ..() + "[p_their(TRUE)] energy drain mechanism is activated by touching objects in a disarming manner."
diff --git a/code/modules/ninja/suit/head.dm b/code/modules/ninja/suit/head.dm
deleted file mode 100644
index ba8436d4c49..00000000000
--- a/code/modules/ninja/suit/head.dm
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * # Ninja Hood
- *
- * Space ninja's hood. Provides armor and blocks AI tracking.
- *
- * A hood that only exists as a part of space ninja's starting kit. Provides armor equal of space ninja's suit and disallows an AI to track the wearer.
- *
- */
-/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 = "s-ninja"
- inhand_icon_state = "s-ninja_mask"
- armor = list(MELEE = 40, BULLET = 30, LASER = 20,ENERGY = 15, BOMB = 30, BIO = 100, FIRE = 100, ACID = 100)
- strip_delay = 12
- resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
- blockTracking = TRUE//Roughly the only unique thing about this helmet.
- flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
diff --git a/code/modules/ninja/suit/mask.dm b/code/modules/ninja/suit/mask.dm
deleted file mode 100644
index cb02bff1680..00000000000
--- a/code/modules/ninja/suit/mask.dm
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * # Ninja Mask
- *
- * Space ninja's mask. Other than looking cool, doesn't do anything.
- *
- * A mask which only spawns as a part of space ninja's starting kit. Functions as a gas mask.
- *
- */
-/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 = "s-ninja"
- inhand_icon_state = "s-ninja_mask"
- strip_delay = 120
- resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
- has_fov = FALSE
diff --git a/code/modules/ninja/suit/ninjaDrainAct.dm b/code/modules/ninja/suit/ninjaDrainAct.dm
deleted file mode 100644
index 8ae0020c6c8..00000000000
--- a/code/modules/ninja/suit/ninjaDrainAct.dm
+++ /dev/null
@@ -1,311 +0,0 @@
-/**
- * Atom level proc for space ninja's glove interactions.
- *
- * Proc which only occurs when space ninja uses his gloves on an atom.
- * Does nothing by default, but effects will vary.
- * Arguments:
- * * ninja_suit - The offending space ninja's suit.
- * * ninja - The human mob wearing the suit.
- * * ninja_gloves - The offending space ninja's gloves.
- */
-/atom/proc/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/ninja_suit, mob/living/carbon/human/ninja, obj/item/clothing/gloves/space_ninja/ninja_gloves)
- return INVALID_DRAIN
-
-//APC//
-/obj/machinery/power/apc/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/ninja_suit, mob/living/carbon/human/ninja, obj/item/clothing/gloves/space_ninja/ninja_gloves)
- if(!ninja_suit || !ninja || !ninja_gloves)
- return INVALID_DRAIN
-
- var/maxcapacity = FALSE //Safety check for batteries
- var/drain = 0 //Drain amount from batteries
- var/drain_total = 0
-
- if(cell?.charge)
- var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
- spark_system.set_up(5, 0, loc)
-
- while(cell.charge> 0 && !maxcapacity)
- drain = rand(ninja_gloves.mindrain, ninja_gloves.maxdrain)
-
- if(cell.charge < drain)
- drain = cell.charge
-
- if(ninja_suit.cell.charge + drain > ninja_suit.cell.maxcharge)
- drain = ninja_suit.cell.maxcharge - ninja_suit.cell.charge
- maxcapacity = TRUE//Reached maximum battery capacity.
-
- if (do_after(ninja ,10, target = src))
- spark_system.start()
- playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- cell.use(drain)
- ninja_suit.cell.give(drain)
- drain_total += drain
- else
- break
-
- if(!(obj_flags & EMAGGED))
- flick("apc-spark", ninja_gloves)
- playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- obj_flags |= EMAGGED
- locked = FALSE
- update_appearance()
-
- return drain_total
-
-//SMES//
-/obj/machinery/power/smes/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/ninja_suit, mob/living/carbon/human/ninja, obj/item/clothing/gloves/space_ninja/ninja_gloves)
- if(!ninja_suit || !ninja || !ninja_gloves)
- return INVALID_DRAIN
-
- var/maxcapacity = FALSE //Safety check for batteries
- var/drain = 0 //Drain amount from batteries
- var/drain_total = 0
-
- if(charge)
- var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
- spark_system.set_up(5, 0, loc)
-
- while(charge > 0 && !maxcapacity)
- drain = rand(ninja_gloves.mindrain, ninja_gloves.maxdrain)
-
- if(charge < drain)
- drain = charge
-
- if(ninja_suit.cell.charge + drain > ninja_suit.cell.maxcharge)
- drain = ninja_suit.cell.maxcharge - ninja_suit.cell.charge
- maxcapacity = TRUE
-
- if (do_after(ninja,10, target = src))
- spark_system.start()
- playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- charge -= drain
- ninja_suit.cell.give(drain)
- drain_total += drain
-
- else
- break
-
- return drain_total
-
-//CELL//
-/obj/item/stock_parts/cell/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/ninja_suit, mob/living/carbon/human/ninja, obj/item/clothing/gloves/space_ninja/ninja_gloves)
- if(!ninja_suit || !ninja || !ninja_gloves)
- return INVALID_DRAIN
-
- var/drain_total = 0
-
- if(charge)
- if(do_after(ninja, 30, target = src))
- drain_total = charge
- if(ninja_suit.cell.charge + charge > ninja_suit.cell.maxcharge)
- ninja_suit.cell.charge = ninja_suit.cell.maxcharge
- else
- ninja_suit.cell.give(charge)
- charge = 0
- corrupt()
- update_appearance()
-
- return drain_total
-
-//RD SERVER//
-/obj/machinery/rnd/server/master/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/ninja_suit, mob/living/carbon/human/ninja, obj/item/clothing/gloves/space_ninja/ninja_gloves)
- if(!ninja_suit || !ninja || !ninja_gloves)
- return INVALID_DRAIN
-
- . = DRAIN_RD_HACK_FAILED
-
- // If the traitor theft objective is still present, this will destroy it...
- if(!source_code_hdd)
- return ..()
-
- to_chat(ninja, span_notice("Hacking \the [src]..."))
- AI_notify_hack()
- to_chat(ninja, span_notice("Encrypted source code detected. Overloading storage device..."))
- if(do_after(ninja, 30 SECONDS, target = src))
- overload_source_code_hdd()
- to_chat(ninja, span_notice("Sabotage complete. Storage device overloaded."))
- var/datum/antagonist/ninja/ninja_antag = ninja.mind.has_antag_datum(/datum/antagonist/ninja)
- if(!ninja_antag)
- return
- var/datum/objective/research_secrets/objective = locate() in ninja_antag.objectives
- if(objective)
- objective.completed = TRUE
-
-/obj/machinery/rnd/server/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/ninja_suit, mob/living/carbon/human/ninja, obj/item/clothing/gloves/space_ninja/ninja_gloves)
- if(!ninja_suit || !ninja || !ninja_gloves)
- return INVALID_DRAIN
-
- . = DRAIN_RD_HACK_FAILED
-
- to_chat(ninja, span_notice("Research notes detected. Corrupting data..."))
-
- if(!do_after(ninja, 30 SECONDS, target = src))
- return
-
- SSresearch.science_tech.modify_points_all(0)
- to_chat(ninja, span_notice("Sabotage complete. Research notes corrupted."))
- var/datum/antagonist/ninja/ninja_antag = ninja.mind.has_antag_datum(/datum/antagonist/ninja)
- if(!ninja_antag)
- return
- var/datum/objective/research_secrets/objective = locate() in ninja_antag.objectives
- if(objective)
- objective.completed = TRUE
-
-//SECURITY CONSOLE//
-/obj/machinery/computer/secure_data/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/ninja_suit, mob/living/carbon/human/ninja, obj/item/clothing/gloves/space_ninja/ninja_gloves)
- if(!ninja_suit || !ninja || !ninja_gloves)
- return INVALID_DRAIN
- AI_notify_hack()
- if(do_after(ninja, 200))
- for(var/datum/data/record/rec in sort_record(GLOB.data_core.general, sortBy, order))
- for(var/datum/data/record/security_record in GLOB.data_core.security)
- security_record.fields["criminal"] = "*Arrest*"
- var/datum/antagonist/ninja/ninja_antag = ninja.mind.has_antag_datum(/datum/antagonist/ninja)
- if(!ninja_antag)
- return
- var/datum/objective/security_scramble/objective = locate() in ninja_antag.objectives
- if(objective)
- objective.completed = TRUE
-
-//COMMUNICATIONS CONSOLE//
-/obj/machinery/computer/communications/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/ninja_suit, mob/living/carbon/human/ninja, obj/item/clothing/gloves/space_ninja/ninja_gloves)
- if(!ninja_suit || !ninja || !ninja_gloves)
- return INVALID_DRAIN
- if(ninja_gloves.communication_console_hack_success)
- return
- if(machine_stat & (NOPOWER|BROKEN))
- return
- AI_notify_hack()
- if(!do_after(ninja, 30 SECONDS, src))
- return
- hack_console(ninja)
- ninja_gloves.communication_console_hack_success = TRUE
- var/datum/antagonist/ninja/ninja_antag = ninja.mind.has_antag_datum(/datum/antagonist/ninja)
- if(!ninja_antag)
- return
- var/datum/objective/terror_message/objective = locate() in ninja_antag.objectives
- if(objective)
- objective.completed = TRUE
-
-//AIRLOCK//
-/obj/machinery/door/airlock/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/ninja_suit, mob/living/carbon/human/ninja, obj/item/clothing/gloves/space_ninja/ninja_gloves)
- if(!ninja_suit || !ninja || !ninja_gloves)
- return INVALID_DRAIN
-
- if(!operating && density && hasPower() && !(obj_flags & EMAGGED))
- emag_act()
- ninja_gloves.door_hack_counter++
- var/datum/antagonist/ninja/ninja_antag = ninja.mind.has_antag_datum(/datum/antagonist/ninja)
- if(!ninja_antag)
- return
- var/datum/objective/door_jack/objective = locate() in ninja_antag.objectives
- if(objective && objective.doors_required <= ninja_gloves.door_hack_counter)
- objective.completed = TRUE
-
-//WIRE//
-/obj/structure/cable/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/ninja_suit, mob/living/carbon/human/ninja, obj/item/clothing/gloves/space_ninja/ninja_gloves)
- if(!ninja_suit || !ninja || !ninja_gloves)
- return INVALID_DRAIN
-
- var/maxcapacity = FALSE //Safety check
- var/drain = 0 //Drain amount
-
- var/drain_total = 0
-
- var/datum/powernet/wire_powernet = powernet
- while(!maxcapacity && src)
- drain = (round((rand(ninja_gloves.mindrain, ninja_gloves.maxdrain))/2))
- var/drained = 0
- if(wire_powernet && do_after(ninja ,10, target = src))
- drained = min(drain, delayed_surplus())
- add_delayedload(drained)
- if(drained < drain)//if no power on net, drain apcs
- for(var/obj/machinery/power/terminal/affected_terminal in wire_powernet.nodes)
- if(istype(affected_terminal.master, /obj/machinery/power/apc))
- var/obj/machinery/power/apc/AP = affected_terminal.master
- if(AP.operating && AP.cell && AP.cell.charge > 0)
- AP.cell.charge = max(0, AP.cell.charge - 5)
- drained += 5
- else
- break
-
- ninja_suit.cell.give(drain)
- if(ninja_suit.cell.charge > ninja_suit.cell.maxcharge)
- drain_total += (drained-(ninja_suit.cell.charge - ninja_suit.cell.maxcharge))
- ninja_suit.cell.charge = ninja_suit.cell.maxcharge
- maxcapacity = TRUE
- else
- drain_total += drained
- ninja_suit.spark_system.start()
-
- return drain_total
-
-//MECH//
-/obj/vehicle/sealed/mecha/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/ninja_suit, mob/living/carbon/human/ninja, obj/item/clothing/gloves/space_ninja/ninja_gloves)
- if(!ninja_suit || !ninja || !ninja_gloves)
- return INVALID_DRAIN
-
- var/maxcapacity = FALSE //Safety check
- var/drain = 0 //Drain amount
- var/drain_total = 0
-
- to_chat(occupants, "[icon2html(src, occupants)][span_danger("Warning: Unauthorized access through sub-route 4, block H, detected.")]")
- if(get_charge())
- while(cell.charge > 0 && !maxcapacity)
- drain = rand(ninja_gloves.mindrain, ninja_gloves.maxdrain)
- if(cell.charge < drain)
- drain = cell.charge
- if(ninja_suit.cell.charge + drain > ninja_suit.cell.maxcharge)
- drain = ninja_suit.cell.maxcharge - ninja_suit.cell.charge
- maxcapacity = TRUE
- if (do_after(ninja, 10, target = src))
- spark_system.start()
- playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- cell.use(drain)
- ninja_suit.cell.give(drain)
- drain_total += drain
- else
- break
-
- return drain_total
-
-//BORG//
-/mob/living/silicon/robot/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/ninja_suit, mob/living/carbon/human/ninja, obj/item/clothing/gloves/space_ninja/ninja_gloves)
- if(!ninja_suit || !ninja || !ninja_gloves || (ROLE_NINJA in faction))
- return INVALID_DRAIN
-
- to_chat(src, span_danger("Warni-***BZZZZZZZZZRT*** UPLOADING SPYDERPATCHER VERSION 9.5.2..."))
- if (do_after(ninja, 60, target = src))
- spark_system.start()
- playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- to_chat(src, span_danger("UPLOAD COMPLETE. NEW CYBORG MODEL DETECTED. INSTALLING..."))
- faction = list(ROLE_NINJA)
- bubble_icon = "syndibot"
- UnlinkSelf()
- ionpulse = TRUE
- laws = new /datum/ai_laws/ninja_override()
- model.transform_to(pick(/obj/item/robot_model/syndicate, /obj/item/robot_model/syndicate_medical, /obj/item/robot_model/saboteur))
-
- var/datum/antagonist/ninja/ninja_antag = ninja.mind.has_antag_datum(/datum/antagonist/ninja)
- if(!ninja_antag)
- return
- var/datum/objective/cyborg_hijack/objective = locate() in ninja_antag.objectives
- if(objective)
- objective.completed = TRUE
-
-//CARBON MOBS//
-/mob/living/carbon/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/ninja_suit, mob/living/carbon/human/ninja, obj/item/clothing/gloves/space_ninja/ninja_gloves)
- if(!ninja_suit || !ninja || !ninja_gloves)
- return INVALID_DRAIN
-
- . = DRAIN_MOB_SHOCK_FAILED
-
- //Default cell = 10,000 charge, 10,000/1000 = 10 uses without charging/upgrading
- if(ninja_suit.cell?.charge && ninja_suit.cell.use(1000))
- . = DRAIN_MOB_SHOCK
- //Got that electric touch
- var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
- spark_system.set_up(5, 0, loc)
- playsound(src, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- visible_message(span_danger("[ninja] electrocutes [src] with [ninja.p_their()] touch!"), span_userdanger("[ninja] electrocutes you with [ninja.p_their()] touch!"))
- Knockdown(3 SECONDS)
diff --git a/code/modules/ninja/suit/ninja_equipment_actions/ninja_adrenaline.dm b/code/modules/ninja/suit/ninja_equipment_actions/ninja_adrenaline.dm
deleted file mode 100644
index 06fad9c95fb..00000000000
--- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_adrenaline.dm
+++ /dev/null
@@ -1,45 +0,0 @@
-//Wakes the user so they are able to do their thing. Also injects a decent dose of radium.
-//Movement impairing would indicate drugs and the like.
-
-/datum/action/item_action/ninjaboost
- check_flags = NONE
- name = "Adrenaline Boost"
- desc = "Inject a secret chemical that will counteract all movement-impairing effect."
- button_icon_state = "repulse"
- icon_icon = 'icons/mob/actions/actions_spells.dmi'
-
-/**
- * Proc called to activate space ninja's adrenaline.
- *
- * Proc called to use space ninja's adrenaline. Gets the ninja out of almost any stun.
- * Also makes them shout MGS references when used. After a bit, it injects the user with
- * radium by calling a different proc.
- */
-/obj/item/clothing/suit/space/space_ninja/proc/ninjaboost()
- if(ninjacost(0,N_ADRENALINE))
- return
- var/mob/living/carbon/human/ninja = affecting
- ninja.SetUnconscious(0)
- ninja.SetStun(0)
- ninja.SetKnockdown(0)
- ninja.SetImmobilized(0)
- ninja.SetParalyzed(0)
- ninja.adjustStaminaLoss(-200)
- ninja.remove_status_effect(/datum/status_effect/speech/stutter)
- ninja.reagents.add_reagent(/datum/reagent/medicine/stimulants, 5)
- ninja.say(pick("A CORNERED FOX IS MORE DANGEROUS THAN A JACKAL!","HURT ME MOOORRREEE!","IMPRESSIVE!"), forced = "ninjaboost")
- a_boost = FALSE
- to_chat(ninja, span_notice("You have used the adrenaline boost."))
- s_coold = 6
- addtimer(CALLBACK(src, .proc/ninjaboost_after), 70)
-
-/**
- * Proc called to inject the ninja with radium.
- *
- * Used after 7 seconds of using the ninja's adrenaline.
- * Injects the user with how much radium the suit needs to refill an adrenaline boost.
- */
-/obj/item/clothing/suit/space/space_ninja/proc/ninjaboost_after()
- var/mob/living/carbon/human/ninja = affecting
- ninja.reagents.add_reagent(/datum/reagent/uranium/radium, a_transfer * 0.25)
- to_chat(ninja, span_danger("You are beginning to feel the after-effect of the injection."))
diff --git a/code/modules/ninja/suit/ninja_equipment_actions/ninja_cost_check.dm b/code/modules/ninja/suit/ninja_equipment_actions/ninja_cost_check.dm
deleted file mode 100644
index eee581e0885..00000000000
--- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_cost_check.dm
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Proc called to check if the ninja can afford an ability's cost.
- *
- * Proc which determine whether or not a space ninja can afford to use a specific ability.
- * It can also cancel stealth if the ability requested it.
- * Arguments:
- * * cost - the energy cost of the ability
- * * specificCheck - Determines if the check is a normal one, an adrenaline one, or a stealth cancel check.
- * * Returns TRUE or the current cooldown timer if we can't perform the ability, and FALSE if we can.
- */
-/obj/item/clothing/suit/space/space_ninja/proc/ninjacost(cost = 0, specificCheck = 0)
- var/mob/living/carbon/human/ninja = affecting
- var/actualCost = cost*10
- if(cost && cell.charge < actualCost)
- to_chat(ninja, span_warning("Not enough energy!"))
- return TRUE
- else
- //This shit used to be handled individually on every proc.. why even bother with a universal check proc then?
- cell.charge-=(actualCost)
-
- switch(specificCheck)
- if(N_STEALTH_CANCEL)
- cancel_stealth()//Get rid of it.
- if(N_ADRENALINE)
- if(!a_boost)
- to_chat(ninja, span_warning("You do not have any more adrenaline boosters!"))
- return TRUE
- return (s_coold)//Returns the value of the variable which counts down to zero.
diff --git a/code/modules/ninja/suit/ninja_equipment_actions/ninja_empulse.dm b/code/modules/ninja/suit/ninja_equipment_actions/ninja_empulse.dm
deleted file mode 100644
index ea2341a1323..00000000000
--- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_empulse.dm
+++ /dev/null
@@ -1,21 +0,0 @@
-//Disables nearby tech equipment.
-
-/datum/action/item_action/ninjapulse
- name = "EM Burst (50E)"
- desc = "Disable any nearby technology with an electro-magnetic pulse."
- button_icon_state = "emp"
- icon_icon = 'icons/mob/actions/actions_spells.dmi'
-
-/**
- * Proc called to allow the ninja to EMP the nearby area.
- *
- * Proc called to allow the ninja to EMP the nearby area. By default, costs 500E, which is half of the default battery's max charge.
- * Also affects the ninja as well.
- */
-/obj/item/clothing/suit/space/space_ninja/proc/ninjapulse()
- if(ninjacost(500,N_STEALTH_CANCEL))
- return
- var/mob/living/carbon/human/H = affecting
- playsound(H.loc, 'sound/effects/empulse.ogg', 60, 2)
- empulse(H, 4, 6) //Procs sure are nice. Slightly weaker than wizard's disable tch.
- s_coold = 4
diff --git a/code/modules/ninja/suit/ninja_equipment_actions/ninja_net.dm b/code/modules/ninja/suit/ninja_equipment_actions/ninja_net.dm
deleted file mode 100644
index 66eb50438fe..00000000000
--- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_net.dm
+++ /dev/null
@@ -1,42 +0,0 @@
-/datum/action/item_action/ninjanet
- name = "Energy Net (40E)"
- desc = "Captures a fallen opponent in a net of energy."
- button_icon_state = "energynet"
- icon_icon = 'icons/effects/effects.dmi'
-
-/**
- * Proc called to ensnare a person in a energy net.
- *
- * Used to ensnare a target in an energy net, preventing them from moving until the net is broken.
- * Costs 40E, which is 40% of the default battery's max charge. Intended as a means of reliably locking down an opponent when ninja stars won't suffice.
- */
-/obj/item/clothing/suit/space/space_ninja/proc/ninjanet()
- var/mob/living/carbon/human/ninja = affecting
- var/list/nearby_targets = list()
- for(var/mob/living/target in oview(ninja))
- nearby_targets.Add(target)
- if(!length(nearby_targets))
- to_chat(ninja, span_warning("You see no one nearby to ensnare."))
- return
- var/mob/living/net_target = tgui_input_list(ninja, "Select who to capture", "Capture Target", sort_names(nearby_targets))
- if(isnull(net_target))
- return
- if(QDELETED(net_target) || !(net_target in oview(ninja)) || !isliving(net_target) || ninja.incapacitated())
- return
- if(locate(/obj/structure/energy_net) in get_turf(net_target))//Check if they are already being affected by an energy net.
- to_chat(ninja, span_warning("[net_target.p_they(TRUE)] are already trapped inside an energy net!"))
- return
- for(var/turf/between_turf in get_line(get_turf(ninja), get_turf(net_target)))
- if(between_turf.density)//Don't want them shooting nets through walls. It's kind of cheesy.
- to_chat(ninja, span_warning("You may not use an energy net through solid obstacles!"))
- return
- if(!ninjacost(400,N_STEALTH_CANCEL))
- ninja.Beam(net_target, "n_beam", time = 15)
- ninja.say("Get over here!", forced = "ninja net")
- var/obj/structure/energy_net/net = new /obj/structure/energy_net(net_target.drop_location())
- net.affected_mob = net_target
- ninja.visible_message(span_danger("[ninja] caught [net_target] with an energy net!"),span_notice("You caught [net_target] with an energy net!"))
-
- if(net_target.buckled)
- net_target.buckled.unbuckle_mob(affecting,TRUE)
- net.buckle_mob(net_target, TRUE) //No moving for you!
diff --git a/code/modules/ninja/suit/ninja_equipment_actions/ninja_status_read.dm b/code/modules/ninja/suit/ninja_equipment_actions/ninja_status_read.dm
deleted file mode 100644
index 0a9a7ef9387..00000000000
--- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_status_read.dm
+++ /dev/null
@@ -1,38 +0,0 @@
-/datum/action/item_action/ninjastatus
- check_flags = NONE
- name = "Status Readout"
- desc = "Gives a detailed readout about your current status."
- button_icon_state = "health"
- icon_icon = 'icons/obj/device.dmi'
-
-/**
- * Proc called to put a status readout to the ninja in chat.
- *
- * Called put some information about the ninja's current status into chat.
- * This information used to be displayed constantly on the status tab screen
- * when the suit was on, but was turned into this as to remove the code from
- * human.dm
- */
-/obj/item/clothing/suit/space/space_ninja/proc/ninjastatus()
- var/mob/living/carbon/human/ninja = affecting
- var/list/info_list = list()
- info_list += "[span_info("SpiderOS Status: [s_initialized ? "Initialized" : "Disabled"]")]\n"
- info_list += "[span_info("Current Time: [station_time_timestamp()]")]\n"
- //Ninja status
- info_list += "[span_info("Fingerprints: [md5(ninja.dna.unique_identity)]")]\n"
- info_list += "[span_info("Unique Identity: [ninja.dna.unique_enzymes]")]\n"
- info_list += "[span_info("Overall Status: [ninja.stat > 1 ? "dead" : "[ninja.health]% healthy"]")]\n"
- info_list += "[span_info("Nutrition Status: [ninja.nutrition]")]\n"
- info_list += "[span_info("Oxygen Loss: [ninja.getOxyLoss()]")]\n"
- info_list += "[span_info("Toxin Levels: [ninja.getToxLoss()]")]\n"
- info_list += "[span_info("Burn Severity: [ninja.getFireLoss()]")]\n"
- info_list += "[span_info("Brute Trauma: [ninja.getBruteLoss()]")]\n"
- info_list += "[span_info("Body Temperature: [ninja.bodytemperature-T0C] degrees C ([ninja.bodytemperature*1.8-459.67] degrees F)")]\n"
-
- //Diseases
- if(length(ninja.diseases))
- info_list += "Viruses:"
- for(var/datum/disease/ninja_disease in ninja.diseases)
- info_list += "[span_info("* [ninja_disease.name], Type: [ninja_disease.spread_text], Stage: [ninja_disease.stage]/[ninja_disease.max_stages], Possible Cure: [ninja_disease.cure_text]")]\n"
-
- to_chat(ninja, "[info_list.Join()]")
diff --git a/code/modules/ninja/suit/ninja_equipment_actions/ninja_stealth.dm b/code/modules/ninja/suit/ninja_equipment_actions/ninja_stealth.dm
deleted file mode 100644
index 49c3ebdd54e..00000000000
--- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_stealth.dm
+++ /dev/null
@@ -1,46 +0,0 @@
-/datum/action/item_action/ninja_stealth
- name = "Toggle Stealth"
- desc = "Toggles stealth mode on and off."
- button_icon_state = "ninja_cloak"
- icon_icon = 'icons/mob/actions/actions_minor_antag.dmi'
-
-/**
- * Proc called to toggle ninja stealth.
- *
- * Proc called to toggle whether or not the ninja is in stealth mode.
- * If cancelling, calls a separate proc in case something else needs to quickly cancel stealth.
- */
-/obj/item/clothing/suit/space/space_ninja/proc/toggle_stealth()
- var/mob/living/carbon/human/ninja = affecting
- if(!ninja)
- return
- if(stealth)
- cancel_stealth()
- else
- if(cell.charge <= 0)
- to_chat(ninja, span_warning("You don't have enough power to enable Stealth!"))
- return
- stealth = !stealth
- animate(ninja, alpha = 20,time = 12)
- ninja.visible_message(span_warning("[ninja.name] vanishes into thin air!"), \
- span_notice("You are now mostly invisible to normal detection."))
-
-/**
- * Proc called to cancel stealth.
- *
- * Called to cancel the stealth effect if it is ongoing.
- * Does nothing otherwise.
- * Arguments:
- * * Returns false if either the ninja no longer exists or is already visible, returns true if we successfully made the ninja visible.
- */
-/obj/item/clothing/suit/space/space_ninja/proc/cancel_stealth()
- var/mob/living/carbon/human/ninja = affecting
- if(!ninja)
- return FALSE
- if(stealth)
- stealth = !stealth
- animate(ninja, alpha = 255, time = 12)
- ninja.visible_message(span_warning("[ninja.name] appears from thin air!"), \
- span_notice("You are now visible."))
- return TRUE
- return FALSE
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
deleted file mode 100644
index 4220cca57df..00000000000
--- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_suit_initialisation.dm
+++ /dev/null
@@ -1,125 +0,0 @@
-#define NINJA_LOCK_PHASE 1
-#define NINJA_ICON_GENERATE_PHASE 3
-#define NINJA_COMPLETE_PHASE 6
-#define NINJA_DEINIT_LOGOFF_PHASE 1
-#define NINJA_DEINIT_STEALTH_PHASE 5
-
-GLOBAL_LIST_INIT(ninja_initialize_messages, list(
- "Now initializing...",
- "Securing external locking mechanism...\nNeural-net established.",
- "Extending neural-net interface...\nNow monitoring brain wave pattern...",
- "Linking neural-net interface...\nPattern GREEN, continuing operation.",
- "VOID-shift device status: ONLINE.\nCLOAK-tech device status: ONLINE.",
- "Primary system status: ONLINE.\nBackup system status: ONLINE.\nCurrent energy capacity: ",
- "All systems operational. Welcome to SpiderOS, "
-))
-
-GLOBAL_LIST_INIT(ninja_deinitialize_messages, list(
- "Now de-initializing...",
- "Shutting down SpiderOS.",
- "Primary system status: OFFLINE.\nBackup system status: OFFLINE.",
- "VOID-shift device status: OFFLINE.\nCLOAK-tech device status: OFFLINE.",
- "Disconnecting neural-net interface...Success.",
- "Disengaging neural-net interface... Success.",
- "Unsecuring external locking mechanism...\nNeural-net abolished.\nOperation status: FINISHED."
-))
-
-/datum/action/item_action/initialize_ninja_suit
- name = "Toggle Ninja Suit"
-
-/**
- * Toggles the ninja suit on/off
- *
- * Attempts to initialize or deinitialize the ninja suit
- */
-/obj/item/clothing/suit/space/space_ninja/proc/toggle_on_off()
- . = TRUE
- if(s_busy)
- to_chat(loc, "[span_warning("ERROR")]: You cannot use this function at this time.")
- return FALSE
- s_busy = TRUE
- if(s_initialized)
- deinitialize()
- else
- ninitialize()
-
-/**
- * Initializes the ninja suit
- *
- * Initializes the ninja suit through seven phases, each of which calls this proc with an incremented phase
- * Arguments:
- * * delay - The delay between each phase of initialization
- * * ninja - The human who is being affected by the suit
- * * phase - The phase of initialization
- */
-/obj/item/clothing/suit/space/space_ninja/proc/ninitialize(delay = s_delay, mob/living/carbon/human/ninja = loc, phase = 0)
- if(!ninja || !ninja.mind)
- s_busy = FALSE
- return
- if (phase > NINJA_LOCK_PHASE && (ninja.stat == DEAD || ninja.health <= 0))
- to_chat(ninja, span_danger("FĆAL �Rr�R: 344--93#�&&21 BR��N |/|/aV� PATT$RN RED\nA-A-aB�rT�NG..."))
- unlock_suit(ninja)
- s_busy = FALSE
- return
-
- var/message = GLOB.ninja_initialize_messages[phase + 1]
- switch(phase)
- if (NINJA_LOCK_PHASE)
- if(!lock_suit(ninja))//To lock the suit onto wearer.
- s_busy = FALSE
- return
- if (NINJA_ICON_GENERATE_PHASE)
- lockIcons(ninja)//Check for icons.
- ninja.regenerate_icons()
- if (NINJA_COMPLETE_PHASE - 1)
- message += "[display_energy(cell.charge)]."
- if (NINJA_COMPLETE_PHASE)
- message += "[ninja.real_name]."
- s_initialized = TRUE
- s_busy = FALSE
-
- to_chat(ninja, span_notice("[message]"))
- playsound(ninja, 'sound/effects/sparks1.ogg', 10, TRUE)
-
- if (phase < NINJA_COMPLETE_PHASE)
- addtimer(CALLBACK(src, .proc/ninitialize, delay, ninja, phase + 1), delay)
-
-/**
- * Deinitializes the ninja suit
- *
- * Deinitializes the ninja suit through eight phases, each of which calls this proc with an incremented phase
- * Arguments:
- * * delay - The delay between each phase of deinitialization
- * * ninja - The human who is being affected by the suit
- * * phase - The phase of deinitialization
- */
-/obj/item/clothing/suit/space/space_ninja/proc/deinitialize(delay = s_delay, mob/living/carbon/human/ninja = affecting == loc ? affecting : null, phase = 0)
- if (!ninja || !ninja.mind)
- s_busy = FALSE
- return
- if (phase == 0 && tgui_alert(usr, "Are you certain you wish to remove the suit? This will take time and remove all abilities.",,list("Yes","No")) == "No")
- s_busy = FALSE
- return
-
- var/message = GLOB.ninja_deinitialize_messages[phase + 1]
- switch(phase)
- if(NINJA_DEINIT_LOGOFF_PHASE)
- message = "Logging off, [ninja.real_name]. " + message
- if(NINJA_DEINIT_STEALTH_PHASE)
- cancel_stealth()
- to_chat(ninja, span_notice("[message]"))
- playsound(ninja, 'sound/items/deconstruct.ogg', 10, TRUE)
-
- if (phase < NINJA_COMPLETE_PHASE)
- addtimer(CALLBACK(src, .proc/deinitialize, delay, ninja, phase + 1), delay)
- else
- unlock_suit(ninja)
- ninja.regenerate_icons()
- s_initialized = FALSE
- s_busy = FALSE
-
-#undef NINJA_LOCK_PHASE
-#undef NINJA_ICON_GENERATE_PHASE
-#undef NINJA_COMPLETE_PHASE
-#undef NINJA_DEINIT_LOGOFF_PHASE
-#undef NINJA_DEINIT_STEALTH_PHASE
diff --git a/code/modules/ninja/suit/ninja_equipment_actions/ninja_sword_recall.dm b/code/modules/ninja/suit/ninja_equipment_actions/ninja_sword_recall.dm
deleted file mode 100644
index 702a7a964c2..00000000000
--- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_sword_recall.dm
+++ /dev/null
@@ -1,47 +0,0 @@
-/datum/action/item_action/ninja_sword_recall
- name = "Recall Energy Katana (Variable Cost)"
- desc = "Teleports the Energy Katana linked to this suit to its wearer, cost based on distance."
- button_icon_state = "energy_katana"
- icon_icon = 'icons/obj/items_and_weapons.dmi'
-
-/**
- * Proc called to recall the ninja's sword.
- *
- * Called to summon the ninja's katana back to them
- * If the katana can see the ninja, it will throw itself towards them.
- * If not, the katana will teleport itself to the ninja.
- */
-/obj/item/clothing/suit/space/space_ninja/proc/ninja_sword_recall()
- var/mob/living/carbon/human/ninja = affecting
- var/cost = 0
- var/inview = TRUE
-
- if(!energyKatana)
- to_chat(ninja, span_warning("Could not locate Energy Katana!"))
- return
-
- if(energyKatana in ninja)
- return
-
- var/distance = get_dist(ninja,energyKatana)
-
- if(!(energyKatana in view(ninja)))
- cost = distance //Actual cost is cost x 10, so 5 turfs is 50 cost.
- inview = FALSE
-
- if(!ninjacost(cost))
- if(iscarbon(energyKatana.loc))
- var/mob/living/carbon/sword_holder = energyKatana.loc
- sword_holder.transferItemToLoc(energyKatana, get_turf(energyKatana), TRUE)
-
- else
- energyKatana.forceMove(get_turf(energyKatana))
-
- if(inview) //If we can see the katana, throw it towards ourselves, damaging people as we go.
- energyKatana.spark_system.start()
- playsound(ninja, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- ninja.visible_message(span_danger("\the [energyKatana] flies towards [ninja]!"),span_warning("You hold out your hand and \the [energyKatana] flies towards you!"))
- energyKatana.throw_at(ninja, distance+1, energyKatana.throw_speed, ninja)
-
- else //Else just TP it to us.
- energyKatana.returnToOwner(ninja, 1)
diff --git a/code/modules/ninja/suit/shoes.dm b/code/modules/ninja/suit/shoes.dm
deleted file mode 100644
index cb1e745ea45..00000000000
--- a/code/modules/ninja/suit/shoes.dm
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * # Ninja Shoes
- *
- * Space ninja's shoes. Gives him armor on his feet.
- *
- * Space ninja's ninja shoes. How mousey. Gives him slip protection and protection against attacks.
- * Also are temperature resistant.
- *
- */
-/obj/item/clothing/shoes/space_ninja
- name = "ninja shoes"
- desc = "A pair of running shoes. Excellent for running and even better for smashing skulls."
- icon_state = "s-ninja"
- inhand_icon_state = "secshoes"
- clothing_flags = NOSLIP
- resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
- armor = list(MELEE = 40, BULLET = 30, LASER = 20, ENERGY = 15, BOMB = 30, BIO = 100, FIRE = 100, ACID = 100)
- strip_delay = 120
- cold_protection = FEET
- min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
- heat_protection = FEET
- max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
- slowdown = -1
diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm
deleted file mode 100644
index 7a2e153d0b4..00000000000
--- a/code/modules/ninja/suit/suit.dm
+++ /dev/null
@@ -1,255 +0,0 @@
-/**
- * # Ninja Suit
- *
- * Space ninja's suit. Provides him with most of his powers.
- *
- * Space ninja's suit. Gives space ninja all his iconic powers, which are mostly kept in
- * the folder ninja_equipment_actions. Has a lot of unique stuff going on, so make sure to check
- * the variables. Check suit_attackby to see radium interaction, disk copying, and cell replacement.
- *
- */
-/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 = "s-ninja"
- inhand_icon_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)
- resistance_flags = LAVA_PROOF | ACID_PROOF
- armor = list(MELEE = 40, BULLET = 30, LASER = 20,ENERGY = 30, BOMB = 30, BIO = 100, FIRE = 100, ACID = 100)
- strip_delay = 12
- min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
- actions_types = list(/datum/action/item_action/initialize_ninja_suit, /datum/action/item_action/ninjastatus, /datum/action/item_action/ninjaboost, /datum/action/item_action/ninjapulse, /datum/action/item_action/ninjastar, /datum/action/item_action/ninjanet, /datum/action/item_action/ninja_sword_recall, /datum/action/item_action/ninja_stealth)
-
- ///The person wearing the suit
- var/mob/living/carbon/human/affecting = null
- ///The suit's spark system, used for... sparking.
- var/datum/effect_system/spark_spread/spark_system
- ///The suit's stored research. Used for the research objective (see antagonist file)
- var/datum/techweb/stored_research
- ///The katana registered with the suit, used for recalling and catching the katana. Set when the ninja outfit is created.
- var/obj/item/energy_katana/energyKatana
-
- ///The space ninja's hood.
- var/obj/item/clothing/head/helmet/space/space_ninja/n_hood
- ///The space ninja's shoes.
- var/obj/item/clothing/shoes/space_ninja/n_shoes
- ///The space ninja's gloves.
- var/obj/item/clothing/gloves/space_ninja/n_gloves
- ///The space ninja's mask.
- var/obj/item/clothing/mask/gas/space_ninja/n_mask
-
- ///Whether or not the suit is currently booted up. Starts off.
- var/s_initialized = FALSE//Suit starts off.
- ///The suit's current cooldown. If not 0, blocks usage of most abilities, and decrements its value by 1 every process
- var/s_coold = 0
- ///How much energy the suit expends in a single process
- var/s_cost = 1
- ///Additional energy cost for cloaking per process
- var/s_acost = 4
- ///How fast the suit is at certain actions, like draining power from things
- var/s_delay = 40
- ///Units of radium required to refill the adrenaline boost
- var/a_transfer = 20//How much radium is required to refill the adrenaline boost.
- ///Whether or not the suit is currently in stealth mode.
- var/stealth = FALSE//Stealth off.
- ///Whether or not the wearer is in the middle of an action, like hacking.
- var/s_busy = FALSE
- ///Whether or not the adrenaline boost ability is available
- var/a_boost = TRUE
-
-/obj/item/clothing/suit/space/space_ninja/examine(mob/user)
- . = ..()
- if(!s_initialized)
- return
- if(!user == affecting)
- return
- . += "All systems operational. Current energy capacity: [display_energy(cell.charge)].\n"+\
- "The CLOAK-tech device is [stealth?"active":"inactive"].\n"+\
- "[a_boost?"An adrenaline boost is available to use.":"There is no adrenaline boost available. Try refilling the suit with 20 units of radium."]"
-
-/obj/item/clothing/suit/space/space_ninja/Initialize(mapload)
- . = ..()
-
- //Spark Init
- spark_system = new
- spark_system.set_up(5, 0, src)
- spark_system.attach(src)
-
- //Research Init
- stored_research = new()
-
- //Cell Init
- cell = new/obj/item/stock_parts/cell/high
- cell.charge = 9000
- cell.name = "black power cell"
- cell.icon_state = "bscell"
-
-/obj/item/clothing/suit/space/space_ninja/Destroy()
- QDEL_NULL(spark_system)
- QDEL_NULL(cell)
- return ..()
-
-// seal the cell in the ninja outfit
-/obj/item/clothing/suit/space/space_ninja/toggle_spacesuit_cell(mob/user)
- return
-
-// Space Suit temperature regulation and power usage
-/obj/item/clothing/suit/space/space_ninja/process(delta_time)
- var/mob/living/carbon/human/user = src.loc
- if(!user || !ishuman(user) || !(user.wear_suit == src))
- return
-
- // Check for energy usage
- if(s_initialized)
- if(!affecting)
- terminate() // Kills the suit and attached objects.
- else if(cell.charge > 0)
- if(s_coold > 0)
- s_coold = max(s_coold - delta_time, 0) // Checks for ability s_cooldown first.
- cell.charge -= s_cost * delta_time // s_cost is the default energy cost each ntick, usually 5.
- if(stealth) // If stealth is active.
- cell.charge -= s_acost * delta_time
- else
- cell.charge = 0
- cancel_stealth()
-
- user.adjust_bodytemperature(BODYTEMP_NORMAL - user.bodytemperature)
-
-/obj/item/clothing/suit/space/space_ninja/ui_action_click(mob/user, action)
- if(IS_NINJA_SUIT_INITIALIZATION(action))
- toggle_on_off()
- return TRUE
- if(!s_initialized)
- to_chat(user, span_warning("ERROR: suit offline. Please activate suit."))
- return FALSE
- if(s_coold > 0)
- to_chat(user, span_warning("ERROR: suit is on cooldown."))
- return FALSE
- if(IS_NINJA_SUIT_STATUS(action))
- ninjastatus()
- return TRUE
- if(IS_NINJA_SUIT_BOOST(action))
- ninjaboost()
- return TRUE
- if(IS_NINJA_SUIT_EMP(action))
- ninjapulse()
- return TRUE
- if(IS_NINJA_SUIT_STAR_CREATION(action))
- ninjastar()
- return TRUE
- if(IS_NINJA_SUIT_NET_CREATION(action))
- ninjanet()
- return TRUE
- if(IS_NINJA_SUIT_SWORD_RECALL(action))
- ninja_sword_recall()
- return TRUE
- if(IS_NINJA_SUIT_STEALTH(action))
- toggle_stealth()
- return TRUE
- return FALSE
-
-/obj/item/clothing/suit/space/space_ninja/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- . = ..()
- if(stealth)
- cancel_stealth()
- s_coold = 5
-
-/**
- * Proc for changing the suit's appearance upon locking.
- *
- * Proc for when space ninja's suit locks. If the user selects Original, gives it glowing lights, along with having an alternate sprite for female body types.
- * Yes, we do have nipLEDs, how could you tell?
- * If the user selects New Age, it applies new sprites to all the gear.
- * Arguments:
- * * ninja - The person wearing the suit.
- */
-/obj/item/clothing/suit/space/space_ninja/proc/lockIcons(mob/living/carbon/human/ninja)
- var/design_choice = tgui_alert(ninja, "Please choose your desired suit design.",,list("Original","New Age"))
- switch(design_choice)
- if("Original")
- icon_state = ninja.physique == "female" ? "s-ninjanf" : "s-ninjan"
- ninja.gloves.icon_state = "s-ninjan"
- ninja.gloves.inhand_icon_state = "s-ninjan"
- if("New Age")
- icon_state ="ninja_new"
- n_hood.icon_state = "ninja_newcowl"
- n_gloves.icon_state = "ninja_new"
- if(n_mask)
- n_mask.icon_state = "ninja_new"
-
-
-/**
- * Proc called to lock the important gear pieces onto space ninja's body.
- *
- * Called during the suit startup to lock all gear pieces onto space ninja.
- * Terminates if a gear piece is not being worn. Also gives the ninja the inability to use firearms.
- * If the person in the suit isn't a ninja when this is called, this proc just gibs them instead.
- * Arguments:
- * * ninja - The person wearing the suit.
- * * Returns false if the locking fails due to lack of all suit parts, and true if it succeeds.
- */
-/obj/item/clothing/suit/space/space_ninja/proc/lock_suit(mob/living/carbon/human/ninja)
- if(!istype(ninja))
- return FALSE
- if(!IS_SPACE_NINJA(ninja))
- to_chat(ninja, span_danger("fÄTaL ÈÈRRoR: 382200-*#00CÖDE RED\nUNAU†HORIZED USÈ DETÈC†††eD\nCoMMÈNCING SUB-R0U†IN3 13...\nTÈRMInATING U-U-USÈR..."))
- ninja.gib()
- return FALSE
- if(!istype(ninja.head, /obj/item/clothing/head/helmet/space/space_ninja))
- to_chat(ninja, "[span_userdanger("ERROR")]: 100113 UNABLE TO LOCATE HEAD GEAR\nABORTING...")
- return FALSE
- if(!istype(ninja.shoes, /obj/item/clothing/shoes/space_ninja))
- to_chat(ninja, "[span_userdanger("ERROR")]: 122011 UNABLE TO LOCATE FOOT GEAR\nABORTING...")
- return FALSE
- if(!istype(ninja.gloves, /obj/item/clothing/gloves/space_ninja))
- to_chat(ninja, "[span_userdanger("ERROR")]: 110223 UNABLE TO LOCATE HAND GEAR\nABORTING...")
- return FALSE
- affecting = ninja
- ADD_TRAIT(src, TRAIT_NODROP, NINJA_SUIT_TRAIT)
- n_hood = ninja.head
- ADD_TRAIT(n_hood, TRAIT_NODROP, NINJA_SUIT_TRAIT)
- n_shoes = ninja.shoes
- ADD_TRAIT(n_shoes, TRAIT_NODROP, NINJA_SUIT_TRAIT)
- n_gloves = ninja.gloves
- ADD_TRAIT(n_gloves, TRAIT_NODROP, NINJA_SUIT_TRAIT)
- n_mask = ninja.wear_mask
-
- ADD_TRAIT(ninja, TRAIT_NOGUNS, NINJA_SUIT_TRAIT)
- return TRUE
-
-/**
- * Proc called to unlock all the gear off space ninja's body.
- *
- * Proc which is essentially the opposite of lock_suit. Lets you take off all the suit parts.
- * Also gets rid of the objection to using firearms from the wearer.
- * Arguments:
- * * ninja - The person wearing the suit.
- */
-/obj/item/clothing/suit/space/space_ninja/proc/unlock_suit(mob/living/carbon/human/ninja)
- affecting = null
- REMOVE_TRAIT(src, TRAIT_NODROP, NINJA_SUIT_TRAIT)
- 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 = "s-ninja"
- if(n_shoes)
- REMOVE_TRAIT(n_shoes, TRAIT_NODROP, NINJA_SUIT_TRAIT)
- if(n_gloves)
- n_gloves.icon_state = "black"
- REMOVE_TRAIT(n_gloves, TRAIT_NODROP, NINJA_SUIT_TRAIT)
- n_gloves.draining = FALSE
-
- REMOVE_TRAIT(ninja, TRAIT_NOGUNS, NINJA_SUIT_TRAIT)
- if(n_mask)
- n_mask.icon_state = "s-ninja"
-
-/**
- * Proc used to delete all the attachments and itself.
- *
- * Can be called to entire rid of the suit pieces and the suit itself.
- */
-/obj/item/clothing/suit/space/space_ninja/proc/terminate()
- QDEL_NULL(n_hood)
- QDEL_NULL(n_gloves)
- QDEL_NULL(n_shoes)
- QDEL_NULL(src)
diff --git a/code/modules/ninja/suit/suit_attackby.dm b/code/modules/ninja/suit/suit_attackby.dm
deleted file mode 100644
index 509c6a2652b..00000000000
--- a/code/modules/ninja/suit/suit_attackby.dm
+++ /dev/null
@@ -1,50 +0,0 @@
-/obj/item/clothing/suit/space/space_ninja/attackby(obj/item/I, mob/ninja, params)
- if(ninja!=affecting)//Safety, in case you try doing this without wearing the suit/being the person with the suit.
- return ..()
-
- if(istype(I, /obj/item/reagent_containers/glass) && I.reagents.has_reagent(/datum/reagent/uranium/radium, a_transfer) && a_boost != TRUE)//If it's a glass beaker, and what we're transferring is radium.
- I.reagents.remove_reagent(/datum/reagent/uranium/radium, a_transfer)
- a_boost = TRUE;
- to_chat(ninja, span_notice("The suit's adrenaline boost is now reloaded."))
- return
-
-
- else if(istype(I, /obj/item/stock_parts/cell))
- var/obj/item/stock_parts/cell/CELL = I
- if(CELL.maxcharge > cell.maxcharge)
- to_chat(ninja, span_notice("Higher maximum capacity detected.\nUpgrading..."))
- if (do_after(ninja,s_delay, target = src))
- ninja.transferItemToLoc(CELL, src)
- CELL.charge = min(CELL.charge+cell.charge, CELL.maxcharge)
- var/obj/item/stock_parts/cell/old_cell = cell
- old_cell.charge = 0
- ninja.put_in_hands(old_cell)
- old_cell.add_fingerprint(ninja)
- old_cell.corrupt()
- old_cell.update_appearance()
- cell = CELL
- to_chat(ninja, span_notice("Upgrade complete. Maximum capacity: [round(cell.maxcharge/100)]%"))
- else
- to_chat(ninja, span_danger("Procedure interrupted. Protocol terminated."))
- return
-
- else if(istype(I, /obj/item/disk/tech_disk))//If it's a data disk, we want to copy the research on to the suit.
- var/obj/item/disk/tech_disk/TD = I
- var/has_research = FALSE
- for(var/node in TD.stored_research.researched_nodes)
- if(!stored_research.researched_nodes[node])
- has_research = TRUE
- break
- if(has_research)//If it has something on it.
- to_chat(ninja, span_notice("Research information detected, processing..."))
- if(do_after(ninja,s_delay, target = src))
- TD.stored_research.copy_research_to(stored_research)
- qdel(TD.stored_research)
- TD.stored_research = new
- to_chat(ninja, span_notice("Data analyzed and updated. Disk erased."))
- else
- to_chat(ninja, "[span_userdanger("ERROR")]: Procedure interrupted. Process terminated.")
- else
- to_chat(ninja, span_notice("No new research information detected."))
- return
- return ..()
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 02db057735a..d68aca06d6c 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -313,6 +313,13 @@
name = "pulse pistol power cell"
maxcharge = 2000
+/obj/item/stock_parts/cell/ninja
+ name = "black power cell"
+ icon_state = "bscell"
+ maxcharge = 10000
+ custom_materials = list(/datum/material/glass=60)
+ chargerate = 2000
+
/obj/item/stock_parts/cell/high
name = "high-capacity power cell"
icon_state = "hcell"
diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi
index d767ca359327de3503e1cd8e577b5d7f91ff0ee7..3c61d0f31a42d1a7cc40739db6289d31039296ac 100644
GIT binary patch
literal 23104
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
P@;`@8YM3q>PM+MeFY9%J>
zfyC};S0e^pL}~wdUXrk@-<)u2AUC%7_@R69w)lea-ns(3BBWu_h^^w|y1(LPUnmf`
z!UMrrAzJkf4EP{lzkV%mf6L4TDK0CUU?}dq<6RSqWG6L%lsL4kq9Z?f^6((tS|VdFMeRQCN$=Xu-taZ!1-%jFu}vKEs9Xlw0+
z`GqT2IW89kqooFCTfN`9$B)d++_B}n$`O~7pU=uE?^%eW!@m@P{VlG+H#p3%p)tl*
z_CUayZ_7@~I#;Za_#IRCE%k{R&X?xPc>+G#%dfs5^CtPN6YZ{EUK3zaip|fx7ycB;
zy)Ak?gt!rFd~&d&q68((FckOx;I#dQE1Ig2iVI$0Gxy;~c(g(KZ@lO>&$c+i3nC|5
zMF%&ZGe^p^`w&jPezD;c=O`9}UQjBvEG4Is+KjG;JZcwZ1q?|nx(*k$;`fpe%ax`C
z^Y^{n@E%3ekbk1OEAK$MeIs^GXP$?=e5bv`#ELpm{8-33$r
zlg4q-R*|?;qB$zZJzN$#BYYz@$sk(2u*|G+)S}JvON^nR(^i^P(~F@Sd_TH0kh+pm
zs{sa)ljWwlUmk}EN+_8Bjo+yc*)Uf+JPFtZs|#wigEjkGDtLH!TJiE_>9@$Ba^v21
z9%O$&#c)^z^?BxO_j=P{1$gpvu3xuXFUz9-yPP}7@ySqab=TN+r>$p=SHJAZIqT+&(ceBf7k}bc?5RQ!ow}*om@$M5HPjm+=sFb?e0<
zTs@vGzV7%U>oBYW-hewNjXS^GSU2Clm62TQYJ`>rN_P0otnR09E^AcjM4gRl!kG|+HOTjf=vOhw5Pk66VK(BP
z`LN2YP~*1MqzlgU^4IMyp7Dz iIB^>5Vm6$wkk-~DjJKZed5?3y|<*0g#_HXVZ
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
literal 22744
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
Rf8Mcm$Q$O@%MDx}{|}i-=;r_c
diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi
index 7350c9a03a8aef1278f4ff70b27214753ca95401..6db0a3b81930b050700f3d4b2a8379a8f84f17e2 100644
GIT binary patch
literal 16760
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