mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 03:25:49 +01:00
#Huge code overhaul and cleanup for ninjas. Basically, the suit is about as modular now as I probably care to make it. Admins, read the commented text under Admin Notes, in space_ninja.dm. Tell your friends.
#Ninja suit now supports pAIs. Further functionality will probably come from their development. #Ninja suit can now replenish chemicals from beakers. Simply use a beaker on the suit and it will do the rest, if the beaker contains the right combination of chemicals. #Draining from a wire is now done through clicking instead of a verb. There is no more delay to it. #Ninja stars cost a bit more energy than before. #Ninja suit will start initializing automatically (and quickly) when ninja spawned. #Minor sprite fix for female ninja suit. #Note: AI-related verbs for the ninja suit will be bugged until BYOND 484 comes out. Not a huge deal but worth noting. #The has_reagent() proc will now return the reagent being checked for, instead of 1. Will return 0 if reagent is not found (or the amount does not match). Removed a duplicate arithrazine entry. #AIs should now properly camera_cancel() when carded/physically transfered. #Fixed a small menu display bug for AI cards. AI cards should now properly auto close their window when appropriate. #AI holograms should now project above everything. #Mal AIs can now choose to display an alternative (and awesome) sprite. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1655 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -101,7 +101,7 @@ datum
|
||||
src.update_total()
|
||||
R.update_total()
|
||||
R.handle_reactions()
|
||||
//src.handle_reactions() Don't need to handle reactions on the source since you're (presumably isolating) and transferring a specific reagent.
|
||||
//src.handle_reactions() Don't need to handle reactions on the source since you're (presumably isolating and) transferring a specific reagent.
|
||||
return amount
|
||||
|
||||
/*
|
||||
@@ -315,9 +315,9 @@ datum
|
||||
for(var/A in reagent_list)
|
||||
var/datum/reagent/R = A
|
||||
if (R.id == reagent)
|
||||
if(!amount) return 1
|
||||
if(!amount) return R
|
||||
else
|
||||
if(R.volume >= amount) return 1
|
||||
if(R.volume >= amount) return R
|
||||
else return 0
|
||||
|
||||
return 0
|
||||
|
||||
@@ -701,19 +701,19 @@ datum
|
||||
*/
|
||||
|
||||
gold
|
||||
name = "gold"
|
||||
name = "Gold"
|
||||
id = "gold"
|
||||
description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known."
|
||||
reagent_state = SOLID
|
||||
|
||||
silver
|
||||
name = "silver"
|
||||
name = "Silver"
|
||||
id = "silver"
|
||||
description = "A soft, white, lustrous transition metal, it has the highest electrical conductivity of any element and the highest thermal conductivity of any metal."
|
||||
reagent_state = SOLID
|
||||
|
||||
uranium
|
||||
name ="uranium"
|
||||
name ="Uranium"
|
||||
id = "uranium"
|
||||
description = "A silvery-white metallic chemical element in the actinide series, weakly radioactive."
|
||||
reagent_state = SOLID
|
||||
@@ -730,7 +730,7 @@ datum
|
||||
new /obj/decal/cleanable/greenglow(T)
|
||||
|
||||
aluminum
|
||||
name = "aluminum"
|
||||
name = "Aluminum"
|
||||
id = "aluminum"
|
||||
description = "A silvery white and ductile member of the boron group of chemical elements."
|
||||
reagent_state = SOLID
|
||||
@@ -1065,9 +1065,9 @@ datum
|
||||
id = "arithrazine"
|
||||
description = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
|
||||
reagent_state = LIQUID
|
||||
on_mob_life(var/mob/living/M)
|
||||
on_mob_life(var/mob/living/M as mob)
|
||||
if(!M) M = holder.my_atom
|
||||
M:radiation = 0
|
||||
M:radiation = max(M:radiation-7,0)
|
||||
if(M:toxloss) M:toxloss--
|
||||
if(prob(15))
|
||||
M.take_organ_damage(1, 0)
|
||||
@@ -1099,20 +1099,6 @@ datum
|
||||
..()
|
||||
return
|
||||
|
||||
arithrazine
|
||||
name = "Arithrazine"
|
||||
id = "arithrazine"
|
||||
description = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
|
||||
reagent_state = LIQUID
|
||||
on_mob_life(var/mob/living/M as mob)
|
||||
if(!M) M = holder.my_atom
|
||||
M:radiation = max(M:radiation-3,0)
|
||||
if(M:toxloss) M:toxloss--
|
||||
if(prob(15))
|
||||
M.take_organ_damage(1, 0)
|
||||
..()
|
||||
return
|
||||
|
||||
bicaridine
|
||||
name = "Bicaridine"
|
||||
id = "bicaridine"
|
||||
|
||||
@@ -584,6 +584,10 @@
|
||||
var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
|
||||
user << "\blue You transfer [trans] units of the solution to [target]."
|
||||
|
||||
//Safety for dumping stuff into a ninja suit. It handles everything through attackby() and this is unnecessary.
|
||||
else if(istype(target, /obj/item/clothing/suit/space/space_ninja))
|
||||
return
|
||||
|
||||
else if(reagents.total_volume)
|
||||
user << "\blue You splash the solution onto [target]."
|
||||
src.reagents.reaction(target, TOUCH)
|
||||
|
||||
Reference in New Issue
Block a user