Refresh Refresh"
if(spideros)
dat += " | 
Return"
@@ -1209,7 +1209,7 @@ ________________________________________________________________________________
U.client.images += image(tempHud,target,"hudoperative")
if("Death Commando")
U.client.images += image(tempHud,target,"huddeathsquad")
- if("Space Ninja")
+ if("Ninja")
U.client.images += image(tempHud,target,"hudninja")
else//If we don't know what role they have but they have one.
U.client.images += image(tempHud,target,"hudunknown1")
diff --git a/code/game/gamemodes/events/space_ninja.dm b/code/game/gamemodes/events/space_ninja.dm
index 78bd4ccedd5..8a0cff26132 100644
--- a/code/game/gamemodes/events/space_ninja.dm
+++ b/code/game/gamemodes/events/space_ninja.dm
@@ -52,7 +52,7 @@ ________________________________________________________________________________
How to do that:
Make sure your character has a mind.
Change their assigned_role to "MODE", no quotes. Otherwise, the suit won't initialize.
- Change their special_role to "Space Ninja", no quotes. Otherwise, the character will be gibbed.
+ Change their special_role to "Ninja", no quotes. Otherwise, the character will be gibbed.
Spawn ninja gear, put it on, hit initialize. Let the suit do the rest. You are now a space ninja.
I don't recommend messing with suit variables unless you really know what you're doing.
@@ -236,8 +236,8 @@ Malf AIs/silicons aren't added. Monkeys aren't added. Messes with objective comp
if(xeno_queen_list.len&&side=="face")//If there are queen about and the probability is 50.
for(var/mob/living/carbon/alien/humanoid/queen/xeno_queen in xeno_queen_list)
var/datum/objective/assassinate/ninja_objective = new
- //We'll do some manual overrides to properly set it up.
ninja_objective.owner = ninja_mind
+ //We'll do some manual overrides to properly set it up.
ninja_objective.target = xeno_queen.mind
ninja_objective.explanation_text = "Kill \the [xeno_queen]."
ninja_mind.objectives += ninja_objective
@@ -302,6 +302,7 @@ Malf AIs/silicons aren't added. Monkeys aren't added. Messes with objective comp
hostile_targets -= current_mind//Remove them from the list.
if(2)//Steal
var/datum/objective/steal/ninja_objective = new
+ ninja_objective.owner = ninja_mind
var/target_item = pick(ninja_objective.possible_items_special)
ninja_objective.set_target(target_item)
ninja_mind.objectives += ninja_objective
@@ -337,12 +338,14 @@ Malf AIs/silicons aren't added. Monkeys aren't added. Messes with objective comp
hostile_targets -= current_mind//Remove them from the list.
if(5)//Download research
var/datum/objective/download/ninja_objective = new
+ ninja_objective.owner = ninja_mind
ninja_objective.gen_amount_goal()
ninja_mind.objectives += ninja_objective
objective_list -= 5
if(6)//Capture
var/datum/objective/capture/ninja_objective = new
+ ninja_objective.owner = ninja_mind
ninja_objective.gen_amount_goal()
ninja_mind.objectives += ninja_objective
@@ -389,17 +392,17 @@ As such, it's hard-coded for now. No reason for it not to be, really.
*/
/proc/generate_ninja_directive(side)
var/directive = "[side=="face"?"Nanotrasen":"The Syndicate"] is your employer. "//Let them know which side they're on.
- switch(rand(1,13))
+ switch(rand(1,19))
if(1)
- directive += "The Spider Clan must not be linked to this operation. Remain as hidden and covert as possible."
+ directive += "The Spider Clan must not be linked to this operation. Remain hidden and covert when possible."
if(2)
- directive += "[station_name] is financed by an enemy of the Spider Clan. Cause as much structural damage as possible."
+ directive += "[station_name] is financed by an enemy of the Spider Clan. Cause as much structural damage as desired."
if(3)
directive += "A wealthy animal rights activist has made a request we cannot refuse. Prioritize saving animal lives whenever possible."
if(4)
- directive += "The Spider Clan absolutely cannot be linked to this operation. Eliminate all witnesses using most extreme prejudice."
+ directive += "The Spider Clan absolutely cannot be linked to this operation. Eliminate witnesses at your discretion."
if(5)
- directive += "We are currently negotiating with Nanotrasen command. Prioritize saving human lives over ending them."
+ directive += "We are currently negotiating with NanoTrasen Central Command. Prioritize saving human lives over ending them."
if(6)
directive += "We are engaged in a legal dispute over [station_name]. If a laywer is present on board, force their cooperation in the matter."
if(7)
@@ -409,11 +412,24 @@ As such, it's hard-coded for now. No reason for it not to be, really.
if(9)
directive += "A free agent has proposed a lucrative business deal. Implicate Nanotrasen involvement in the operation."
if(10)
- directive += "Our reputation is on the line. Harm as few civilians or innocents as possible."
+ directive += "Our reputation is on the line. Harm as few civilians and innocents as possible."
if(11)
directive += "Our honor is on the line. Utilize only honorable tactics when dealing with opponents."
if(12)
- directive += "We are currently negotiating with a Syndicate leader. Disguise assassinations as suicide or another natural cause."
+ directive += "We are currently negotiating with a Syndicate leader. Disguise assassinations as suicide or other natural causes."
+ if(13)
+ directive += "Some disgruntled NanoTrasen employees have been supportive of our operations. Be wary of any mistreatment by command staff."
+ if(14)
+ var/xenorace = pick("Unathi","Tajaran", "Skrellian")
+ directive += "A group of [xenorace] radicals have been loyal supporters of the Spider Clan. Favor [xenorace] crew whenever possible."
+ if(15)
+ directive += "The Spider Clan has recently been accused of religious insensitivity. Attempt to speak with the Chaplain and prove these accusations false."
+ if(16)
+ directive += "The Spider Clan has been bargaining with a competing prosthetics manufacturer. Try to shine NanoTrasen prosthetics in a bad light."
+ if(17)
+ directive += "The Spider Clan has recently begun recruiting outsiders. Consider suitable candidates and assess their behavior amongst the crew."
+ if(18)
+ directive += "A cyborg liberation group has expressed interest in our serves. Prove the Spider Clan merciful towards law-bound synthetics."
else
directive += "There are no special supplemental instructions at this time."
return directive
@@ -503,10 +519,9 @@ As such, it's hard-coded for now. No reason for it not to be, really.
/mob/living/carbon/human/proc/create_mind_space_ninja()
mind_initialize()
mind.assigned_role = "MODE"
- mind.special_role = "Space Ninja"
+ mind.special_role = "Ninja"
- //Adds them to current traitor list. Which is really the extra antagonist list.
- ticker.mode.traitors |= mind
+ ticker.mode.ninjas |= mind
return 1
/mob/living/carbon/human/proc/equip_space_ninja(safety=0)//Safety in case you need to unequip stuff for existing characters.
@@ -554,7 +569,7 @@ As such, it's hard-coded for now. No reason for it not to be, really.
U:gloves.icon_state = "s-ninjan"
U:gloves.item_state = "s-ninjan"
else
- if(U.mind.special_role!="Space Ninja")
+ if(U.mind.special_role!="Ninja")
U << "\red 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..."
U.gib()
return 0
diff --git a/code/game/gamemodes/ninja/ninja.dm b/code/game/gamemodes/ninja/ninja.dm
index 70029762fc8..5ea8f2c5a05 100644
--- a/code/game/gamemodes/ninja/ninja.dm
+++ b/code/game/gamemodes/ninja/ninja.dm
@@ -1,5 +1,5 @@
/datum/game_mode/var/list/datum/mind/ninjas = list()
-
+// Keep in mind ninja-procs that aren't here will be where the event's defined
/datum/game_mode/ninja
name = "ninja"
config_tag = "ninja"
@@ -15,6 +15,7 @@
world << "The current game mode is Ninja!"
/datum/game_mode/ninja/can_start()
+ world << "CAN START CALLED"
if(!..())
return 0
var/list/datum/mind/possible_ninjas = get_players_for_role(BE_NINJA)
@@ -41,21 +42,25 @@
return 1
/datum/game_mode/ninja/pre_setup()
+ world << "PRE SETUP CALLED"
for(var/datum/mind/ninja in ninjas)
+ ninja.current << browse(null, "window=playersetup")
ninja.current = create_space_ninja(pick(ninjastart.len ? ninjastart : latejoin))
ninja.current.ckey = ninja.key
return 1
/datum/game_mode/ninja/post_setup()
+ world << "POST SETUP CALLED"
for(var/datum/mind/ninja in ninjas)
if(ninja.current && !(istype(ninja.current,/mob/living/carbon/human))) return 0
+ forge_ninja_objectives(ninja)
var/mob/living/carbon/human/N = ninja.current
N.internal = N.s_store
N.internals.icon_state = "internal1"
if(N.wear_suit && istype(N.wear_suit,/obj/item/clothing/suit/space/space_ninja))
var/obj/item/clothing/suit/space/space_ninja/S = N.wear_suit
S:randomize_param()
- S:ninitialize(0, N)
+ S:ninitialize(3, N)
spawn (rand(waittime_l, waittime_h))
send_intercept()
return ..()
@@ -74,4 +79,108 @@
return ..()
else
finished = 1
- return 1
\ No newline at end of file
+ return 1
+
+/datum/game_mode/ninja/proc/forge_ninja_objectives(var/datum/mind/ninja)
+ world << "NINJA OBJECTIVES FORGED"
+ var/objective_list[] = list(1,2,3,4,5)
+ for(var/i=rand(2,4),i>0,i--)
+ switch(pick(objective_list))
+ if(1)//Kill
+ var/datum/objective/assassinate/ninja_objective = new
+ ninja_objective.owner = ninja
+ ninja_objective.target = ninja_objective.find_target()
+ if(ninja_objective.target != "Free Objective")
+ ninja.objectives += ninja_objective
+ else
+ i++
+ objective_list -= 1 // No more than one kill objective
+ if(2)//Steal
+ var/datum/objective/steal/ninja_objective = new
+ ninja_objective.owner = ninja
+ ninja_objective.target = ninja_objective.find_target()
+ ninja.objectives += ninja_objective
+ if(3)//Protect
+ var/datum/objective/protect/ninja_objective = new
+ ninja_objective.owner = ninja
+ ninja_objective.target = ninja_objective.find_target()
+ if(ninja_objective.target != "Free Objective")
+ ninja.objectives += ninja_objective
+ else
+ i++
+ objective_list -= 3
+ if(4)//Download
+ var/datum/objective/download/ninja_objective = new
+ ninja_objective.owner = ninja
+ ninja_objective.gen_amount_goal()
+ ninja.objectives += ninja_objective
+ objective_list -= 4
+ if(5)//Harm
+ var/datum/objective/harm/ninja_objective = new
+ ninja_objective.owner = ninja
+ ninja_objective.target = ninja_objective.find_target()
+ if(ninja_objective.target != "Free Objective")
+ ninja.objectives += ninja_objective
+ else
+ i++
+ objective_list -= 5
+
+ var/datum/objective/survive/ninja_objective = new
+ ninja_objective.owner = ninja
+ ninja.objectives += ninja_objective
+
+ var/directive = generate_ninja_directive("heel")//Only hired by antags, not NT
+ ninja.current << "You are an elite mercenary assassin of the Spider Clan, [ninja.current.real_name]. You have a variety of abilities at your disposal, thanks to your nano-enhanced cyber armor.\nYour current directive is: \red [directive]\n \blue Try your best to adhere to this."
+ ninja.store_memory("Directive: \red [directive]| Ninjas | ||
| [M.real_name][M.client ? "" : " (logged out)"][M.stat == 2 ? " (DEAD)" : ""] | " + dat += "PM | " + dat += "Show Objective |
| Ninja not found! |
| Cultists |