From eee2057453d0a0343677262636e3a51a414fda8d Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Mon, 9 Apr 2012 12:44:56 +0100 Subject: [PATCH] TG: Shades now properly ghost people when they die. Changed a nuke feedback back to what it was. SMES code slightly cleaned up. Removed a few of the HIGH VOLTAGE signs that were on grilles. Added a san check to hydro to remove a runtime. r2910 --- code/game/machinery/hydroponics.dm | 20 +- code/modules/mob/simple_animal/shade.dm | 45 +- code/modules/power/smes.dm | 543 ++++++++++++------------ 3 files changed, 307 insertions(+), 301 deletions(-) diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index 199fed0b860..06a74aec0c6 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -746,16 +746,16 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) while ( t_amount < (yield * parent.yieldmod )) var/obj/item/weapon/reagent_containers/food/snacks/grown/t_prod = new produce(user.loc, potency) // User gets a consumable - if ( !isnull(t_prod) ) // Needed for /obj/item/weapon/reagent_containers/food/snacks/grown/grass/New(), which deletes itself after it spawns a tile/grass - t_prod.seed = mypath - t_prod.species = species - t_prod.lifespan = lifespan - t_prod.endurance = endurance - t_prod.maturation = maturation - t_prod.production = production - t_prod.yield = yield - t_prod.potency = potency - t_prod.plant_type = plant_type + if(!t_prod) return + t_prod.seed = mypath + t_prod.species = species + t_prod.lifespan = lifespan + t_prod.endurance = endurance + t_prod.maturation = maturation + t_prod.production = production + t_prod.yield = yield + t_prod.potency = potency + t_prod.plant_type = plant_type t_amount++ parent.update_tray() diff --git a/code/modules/mob/simple_animal/shade.dm b/code/modules/mob/simple_animal/shade.dm index 8854227fb0e..50d542d5077 100644 --- a/code/modules/mob/simple_animal/shade.dm +++ b/code/modules/mob/simple_animal/shade.dm @@ -21,26 +21,31 @@ max_co2 = 0 max_tox = 0 -/mob/living/simple_animal/shade/Life() - ..() - if (stat == 2) - new /obj/item/weapon/ectoplasm (src.loc) - for(var/mob/M in viewers(src, null)) - if ((M.client && !( M.blinded ))) - M.show_message("\red [src] lets out a contented sigh as their form unwinds. ") - del src -/mob/living/simple_animal/shade/attackby(var/obj/item/O as obj, var/mob/user as mob) //Marker -Agouri - if(istype(O, /obj/item/device/soulstone)) - O.transfer_soul("SHADE", src, user) - else - if(O.force) - health -= O.force + Life() + ..() + if(stat == 2) + new /obj/item/weapon/ectoplasm (src.loc) for(var/mob/M in viewers(src, null)) - if ((M.client && !( M.blinded ))) - M.show_message("\red \b [src] has been attacked with the [O] by [user]. ") + if((M.client && !( M.blinded ))) + M.show_message("\red [src] lets out a contented sigh as their form unwinds. ") + ghostize(0) + del src + return + + + attackby(var/obj/item/O as obj, var/mob/user as mob) //Marker -Agouri + if(istype(O, /obj/item/device/soulstone)) + O.transfer_soul("SHADE", src, user) else - usr << "\red This weapon is ineffective, it does no damage." - for(var/mob/M in viewers(src, null)) - if ((M.client && !( M.blinded ))) - M.show_message("\red [user] gently taps [src] with the [O]. ") \ No newline at end of file + if(O.force) + health -= O.force + for(var/mob/M in viewers(src, null)) + if ((M.client && !( M.blinded ))) + M.show_message("\red \b [src] has been attacked with the [O] by [user]. ") + else + usr << "\red This weapon is ineffective, it does no damage." + for(var/mob/M in viewers(src, null)) + if ((M.client && !( M.blinded ))) + M.show_message("\red [user] gently taps [src] with the [O]. ") + return \ No newline at end of file diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index a23a692424d..fa4b1988f3c 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -4,14 +4,6 @@ #define SMESMAXCHARGELEVEL 200000 #define SMESMAXOUTPUT 200000 -/obj/machinery/power/smes/magical - name = "magical power storage unit" - desc = "A high-capacity superconducting magnetic energy storage (SMES) unit. Magically produces power." - process() - capacity = INFINITY - charge = INFINITY - ..() - /obj/machinery/power/smes name = "power storage unit" desc = "A high-capacity superconducting magnetic energy storage (SMES) unit." @@ -32,336 +24,345 @@ var/obj/machinery/power/terminal/terminal = null -/obj/machinery/power/smes/New() - ..() - - spawn(5) - dir_loop: - for(var/d in cardinal) - var/turf/T = get_step(src, d) - for(var/obj/machinery/power/terminal/term in T) - if(term && term.dir == turn(d, 180)) - terminal = term - break dir_loop - - if(!terminal) - stat |= BROKEN - return - - terminal.master = src - - updateicon() - - -/obj/machinery/power/smes/proc/updateicon() - - overlays = null - if(stat & BROKEN) + New() + ..() + spawn(5) + dir_loop: + for(var/d in cardinal) + var/turf/T = get_step(src, d) + for(var/obj/machinery/power/terminal/term in T) + if(term && term.dir == turn(d, 180)) + terminal = term + break dir_loop + if(!terminal) + stat |= BROKEN + return + terminal.master = src + updateicon() return - overlays += image('power.dmi', "smes-op[online]") + proc/updateicon() + overlays = null + if(stat & BROKEN) return - if(charging) - overlays += image('power.dmi', "smes-oc1") - else - if(chargemode) - overlays += image('power.dmi', "smes-oc0") + overlays += image('power.dmi', "smes-op[online]") - var/clevel = chargedisplay() - if(clevel>0) - overlays += image('power.dmi', "smes-og[clevel]") + if(charging) + overlays += image('power.dmi', "smes-oc1") + else + if(chargemode) + overlays += image('power.dmi', "smes-oc0") -/obj/machinery/power/smes/proc/chargedisplay() - return round(5.5*charge/capacity) + var/clevel = chargedisplay() + if(clevel>0) + overlays += image('power.dmi', "smes-og[clevel]") + return + + + proc/chargedisplay() + return round(5.5*charge/capacity) #define SMESRATE 0.05 // rate of internal charge to external power -/obj/machinery/power/smes/process() + process() - if(stat & BROKEN) - return + if(stat & BROKEN) return + //store machine state to see if we need to update the icon overlays + var/last_disp = chargedisplay() + var/last_chrg = charging + var/last_onln = online - //store machine state to see if we need to update the icon overlays - var/last_disp = chargedisplay() - var/last_chrg = charging - var/last_onln = online + if(terminal) + var/excess = terminal.surplus() - if(terminal) - var/excess = terminal.surplus() + if(charging) + if(excess >= 0) // if there's power available, try to charge - if(charging) - if(excess >= 0) // if there's power available, try to charge + var/load = min((capacity-charge)/SMESRATE, chargelevel) // charge at set rate, limited to spare capacity - var/load = min((capacity-charge)/SMESRATE, chargelevel) // charge at set rate, limited to spare capacity + charge += load * SMESRATE // increase the charge - charge += load * SMESRATE // increase the charge + add_load(load) // add the load to the terminal side network - add_load(load) // add the load to the terminal side network + else // if not enough capcity + charging = 0 // stop charging + chargecount = 0 - else // if not enough capcity - charging = 0 // stop charging - chargecount = 0 + else + if(chargemode) + if(chargecount > rand(3,6)) + charging = 1 + chargecount = 0 - else - if(chargemode) - if(chargecount > rand(3,6)) - charging = 1 - chargecount = 0 - - if(excess > chargelevel) - chargecount++ + if(excess > chargelevel) + chargecount++ + else + chargecount = 0 else chargecount = 0 - else - chargecount = 0 - if(online) // if outputting - lastout = min( charge/SMESRATE, output) //limit output to that stored + if(online) // if outputting + lastout = min( charge/SMESRATE, output) //limit output to that stored - charge -= lastout*SMESRATE // reduce the storage (may be recovered in /restore() if excessive) + charge -= lastout*SMESRATE // reduce the storage (may be recovered in /restore() if excessive) - add_avail(lastout) // add output to powernet (smes side) + add_avail(lastout) // add output to powernet (smes side) - if(charge < 0.0001) - online = 0 // stop output if charge falls to zero + if(charge < 0.0001) + online = 0 // stop output if charge falls to zero - // only update icon if state changed - if(last_disp != chargedisplay() || last_chrg != charging || last_onln != online) - updateicon() + // only update icon if state changed + if(last_disp != chargedisplay() || last_chrg != charging || last_onln != online) + updateicon() - for(var/mob/M in viewers(1, src)) - if ((M.client && M.machine == src)) - src.interact(M) - AutoUpdateAI(src) + for(var/mob/M in viewers(1, src)) + if ((M.client && M.machine == src)) + src.interact(M) + AutoUpdateAI(src) + return // called after all power processes are finished // restores charge level to smes if there was excess this ptick -/obj/machinery/power/smes/proc/restore() - if(stat & BROKEN) - return - if(!online) - loaddemand = 0 - return - - var/excess = powernet.netexcess // this was how much wasn't used on the network last ptick, minus any removed by other SMESes - - excess = min(lastout, excess) // clamp it to how much was actually output by this SMES last ptick - - excess = min((capacity-charge)/SMESRATE, excess) // for safety, also limit recharge by space capacity of SMES (shouldn't happen) - - // now recharge this amount - - var/clev = chargedisplay() - - charge += excess * SMESRATE - powernet.netexcess -= excess // remove the excess from the powernet, so later SMESes don't try to use it - - loaddemand = lastout-excess - - if(clev != chargedisplay() ) - updateicon() - - -/obj/machinery/power/smes/add_load(var/amount) - if(terminal && terminal.powernet) - terminal.powernet.newload += amount - -/obj/machinery/power/smes/attack_ai(mob/user) - - add_fingerprint(user) - - if(stat & BROKEN) return - - interact(user) - -/obj/machinery/power/smes/attack_hand(mob/user) - add_fingerprint(user) - if(stat & BROKEN) return - - if(ishuman(user)) - 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)("SMES",src,user:wear_suit) + proc/restore() + if(stat & BROKEN) return - interact(user) + if(!online) + loaddemand = 0 + return -/obj/machinery/power/smes/proc/interact(mob/user) + var/excess = powernet.netexcess // this was how much wasn't used on the network last ptick, minus any removed by other SMESes - if ( (get_dist(src, user) > 1 )) - if (!istype(user, /mob/living/silicon/ai)) + excess = min(lastout, excess) // clamp it to how much was actually output by this SMES last ptick + + excess = min((capacity-charge)/SMESRATE, excess) // for safety, also limit recharge by space capacity of SMES (shouldn't happen) + + // now recharge this amount + + var/clev = chargedisplay() + + charge += excess * SMESRATE + powernet.netexcess -= excess // remove the excess from the powernet, so later SMESes don't try to use it + + loaddemand = lastout-excess + + if(clev != chargedisplay() ) + updateicon() + return + + + add_load(var/amount) + if(terminal && terminal.powernet) + terminal.powernet.newload += amount + + + attack_ai(mob/user) + add_fingerprint(user) + if(stat & BROKEN) return + interact(user) + + + attack_hand(mob/user) + add_fingerprint(user) + if(stat & BROKEN) return + + if(ishuman(user)) + 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)("SMES",src,user:wear_suit) + return + interact(user) + + + proc/interact(mob/user) + if(get_dist(src, user) > 1 && !istype(user, /mob/living/silicon/ai)) user.machine = null user << browse(null, "window=smes") return - user.machine = src + user.machine = src + + var/t = "SMES Power Storage Unit [n_tag? "([n_tag])" : null]
"
+
+		t += "Stored capacity : [round(100.0*charge/capacity, 0.1)]%

