Fixes issue 921.

Addresses part of issue 828.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4697 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-09-16 01:48:57 +00:00
parent 382012f1f0
commit bd12633922
2 changed files with 151 additions and 175 deletions

View File

@@ -1,11 +1,9 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/item/weapon/flamethrower
name = "flamethrower"
desc = "You are a firestarter!"
icon = 'icons/obj/flamethrower.dmi'
icon_state = "flamethrowerbase"
item_state = "flamethrower_0"
desc = "You are a firestarter!"
flags = FPRINT | TABLEPASS| CONDUCT
force = 3.0
throwforce = 10.0
@@ -24,181 +22,160 @@
var/obj/item/weapon/tank/plasma/ptank = null
Del()
if(src.weldtool)
del(src.weldtool)
if(src.igniter)
del(src.igniter)
if(src.ptank)
del(src.ptank)
..()
return
/obj/item/weapon/flamethrower/Del()
if(weldtool)
del(weldtool)
if(igniter)
del(igniter)
if(ptank)
del(ptank)
..()
return
process()
if(!lit)
processing_objects.Remove(src)
return null
var/turf/location = src.loc
if(istype(location, /mob/))
var/mob/M = location
if(M.l_hand == src || M.r_hand == src)
location = M.loc
if(isturf(location)) //start a fire if possible
location.hotspot_expose(700, 2)
return
/obj/item/weapon/flamethrower/process()
if(!lit)
processing_objects.Remove(src)
return null
var/turf/location = loc
if(istype(location, /mob/))
var/mob/M = location
if(M.l_hand == src || M.r_hand == src)
location = M.loc
if(isturf(location)) //start a fire if possible
location.hotspot_expose(700, 2)
return
update_icon()
src.overlays = null
/obj/item/weapon/flamethrower/update_icon()
overlays = null
if(igniter)
overlays += "+igniter[status]"
if(ptank)
overlays += "+ptank"
if(lit)
overlays += "+lit"
item_state = "flamethrower_1"
else
item_state = "flamethrower_0"
return
/obj/item/weapon/flamethrower/attackby(obj/item/W as obj, mob/user as mob)
if(user.stat || user.restrained() || user.lying) return
if(iswrench(W) && !status)//Taking this apart
var/turf/T = get_turf(src)
if(weldtool)
weldtool.loc = T
weldtool = null
if(igniter)
src.overlays += "+igniter[src.status]"
igniter.loc = T
igniter = null
if(ptank)
src.overlays += "+ptank"
if(lit)
src.overlays += "+lit"
item_state = "flamethrower_1"
else
item_state = "flamethrower_0"
ptank.loc = T
ptank = null
new /obj/item/stack/rods(T)
del(src)
return
attackby(obj/item/W as obj, mob/user as mob)
if(user.stat || user.restrained() || user.lying) return
if(iswrench(W) && (!src.status))//Taking this apart
var/turf/T = src.loc
if (ismob(T))
T = T.loc
if(weldtool)
src.weldtool.loc = T
src.weldtool = null
if(igniter)
src.igniter.loc = T
src.igniter = null
if(ptank)
src.ptank.loc = T
src.ptank = null
new/obj/item/stack/rods(T,1)
spawn(0)
del(src)
return
if((isscrewdriver(W))&&(igniter)&&(!lit))
src.status = (!src.status)
if (src.status)
user.show_message("\blue The igniter is now secured!", 1)
else
user.show_message("\blue The igniter is now unsecured!", 1)
update_icon()
return
if(isigniter(W))
var/obj/item/device/assembly/igniter/I = W
if(I.secured) return 0
if(src.igniter) return
user.remove_from_mob(I)
I.loc = src
igniter = I
update_icon()
return
if(istype(W,/obj/item/weapon/tank/plasma))
if(src.ptank)
user << "\red There appears to already be a plasma tank loaded in the flamethrower!"
return
src.ptank = W
W.loc = src
if (user.client)
user.client.screen -= W
user.u_equip(W)
lit = 0
force = 3
damtype = "brute"
update_icon()
return
if((istype(W, /obj/item/device/analyzer)) && (get_dist(user, src) <= 1) && (src.ptank))
var/obj/item/weapon/icon = src
for (var/mob/O in viewers(user, null))
O << "\red [user] has used the analyzer on \icon[icon]"
var/pressure = src.ptank.air_contents.return_pressure()
var/total_moles = src.ptank.air_contents.total_moles()
user << "\blue Results of analysis of \icon[icon]"
if (total_moles>0)
var/o2_concentration = src.ptank.air_contents.oxygen/total_moles
var/n2_concentration = src.ptank.air_contents.nitrogen/total_moles
var/co2_concentration = src.ptank.air_contents.carbon_dioxide/total_moles
var/plasma_concentration = src.ptank.air_contents.toxins/total_moles
var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
user << "\blue Pressure: [round(pressure,0.1)] kPa"
user << "\blue Nitrogen: [round(n2_concentration*100)]%"
user << "\blue Oxygen: [round(o2_concentration*100)]%"
user << "\blue CO2: [round(co2_concentration*100)]%"
user << "\blue Plasma: [round(plasma_concentration*100)]%"
if(unknown_concentration>0.01)
user << "\red Unknown: [round(unknown_concentration*100)]%"
user << "\blue Temperature: [round(src.ptank.air_contents.temperature-T0C)]&deg;C"
else
user << "\blue Tank is empty!"
return
..()
return
attack_self(mob/user as mob)
if(user.stat || user.restrained() || user.lying) return
user.machine = src
if (!src.ptank)
user << "\red Attach a plasma tank first!"
return
var/dat = text("<TT><B>Flamethrower (<A HREF='?src=\ref[src];light=1'>[lit ? "<font color='red'>Lit</font>" : "Unlit"]</a>)</B><BR>\n Tank Pressure: [src.ptank.air_contents.return_pressure()]<BR>\nAmount to throw: <A HREF='?src=\ref[src];amount=-100'>-</A> <A HREF='?src=\ref[src];amount=-10'>-</A> <A HREF='?src=\ref[src];amount=-1'>-</A> [src.throw_amount] <A HREF='?src=\ref[src];amount=1'>+</A> <A HREF='?src=\ref[src];amount=10'>+</A> <A HREF='?src=\ref[src];amount=100'>+</A><BR>\n<A HREF='?src=\ref[src];remove=1'>Remove plasmatank</A> - <A HREF='?src=\ref[src];close=1'>Close</A></TT>")
user << browse(dat, "window=flamethrower;size=600x300")
onclose(user, "flamethrower")
return
Topic(href,href_list[])
if (href_list["close"])
usr.machine = null
usr << browse(null, "window=flamethrower")
return
if(usr.stat || usr.restrained() || usr.lying) return
usr.machine = src
if (href_list["light"])
if(!src.ptank) return
if(src.ptank.air_contents.toxins < 1) return
if(!src.status) return
lit = !(lit)
if(lit)
force = 17
damtype = "fire"
processing_objects.Add(src)
else
force = 3
damtype = "brute"
if (href_list["amount"])
src.throw_amount = src.throw_amount + text2num(href_list["amount"])
src.throw_amount = max(50,min(5000,src.throw_amount))
if (href_list["remove"])
if(!src.ptank) return
var/obj/item/weapon/tank/plasma/A = src.ptank
A.loc = get_turf(src)
A.layer = initial(A.layer)
src.ptank = null
lit = 0
force = 3
damtype = "brute"
usr.machine = null
usr << browse(null, "window=flamethrower")
for(var/mob/M in viewers(1, src.loc))
if ((M.client && M.machine == src))
src.attack_self(M)
if(isscrewdriver(W) && igniter && !lit)
status = !status
user << "<span class='notice'>[igniter] is now [status ? "secured" : "unsecured"]!</span>"
update_icon()
return
if(isigniter(W))
var/obj/item/device/assembly/igniter/I = W
if(I.secured) return
if(igniter) return
user.drop_item()
I.loc = src
igniter = I
update_icon()
return
if(istype(W,/obj/item/weapon/tank/plasma))
if(ptank)
user << "<span class='notice'>There appears to already be a plasma tank loaded in [src]!</span>"
return
user.drop_item()
ptank = W
W.loc = src
update_icon()
return
if(istype(W, /obj/item/device/analyzer) && ptank)
var/obj/item/weapon/icon = src
user.visible_message("<span class='notice'>[user] has used the analyzer on \icon[icon]</span>")
var/pressure = ptank.air_contents.return_pressure()
var/total_moles = ptank.air_contents.total_moles()
user << "\blue Results of analysis of \icon[icon]"
if(total_moles>0)
var/o2_concentration = ptank.air_contents.oxygen/total_moles
var/n2_concentration = ptank.air_contents.nitrogen/total_moles
var/co2_concentration = ptank.air_contents.carbon_dioxide/total_moles
var/plasma_concentration = ptank.air_contents.toxins/total_moles
var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
user << "\blue Pressure: [round(pressure,0.1)] kPa"
user << "\blue Nitrogen: [round(n2_concentration*100)]%"
user << "\blue Oxygen: [round(o2_concentration*100)]%"
user << "\blue CO2: [round(co2_concentration*100)]%"
user << "\blue Plasma: [round(plasma_concentration*100)]%"
if(unknown_concentration>0.01)
user << "\red Unknown: [round(unknown_concentration*100)]%"
user << "\blue Temperature: [round(ptank.air_contents.temperature-T0C)]&deg;C"
else
user << "\blue Tank is empty!"
return
..()
return
/obj/item/weapon/flamethrower/attack_self(mob/user as mob)
if(user.stat || user.restrained() || user.lying) return
user.machine = src
if(!ptank)
user << "<span class='notice'>Attach a plasma tank first!</span>"
return
var/dat = text("<TT><B>Flamethrower (<A HREF='?src=\ref[src];light=1'>[lit ? "<font color='red'>Lit</font>" : "Unlit"]</a>)</B><BR>\n Tank Pressure: [ptank.air_contents.return_pressure()]<BR>\nAmount to throw: <A HREF='?src=\ref[src];amount=-100'>-</A> <A HREF='?src=\ref[src];amount=-10'>-</A> <A HREF='?src=\ref[src];amount=-1'>-</A> [throw_amount] <A HREF='?src=\ref[src];amount=1'>+</A> <A HREF='?src=\ref[src];amount=10'>+</A> <A HREF='?src=\ref[src];amount=100'>+</A><BR>\n<A HREF='?src=\ref[src];remove=1'>Remove plasmatank</A> - <A HREF='?src=\ref[src];close=1'>Close</A></TT>")
user << browse(dat, "window=flamethrower;size=600x300")
onclose(user, "flamethrower")
return
/obj/item/weapon/flamethrower/Topic(href,href_list[])
if(href_list["close"])
usr.machine = null
usr << browse(null, "window=flamethrower")
return
if(usr.stat || usr.restrained() || usr.lying) return
usr.machine = src
if(href_list["light"])
if(!ptank) return
if(ptank.air_contents.toxins < 1) return
if(!status) return
lit = !lit
if(lit)
processing_objects.Add(src)
if(href_list["amount"])
throw_amount = throw_amount + text2num(href_list["amount"])
throw_amount = max(50, min(5000, throw_amount))
if(href_list["remove"])
if(!ptank) return
usr.put_in_hands(ptank)
ptank = null
lit = 0
usr.machine = null
usr << browse(null, "window=flamethrower")
for(var/mob/M in viewers(1, loc))
if((M.client && M.machine == src))
attack_self(M)
update_icon()
return
//Called from turf.dm turf/dblclick
/obj/item/weapon/flamethrower/proc/flame_turf(turflist)
@@ -216,9 +193,9 @@
sleep(1)
previousturf = null
operating = 0
for(var/mob/M in viewers(1, src.loc))
if ((M.client && M.machine == src))
src.attack_self(M)
for(var/mob/M in viewers(1, loc))
if((M.client && M.machine == src))
attack_self(M)
return
@@ -229,7 +206,6 @@
air_transfer.toxins = air_transfer.toxins * 5 // This is me not comprehending the air system. I realize this is retarded and I could probably make it work without fucking it up like this, but there you have it. -- TLE
target.assume_air(air_transfer)
//Burn it based on transfered gas
//target.hotspot_expose(part4.air_contents.temperature*2,300)
target.hotspot_expose((ptank.air_contents.temperature*2) + 380,500) // -- More of my "how do I shot fire?" dickery. -- TLE
//location.hotspot_expose(1000,500,1)
return
@@ -237,10 +213,10 @@
/obj/item/weapon/flamethrower/full/New(var/loc)
..()
weldtool = new/obj/item/weapon/weldingtool(src)
weldtool = new /obj/item/weapon/weldingtool(src)
weldtool.status = 0
igniter = new/obj/item/device/assembly/igniter(src)
igniter = new /obj/item/device/assembly/igniter(src)
igniter.secured = 0
src.status = 1
status = 1
update_icon()
return

View File

@@ -3685,7 +3685,7 @@ datum
on_mob_life(var/mob/living/M as mob)
if (M.bodytemperature < 270)
M.bodytemperature = min(270, M.bodytemperature - (40 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
M.bodytemperature = max(270, M.bodytemperature - (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
if(!data) data = 1
data++
M.make_dizzy(3)