a couple more fixes

This commit is contained in:
zerothebigboy
2021-02-10 20:00:04 -05:00
parent 00d7b0c9c9
commit ec8029b0cc
6 changed files with 47 additions and 4 deletions
@@ -769,6 +769,15 @@
<i>Help the operatives secure the disk at all costs!</i></b>"
set_module = /obj/item/robot_module/saboteur
/mob/living/silicon/robot/modules/syndicate/spider// used for space ninja and their cyborg hacking special objective
set_module = /obj/item/robot_module/syndicate/spider
/mob/living/silicon/robot/modules/syndicate_medica/spider// ditto
set_module = /obj/item/robot_module/syndicate_medical/spider
/mob/living/silicon/robot/modules/saboteur/spider// ditto
set_module = /obj/item/robot_module/saboteur/spider
/mob/living/silicon/robot/proc/notify_ai(notifytype, oldname, newname)
if(!connected_ai)
return
+7 -2
View File
@@ -17,7 +17,7 @@
/obj/item/grenade/plastic/c4/ninja/afterattack(atom/movable/AM, mob/user, flag)
var/datum/antagonist/ninja/ninja_antag = user.mind.has_antag_datum(/datum/antagonist/ninja)
if(!ninja_antag)
to_chat(user, "<span class='notice'>While it appears normal, you can't seem to detonate the charge.</span>")
to_chat(user, "<span class='notice'>You fiddle with the charge, but nothing happens.</span>")
return
var/datum/objective/plant_explosive/objective = locate() in ninja_antag.objectives
if(!objective)
@@ -37,4 +37,9 @@
return
var/datum/antagonist/ninja/ninja_antag = detonator.mind.has_antag_datum(/datum/antagonist/ninja)
var/datum/objective/plant_explosive/objective = locate() in ninja_antag.objectives
objective.completed = TRUE
objective.completed = TRUE
/obj/item/grenade/plastic/c4/ninja/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/screwdriver))
to_chat(user, "<span class='notice'>The wire panel is locked in place, clearly you aren't supposed to be opening it!</span>")
return
@@ -18,4 +18,4 @@
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 commented out until someone figures out why the fuck cooldowns don't work after porting from tg
s_coold = 4
@@ -45,3 +45,4 @@
else //Else just TP it to us.
energyKatana.returnToOwner(ninja, 1)
s_coold = 4
+29 -1
View File
@@ -81,6 +81,34 @@
cell.name = "black power cell"
cell.icon_state = "bscell"
/obj/item/clothing/suit/space/space_ninja/Initialize(mapload)
START_PROCESSING(SSobj, src)
return ..()
/obj/item/clothing/suit/space/space_ninja/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
// 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()
/obj/item/clothing/suit/space/space_ninja/ui_action_click(mob/user, action)
if(IS_NINJA_SUIT_INITIALIZATION(action))
toggle_on_off()
@@ -118,7 +146,7 @@
. = ..()
if(stealth)
cancel_stealth()
//s_coold = 5 commented out until someone figures out why the fuck cooldowns don't work after porting from tg
s_coold = 5
/**
* Proc called to lock the important gear pieces onto space ninja's body.