"
+
+		t += "Input: [charging ? "Charging" : "Not Charging"]    [chargemode ? "Auto Off" : "Auto Off "]
"
 
 
-	var/t = "SMES Power Storage Unit [n_tag? "([n_tag])" : null]
"
+		t += "Input level:  M - - - [add_lspace(chargelevel,5)] + + + M
"
 
-	t += "Stored capacity : [round(100.0*charge/capacity, 0.1)]%

"
+		t += "

"
 
-	t += "Input: [charging ? "Charging" : "Not Charging"]    [chargemode ? "Auto Off" : "Auto Off "]
"
+		t += "Output: [online ? "Online Offline" : "Online Offline "]
"
 
+		t += "Output level: M - - - [add_lspace(output,5)] + + + M
"
 
-	t += "Input level:  M - - - [add_lspace(chargelevel,5)] + + + M
"
+		t += "Output load: [round(loaddemand)] W
"
 
-	t += "

"
+		t += "
Close"
 
-	t += "Output: [online ? "Online Offline" : "Online Offline "]
"
-
-	t += "Output level: M - - - [add_lspace(output,5)] + + + M
"
-
-	t += "Output load: [round(loaddemand)] W
"
-
-	t += "
Close" - - t += "" - user << browse(t, "window=smes;size=460x300") - onclose(user, "smes") - return - -/obj/machinery/power/smes/Topic(href, href_list) - ..() - - if (usr.stat || usr.restrained() ) + t += "" + user << browse(t, "window=smes;size=460x300") + onclose(user, "smes") return - if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") - if(!istype(usr, /mob/living/silicon/ai)) - usr << "\red You don't have the dexterity to do this!" + + + Topic(href, href_list) + ..() + + if (usr.stat || usr.restrained() ) return + if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") + if(!istype(usr, /mob/living/silicon/ai)) + usr << "\red You don't have the dexterity to do this!" + return //world << "[href] ; [href_list[href]]" - if (( usr.machine==src && ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon/ai))) + if (( usr.machine==src && ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon/ai))) - if( href_list["close"] ) + if( href_list["close"] ) + usr << browse(null, "window=smes") + usr.machine = null + return + + else if( href_list["cmode"] ) + chargemode = !chargemode + if(!chargemode) + charging = 0 + updateicon() + + else if( href_list["online"] ) + online = !online + updateicon() + else if( href_list["input"] ) + + var/i = text2num(href_list["input"]) + + var/d = 0 + switch(i) + if(-4) + chargelevel = 0 + if(4) + chargelevel = SMESMAXCHARGELEVEL //30000 + + if(1) + d = 100 + if(-1) + d = -100 + if(2) + d = 1000 + if(-2) + d = -1000 + if(3) + d = 10000 + if(-3) + d = -10000 + + chargelevel += d + chargelevel = max(0, min(SMESMAXCHARGELEVEL, chargelevel)) // clamp to range + + else if( href_list["output"] ) + + var/i = text2num(href_list["output"]) + + var/d = 0 + switch(i) + if(-4) + output = 0 + if(4) + output = SMESMAXOUTPUT //30000 + + if(1) + d = 100 + if(-1) + d = -100 + if(2) + d = 1000 + if(-2) + d = -1000 + if(3) + d = 10000 + if(-3) + d = -10000 + + output += d + output = max(0, min(SMESMAXOUTPUT, output)) // clamp to range + + + src.updateUsrDialog() + + else usr << browse(null, "window=smes") usr.machine = null - return - - else if( href_list["cmode"] ) - chargemode = !chargemode - if(!chargemode) - charging = 0 - updateicon() - - else if( href_list["online"] ) - online = !online - updateicon() - else if( href_list["input"] ) - - var/i = text2num(href_list["input"]) - - var/d = 0 - switch(i) - if(-4) - chargelevel = 0 - if(4) - chargelevel = SMESMAXCHARGELEVEL //30000 - - if(1) - d = 100 - if(-1) - d = -100 - if(2) - d = 1000 - if(-2) - d = -1000 - if(3) - d = 10000 - if(-3) - d = -10000 - - chargelevel += d - chargelevel = max(0, min(SMESMAXCHARGELEVEL, chargelevel)) // clamp to range - - else if( href_list["output"] ) - - var/i = text2num(href_list["output"]) - - var/d = 0 - switch(i) - if(-4) - output = 0 - if(4) - output = SMESMAXOUTPUT //30000 - - if(1) - d = 100 - if(-1) - d = -100 - if(2) - d = 1000 - if(-2) - d = -1000 - if(3) - d = 10000 - if(-3) - d = -10000 - - output += d - output = max(0, min(SMESMAXOUTPUT, output)) // clamp to range + return - src.updateUsrDialog() + proc/ion_act() + if(src.z == 1) + if(prob(1)) //explosion + world << "\red SMES explosion in [src.loc.loc]" + for(var/mob/M in viewers(src)) + M.show_message("\red The [src.name] is making strange noises!", 3, "\red You hear sizzling electronics.", 2) + sleep(10*pick(4,5,6,7,10,14)) + var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread() + smoke.set_up(3, 0, src.loc) + smoke.attach(src) + smoke.start() + explosion(src.loc, -1, 0, 1, 3, 0) + del(src) + return + if(prob(15)) //Power drain + world << "\red SMES power drain in [src.loc.loc]" + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(3, 1, src) + s.start() + if(prob(50)) + emp_act(1) + else + emp_act(2) + if(prob(5)) //smoke only + world << "\red SMES smoke in [src.loc.loc]" + var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread() + smoke.set_up(3, 0, src.loc) + smoke.attach(src) + smoke.start() - else - usr << browse(null, "window=smes") - usr.machine = null - return + emp_act(severity) + online = 0 + charging = 0 + output = 0 + charge -= 1e6/severity + if (charge < 0) + charge = 0 + spawn(100) + output = initial(output) + charging = initial(charging) + online = initial(online) + ..() + + + +/obj/machinery/power/smes/magical + name = "magical power storage unit" + desc = "A high-capacity superconducting magnetic energy storage (SMES) unit. Magically produces power." + process() + capacity = INFINITY + charge = INFINITY + ..() -/obj/machinery/power/smes/proc/ion_act() - if(src.z == 1) - if(prob(1)) //explosion - world << "\red SMES explosion in [src.loc.loc]" - for(var/mob/M in viewers(src)) - M.show_message("\red The [src.name] is making strange noises!", 3, "\red You hear sizzling electronics.", 2) - sleep(10*pick(4,5,6,7,10,14)) - var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread() - smoke.set_up(3, 0, src.loc) - smoke.attach(src) - smoke.start() - explosion(src.loc, -1, 0, 1, 3, 0) - del(src) - return - if(prob(15)) //Power drain - world << "\red SMES power drain in [src.loc.loc]" - var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread - s.set_up(3, 1, src) - s.start() - if(prob(50)) - emp_act(1) - else - emp_act(2) - if(prob(5)) //smoke only - world << "\red SMES smoke in [src.loc.loc]" - var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread() - smoke.set_up(3, 0, src.loc) - smoke.attach(src) - smoke.start() -/obj/machinery/power/smes/emp_act(severity) - online = 0 - charging = 0 - output = 0 - charge -= 1e6/severity - if (charge < 0) - charge = 0 - spawn(100) - output = initial(output) - charging = initial(charging) - online = initial(online) - ..() /proc/rate_control(var/S, var/V, var/C, var/Min=1, var/Max=5, var/Limit=null) var/href = "-[href]=-[Min]'>- [(C?C : 0)] [href]=[Min]'>+[href]=[Max]'>+" if(Limit) return "[href]=-[Limit]'>-"+rate+"[href]=[Limit]'>+" return rate + +