diff --git a/code/game/gamemodes/events/ninja_abilities.dm b/code/game/gamemodes/events/ninja_abilities.dm
index feeab4f7c39..40acb830ab9 100644
--- a/code/game/gamemodes/events/ninja_abilities.dm
+++ b/code/game/gamemodes/events/ninja_abilities.dm
@@ -68,12 +68,12 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
//=======//9-8 TILE TELEPORT//=======//
//Click to to teleport 9-10 tiles in direction facing.
/obj/item/clothing/suit/space/space_ninja/proc/ninjajaunt()
- set name = "Phase Jaunt (250E)"
+ set name = "Phase Jaunt (500E)"
set desc = "Utilizes the internal VOID-shift device to rapidly transit in direction facing."
set category = "Ninja Ability"
set popup_menu = 0
- var/C = 200
+ var/C = 500
if(!ninjacost(C,1))
var/mob/living/carbon/human/U = affecting
var/turf/destination = get_teleport_loc(U.loc,U,9,1,3,1,0,1)
@@ -108,12 +108,12 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
//=======//RIGHT CLICK TELEPORT//=======//
//Right click to teleport somewhere, almost exactly like admin jump to turf.
/obj/item/clothing/suit/space/space_ninja/proc/ninjashift(turf/T in oview())
- set name = "Phase Shift (500E)"
+ set name = "Phase Shift (750E)"
set desc = "Utilizes the internal VOID-shift device to rapidly transit to a destination in view."
set category = null//So it does not show up on the panel but can still be right-clicked.
set src = usr.contents//Fixes verbs not attaching properly for objects. Praise the DM reference guide!
- var/C = 400
+ var/C = 750
if(!ninjacost(C,1))
var/mob/living/carbon/human/U = affecting
var/turf/mobloc = get_turf(U.loc)//To make sure that certain things work properly below.
@@ -230,12 +230,12 @@ This could be a lot better but I'm too tired atm.*/
/*Allows the ninja to capture people, I guess.
Must right click on a mob to activate.*/
/obj/item/clothing/suit/space/space_ninja/proc/ninjanet(mob/living/carbon/M in oview())//Only living carbon mobs.
- set name = "Energy Net (5,000E)"
+ set name = "Energy Net (2,500E)"
set desc = "Captures a fallen opponent in a net of energy. Will teleport them to a holding facility after 30 seconds."
set category = null
set src = usr.contents
- var/C = 5000
+ var/C = 2500
if(!ninjacost(C,1)&&iscarbon(M)) // Nets now cost 8,000
var/mob/living/carbon/human/U = affecting
//if(M.client)//Monkeys without a client can still step_to() and bypass the net. Also, netting inactive people is lame.
diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm
index 563dd6fd5a3..f33229ed26e 100644
--- a/code/game/gamemodes/events/ninja_equipment.dm
+++ b/code/game/gamemodes/events/ninja_equipment.dm
@@ -23,7 +23,6 @@ ________________________________________________________________________________
verbs += /obj/item/clothing/suit/space/space_ninja/proc/init//suit initialize verb
verbs += /obj/item/clothing/suit/space/space_ninja/proc/ai_instruction//for AIs
verbs += /obj/item/clothing/suit/space/space_ninja/proc/ai_holo
- verbs += /obj/item/clothing/suit/space/space_ninja/proc/ai_overrideninja // Experemental
//verbs += /obj/item/clothing/suit/space/space_ninja/proc/display_verb_procs//DEBUG. Doesn't work.
spark_system = new()//spark initialize
spark_system.set_up(5, 0, src)
@@ -407,11 +406,11 @@ ________________________________________________________________________________
Abilities:
- - *Phase Shift (500E) and Phase Jaunt (250E) are unique powers in that they can both be used for defense and offense. Jaunt launches the ninja forward facing up to 9 squares, somewhat randomly selecting the final destination. Shift can only be used on turf in view but is precise (cannot be used on walls). Any living mob in the area teleported to is instantly gibbed (mechs are damaged, huggers and other similar critters are killed). It is possible to teleport with a target, provided you grab them before teleporting.
+ - *Phase Shift (750E) and Phase Jaunt (500E) are unique powers in that they can both be used for defense and offense. Jaunt launches the ninja forward facing up to 9 squares, somewhat randomly selecting the final destination. Shift can only be used on turf in view but is precise (cannot be used on walls). It is possible to teleport with a target, provided you grab them before teleporting.
- *Energy Blade (200E) is a highly effective weapon. It is summoned directly to the ninja's hand and can also function as an EMAG for certain objects (doors/lockers/etc). You may also use it to cut through walls and disabled doors. Experiment! The blade will crit humans in two hits. This item cannot be placed in containers and when dropped or thrown disappears. Having an energy blade drains more power from the battery each tick.
- *EM Pulse (1000E) is a highly useful ability that will create an electromagnetic shockwave around the ninja, disabling technology whenever possible. If used properly it can render a security force effectively useless. Of course, getting beat up with a toolbox is not accounted for.
- *Energy Star (500E) is a ninja star made of green energy AND coated in poison. It works by picking a random living target within range and can be spammed to great effect in incapacitating foes. Just remember that the poison used is also used by the Xeno Hivemind (and will have no effect on them).
- - *Energy Net (5000E) is a non-lethal solution to incapacitating humanoids. The net is made of non-harmful phase energy and will halt movement as long as it remains in effect--it can be destroyed. If the net is not destroyed, after a certain time it will teleport the target to a holding facility for the Spider Clan and then vanish. You will be notified if the net fails or succeeds in capturing a target in this manner. Combine with energy stars or stripping to ensure success. Abduction never looked this leet.
+ - *Energy Net (2000E) is a non-lethal solution to incapacitating humanoids. The net is made of non-harmful phase energy and will halt movement as long as it remains in effect--it can be destroyed. If the net is not destroyed, after a certain time it will teleport the target to a holding facility for the Spider Clan and then vanish. You will be notified if the net fails or succeeds in capturing a target in this manner. Combine with energy stars or stripping to ensure success. Abduction never looked this leet.
- *Adrenaline Boost (1 E. Boost/3) recovers the user from stun, weakness, and paralysis. Also injects 20 units of radium into the bloodstream.
- *Smoke Bomb (1 Sm.Bomb/10) is a weak but potentially useful ability. It creates harmful smoke and can be used in tandem with other powers to confuse enemies.
- *???: unleash the True Ultimate Power!
@@ -466,12 +465,12 @@ ________________________________________________________________________________
dat += {"
Activate Abilities:
@@ -700,7 +699,6 @@ ________________________________________________________________________________
if(4)
A << "Connection established and secured. Menu updated."
U << "\red W�r#nING: #%@!!WȆ|_4�54@ \nUn�B88l3 T� L�-�o-L�CaT2 ##$!�RN�0..%.."
- verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ai_overrideninja // To stop AIs from overriding an overridden Ninja. -- Dave
grant_AI_verbs()
return
sleep(s_delay)
@@ -810,54 +808,9 @@ ________________________________________________________________________________
AI << "You have ceased your hacking attempt. [affecting.real_name] has regained control."
affecting << "UPDATE: [AI.real_name] has ceased hacking attempt. All systems clear."
- verbs += /obj/item/clothing/suit/space/space_ninja/proc/ai_overrideninja
remove_AI_verbs()
return
-/obj/item/clothing/suit/space/space_ninja/proc/ai_overrideninja()// Experemental -- Dave
- set name = "Hack Ninja Systems"
- set desc = "Hack directly into the Black Widow(tm) neuro-interface."
- set category = "AI Ninja Equip"
- set src = usr.loc
-
- var/mob/living/carbon/human/U = affecting
- var/mob/living/silicon/ai/A = AI
-
- if(A.laws != new /datum/ai_laws/ninja_override && s_busy == 0)
- s_busy = 1
- for(var/i,i<6,i++)
- if(AI==A)
- switch(i)
- if(1)
- A << "\blue NOTICE:\black Beginning hack attempt..."
- U << "\red WARNING: HACKING AT��TEMP� IN PR0GRESs!"
- spideros = 0
- k_unlock = 0
- U << browse(null, "window=spideros")
- if(2)
- A << "Disconnecting neural interface..."
- U << "\red WAR�NING: �R�O0�Gr�--S 2&3%"
- if(3)
- A << "Shutting down external protocol..."
- U << "\red WARNING: P����RֆGr�5S 677^%"
- cancel_stealth()
- if(4)
- A << "Connecting to kernel..."
- U << "\red WARNING: �R�r�R_404"
- A.control_disabled = 0
- if(5)
- A << "Connection established and secured. Menu updated."
- U << "\red W�r#nING: #%@!!WȆ|_4�54@ \nUn�B88l3 T� L�-�o-L�CaT2 ##$!�RN�0..%.."
- verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ai_overrideninja
- grant_AI_verbs()
- return
- sleep(s_delay)
- else break
- s_busy = 0
- else
- A << "\redALERT:\black Current lawset prevents hacking!"
-
-
//=======//GENERAL SUIT PROCS//=======//
/obj/item/clothing/suit/space/space_ninja/attackby(obj/item/I, mob/U)
@@ -1206,29 +1159,6 @@ ________________________________________________________________________________
- /*
-
- Experimenting with a wrist-mounted hypospray for delivering hallucigenics. Todo: Possibly make it only work on harm intent.
-
- -- Dave
-
- */
-
- if("HUMAN")
- var/mob/living/carbon/human/A = target
- if(S.h_stings > 0)
- if(A != U) // Because it's bound to happen.
- S.h_stings -= 1
- A <<"\red You feel a tiny prick, something doesn't feel right..."
- U <<"\blue Hallucigen administered to [A], you have [S.h_stings] doses left."
- A.hallucination += 300
- else
- U <<"\red You think for a moment, and decide may not be wise to inject yourself."
- else
- U<<"\red You are out of stings!"
-
-
-
if("CYBORG")
var/mob/living/silicon/robot/A = target
A << "\red Warning: Unauthorized access through sub-route 12, block C, detected."
diff --git a/code/modules/clothing/gloves/ninja.dm b/code/modules/clothing/gloves/ninja.dm
index 9cf9b24817f..e0ff003213e 100644
--- a/code/modules/clothing/gloves/ninja.dm
+++ b/code/modules/clothing/gloves/ninja.dm
@@ -117,7 +117,3 @@
drain("RESEARCH",A,suit)
return 1
- if(istype(A,/mob/living/carbon/human))
- drain("HUMAN",A,suit)
- return 1
-
diff --git a/code/modules/clothing/spacesuits/ninja.dm b/code/modules/clothing/spacesuits/ninja.dm
index c7450cdffcf..fbe33dc81ea 100644
--- a/code/modules/clothing/spacesuits/ninja.dm
+++ b/code/modules/clothing/spacesuits/ninja.dm
@@ -53,7 +53,6 @@
//Ability function variables.
var/s_bombs = 10.0//Number of starting ninja smoke bombs.
var/a_boost = 3.0//Number of adrenaline boosters.
- var/h_stings = 5.0// Experementing with a wrist-mounted hypospray for delivering various drugs. Right now I'm thinking hallucigenics.
//Onboard AI related variables.
var/mob/living/silicon/ai/AI//If there is an AI inside the suit.
diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm
index f6847e63986..3dd9e76cf91 100644
--- a/code/modules/events/event_dynamic.dm
+++ b/code/modules/events/event_dynamic.dm
@@ -99,7 +99,7 @@ var/global/list/possibleEvents = list()
if(aliens_allowed && !sent_aliens_to_station)
possibleEvents[/datum/event/alien_infestation] = max(active_with_role["Security"], 5) + 2.5
if(!sent_ninja_to_station && toggle_space_ninja)
- possibleEvents[/datum/event/space_ninja] = max(active_with_role["Security"], 5)
+ possibleEvents[/datum/event/space_ninja] = active_with_role["Security"] * 20
possibleEvents[/datum/event/undead] = active_with_role["Security"] * 10
possibleEvents[/datum/event/ghosts] = active_with_role["Security"] * 25
possibleEvents[/datum/event/tear] = active_with_role["Security"] * 25
diff --git a/maps/tgstation-redux-WIP.dmm b/maps/tgstation-redux-WIP.dmm
index 5c5e8e11557..bbd15608b8e 100644
--- a/maps/tgstation-redux-WIP.dmm
+++ b/maps/tgstation-redux-WIP.dmm
@@ -4724,7 +4724,7 @@
"bMR" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/extinguisher_cabinet{pixel_x = -24},/turf/simulated/floor,/area/toxins/telesci)
"bMS" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{dir = 1},/turf/simulated/floor,/area/toxins/telesci)
"bMT" = (/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "misclab"; name = "Test Chamber Blast Doors"; opacity = 0},/obj/structure/grille,/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 1},/turf/simulated/floor{tag = "icon-vault-border (EAST)"; icon_state = "vault-border"; dir = 4},/area)
-"bMU" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "misclab"; name = "Test Chamber Blast Doors"; opacity = 0},/obj/machinery/door/window{dir = 2; name = "Telepad Access"; req_access_txt = "0"},/obj/machinery/door/window{dir = 1; name = "Telepad Access"; req_access_txt = "57"},/turf/simulated/floor/engine,/area/toxins/telesci)
+"bMU" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "misclab"; name = "Test Chamber Blast Doors"; opacity = 0},/obj/machinery/door/airlock/glass_research{name = "Research and Development"; req_access_txt = "7"},/turf/simulated/floor/engine,/area/toxins/telesci)
"bMV" = (/obj/machinery/light_switch{pixel_y = -23},/obj/machinery/power/apc{dir = 8; name = "Toxins Storage APC"; pixel_x = -25},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/storage)
"bMW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor{tag = "icon-warningcorner (WEST)"; icon_state = "warningcorner"; dir = 8},/area/toxins/storage)
"bMX" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 5; icon_state = "whitehall"},/area/medical/research{name = "Research Division"})
@@ -4861,7 +4861,7 @@
"bPy" = (/obj/machinery/hologram/holopad,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/turf/simulated/floor,/area/toxins/telesci)
"bPz" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor,/area/toxins/telesci)
"bPA" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/toxins/telesci)
-"bPB" = (/obj/machinery/door/firedoor/border_only{dir = 4; name = "hazard door east"},/obj/machinery/door/airlock/research{name = "Telescience"; req_access_txt = "47"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor{icon_state = "white"},/area/toxins/telesci)
+"bPB" = (/obj/machinery/door/firedoor/border_only{dir = 4; name = "hazard door east"},/obj/machinery/door/airlock/research{name = "Telescience"; req_access_txt = "7"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor{icon_state = "white"},/area/toxins/telesci)
"bPC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"})
"bPD" = (/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"})
"bPE" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
@@ -4913,7 +4913,7 @@
"bQy" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/telesci)
"bQz" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor,/area/toxins/telesci)
"bQA" = (/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/toxins/telesci)
-"bQB" = (/obj/machinery/door/firedoor/border_only{dir = 4; name = "hazard door east"},/obj/machinery/door/airlock/research{name = "Telescience"; req_access_txt = "47"},/turf/simulated/floor{icon_state = "white"},/area/toxins/telesci)
+"bQB" = (/obj/machinery/door/firedoor/border_only{dir = 4; name = "hazard door east"},/obj/machinery/door/airlock/research{name = "Telescience"; req_access_txt = "7"},/turf/simulated/floor{icon_state = "white"},/area/toxins/telesci)
"bQC" = (/obj/machinery/light,/obj/machinery/door/firedoor/multi_tile{dir = 3},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"})
"bQD" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 8; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"})
"bQE" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"})