mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-24 04:27:35 +01:00
#Added mechs as chargables for ninjas.
#Private lockers can now be sliced open with the ninja sword. #Added a SpiderOS verb to the ninja suit when initialized. It acts as a lite PDA with some unique features. If I had more time, I would revise the existing PDA system to follow the format of SpiderOS which would make the former run a lot faster. #Added an adrenaline boost ability for the ninja suit. It will near instantly remove paralysis/stun/etc but has only three uses. #Added ninja stars ability. Ranged projectiles, the user randomly picks a target from nearby living enemies. Projectile itself is wip. #Maximum charge for the suit is 30000, or 300%. #More names for ninja name gen. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1451 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -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", abs(src.wear_suit:charge/100))
|
||||
stat("Energy Charge", round(src.wear_suit:charge/100))
|
||||
|
||||
/mob/living/carbon/human/bullet_act(flag, A as obj, var/datum/organ/external/def_zone)
|
||||
var/shielded = 0
|
||||
@@ -2793,15 +2793,15 @@ It can still be worn/put on as normal.
|
||||
|
||||
while(parts.len && (brute>0 || burn>0) )
|
||||
var/datum/organ/external/picked = pick(parts)
|
||||
|
||||
|
||||
var/brute_was = picked.brute_dam
|
||||
var/burn_was = picked.burn_dam
|
||||
|
||||
|
||||
picked.heal_damage(brute,burn)
|
||||
|
||||
|
||||
brute -= (brute_was-picked.brute_dam)
|
||||
burn -= (burn_was-picked.burn_dam)
|
||||
|
||||
|
||||
parts -= picked
|
||||
src.updatehealth()
|
||||
src.UpdateDamageIcon()
|
||||
@@ -2812,15 +2812,15 @@ It can still be worn/put on as normal.
|
||||
|
||||
while(parts.len && (brute>0 || burn>0) )
|
||||
var/datum/organ/external/picked = pick(parts)
|
||||
|
||||
|
||||
var/brute_was = picked.brute_dam
|
||||
var/burn_was = picked.burn_dam
|
||||
|
||||
|
||||
picked.take_damage(brute,burn)
|
||||
|
||||
|
||||
brute -= (picked.brute_dam-brute_was)
|
||||
burn -= (picked.burn_dam-burn_was)
|
||||
|
||||
|
||||
parts -= picked
|
||||
src.updatehealth()
|
||||
src.UpdateDamageIcon()
|
||||
|
||||
@@ -603,11 +603,15 @@
|
||||
G.draining = 1
|
||||
if(cell&&cell.charge)
|
||||
var/drain = 0
|
||||
var/maxcapacity = 0
|
||||
var/totaldrain = 0
|
||||
while(cell.charge>0)
|
||||
while(cell.charge>0&&!maxcapacity)
|
||||
drain = rand(100,300)
|
||||
if(cell.charge<drain)
|
||||
drain = cell.charge
|
||||
if(S.charge+drain>S.maxcharge)
|
||||
drain = S.maxcharge-S.charge
|
||||
maxcapacity = 1
|
||||
if (do_after(U,10))
|
||||
spark_system.start()
|
||||
playsound(src.loc, "sparks", 50, 1)
|
||||
|
||||
@@ -73,6 +73,19 @@ mob/new_player
|
||||
src << browse_rsc('pda_scanner.png')
|
||||
src << browse_rsc('pda_signaler.png')
|
||||
src << browse_rsc('pda_status.png')
|
||||
//Loads icons for SpiderOS into client
|
||||
src << browse_rsc('sos_1.png')
|
||||
src << browse_rsc('sos_2.png')
|
||||
src << browse_rsc('sos_3.png')
|
||||
src << browse_rsc('sos_4.png')
|
||||
src << browse_rsc('sos_5.png')
|
||||
src << browse_rsc('sos_6.png')
|
||||
src << browse_rsc('sos_7.png')
|
||||
src << browse_rsc('sos_8.png')
|
||||
src << browse_rsc('sos_9.png')
|
||||
src << browse_rsc('sos_10.png')
|
||||
src << browse_rsc('sos_11.png')
|
||||
src << browse_rsc('sos_12.png')
|
||||
|
||||
//End PDA Resource Initialisation =====================================================>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user