mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-18 18:44:48 +01:00
Fixed PDA messaging.
Fixed PDA flashlight. To clarify, you can still use the PDA when you are stunned/weakened. This was always the case, apparently. You cannot use the PDA when knocked out or dead. You can now stick an ID card into a PDA without clicking 400 times (click on PDA with card in hand). Changed how the ninja suit functions in relation to energy. It will now hold a power cell as APCs/Borgs/etc. Ninjas can now replace their starting power cell (reduced to high capacity/10000) with larger capacities. Drain the cell as normal to do it. On that note, hyper-capacity (30k) cells added to research. Can now drain energy from a recharger. Much like draining from wire. Added cooldown to certain ninja abilities. It is a global cooldown; meaning, most abilities will be unusable until it finishes. Usually a second. Some icon changes for ninjas. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1540 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -158,7 +158,7 @@
|
||||
if (timeleft)
|
||||
stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
|
||||
|
||||
if (src.client.statpanel == "Status")
|
||||
if (client.statpanel == "Status")
|
||||
if (src.internal)
|
||||
if (!src.internal.air_contents)
|
||||
del(src.internal)
|
||||
@@ -170,7 +170,7 @@
|
||||
if (src.mind.special_role == "Changeling")
|
||||
stat("Chemical Storage", src.chem_charges)
|
||||
if (istype(src.wear_suit, /obj/item/clothing/suit/space/space_ninja)&&src.wear_suit:initialize)
|
||||
stat("Energy Charge", round(src.wear_suit:charge/100))
|
||||
stat("Energy Charge", round(wear_suit:cell:charge/100))
|
||||
|
||||
/mob/living/carbon/human/bullet_act(flag, A as obj, var/datum/organ/external/def_zone)
|
||||
var/shielded = 0
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
/mob/proc/Cell()
|
||||
set category = "Admin"
|
||||
set hidden = 1
|
||||
|
||||
@@ -606,9 +606,6 @@
|
||||
/obj/machinery/power/apc/proc/report()
|
||||
return "[area.name] : [equipment]/[lighting]/[environ] ([lastused_equip+lastused_light+lastused_environ]) : [cell? cell.percent() : "N/C"] ([charging])"
|
||||
|
||||
|
||||
|
||||
|
||||
/obj/machinery/power/apc/proc/update()
|
||||
if(operating && !shorted)
|
||||
area.power_light = (lighting > 1)
|
||||
@@ -652,7 +649,6 @@
|
||||
src.updateDialog()
|
||||
// if(APC_WIRE_IDSCAN) nothing happens when you cut this wire, add in something if you want whatever
|
||||
|
||||
|
||||
/obj/machinery/power/apc/proc/mend(var/wireColor)
|
||||
var/wireFlag = APCWireColorToFlag[wireColor]
|
||||
var/wireIndex = APCWireColorToIndex[wireColor] //not used in this function
|
||||
@@ -708,7 +704,6 @@
|
||||
src.aidisabled = 0
|
||||
src.updateDialog()
|
||||
|
||||
|
||||
/obj/machinery/power/apc/Topic(href, href_list)
|
||||
..()
|
||||
if (((in_range(src, usr) && istype(src.loc, /turf))) || ((istype(usr, /mob/living/silicon) && !(src.aidisabled))))
|
||||
@@ -1118,7 +1113,6 @@
|
||||
area.power_change()
|
||||
..()
|
||||
|
||||
|
||||
/obj/machinery/power/apc/proc/shock(mob/user, prb)
|
||||
if(!prob(prb))
|
||||
return 0
|
||||
|
||||
@@ -65,28 +65,8 @@
|
||||
/obj/item/weapon/cell/attack_self(mob/user as mob)
|
||||
src.add_fingerprint(user)
|
||||
if(ishuman(user))
|
||||
var/mob/living/carbon/human/U = user
|
||||
if(istype(U.gloves, /obj/item/clothing/gloves/space_ninja)&&U.gloves:candrain&&!U.gloves:draining)
|
||||
var/obj/item/clothing/suit/space/space_ninja/S = U.wear_suit
|
||||
var/obj/item/clothing/gloves/space_ninja/G = U.gloves
|
||||
if(charge)
|
||||
user << "\blue Now charging battery..."
|
||||
G.draining = 1
|
||||
if (G.candrain&&do_after(user,30))
|
||||
U << "\blue Gained <B>[charge]</B> energy from the cell."
|
||||
if(S.charge+charge>S.maxcharge)
|
||||
S.charge=S.maxcharge
|
||||
else
|
||||
S.charge+=charge
|
||||
charge = 0
|
||||
G.draining = 0
|
||||
corrupt()
|
||||
updateicon()
|
||||
else
|
||||
U << "\red Procedure interrupted. Protocol terminated."
|
||||
return
|
||||
else
|
||||
U << "\red This cell is empty and of no use."
|
||||
if(istype(user:gloves, /obj/item/clothing/gloves/space_ninja)&&user:gloves:candrain&&!user:gloves:draining)
|
||||
call(/obj/item/clothing/gloves/space_ninja/proc/drain)("CELL",src,user:wear_suit,user:gloves)
|
||||
return
|
||||
|
||||
//Just because someone gets you occasionally with stun gloves doesn't mean you can put in code to kill everyone who tries to make some.
|
||||
|
||||
Reference in New Issue
Block a user