Added some more feedbacks on the blood_DNA stuff

Fixed up some chemistry stuff
Nitrogen now adds atmospheric nitrogen when splashed on the ground.
This commit is contained in:
SkyMarshal
2012-02-14 21:34:52 -07:00
parent 5e332d297d
commit b5c1d99471
8 changed files with 58 additions and 3 deletions
+8
View File
@@ -45,6 +45,13 @@
if(scanning)
src.overlays += text("infrared_old2")
src.small_icon_state_overlays += text("infrared_on")
if(master && istype(master, /obj/item/weapon/chem_grenade))
var/obj/item/weapon/chem_grenade/M = master
M.c_state(1)
else
if(master && istype(master, /obj/item/weapon/chem_grenade))
var/obj/item/weapon/chem_grenade/M = master
M.c_state(0)
if(holder)
holder.update_icon()
return
@@ -129,6 +136,7 @@
if (href_list["state"])
src.scanning = !(src.scanning)
update_icon()
processing_objects.Add(src)
if (href_list["visible"])
src.visible = !(src.visible)
+9
View File
@@ -90,6 +90,13 @@
if(scanning)
overlays += text("prox_scanning")
small_icon_state_overlays += text("prox_scanning")
if(master && istype(master, /obj/item/weapon/chem_grenade))
var/obj/item/weapon/chem_grenade/M = master
M.c_state(1)
else
if(master && istype(master, /obj/item/weapon/chem_grenade))
var/obj/item/weapon/chem_grenade/M = master
M.c_state(0)
if(holder)
holder.update_icon()
@@ -126,10 +133,12 @@
if(href_list["scanning"])
toggle_scan()
processing_objects.Add(src)
if(href_list["time"])
timing = text2num(href_list["time"])
update_icon()
processing_objects.Add(src)
if(href_list["tp"])
var/tp = text2num(href_list["tp"])
+8
View File
@@ -64,6 +64,13 @@
if(timing)
overlays += text("timer_timing")
small_icon_state_overlays += text("timer_timing")
if(master && istype(master, /obj/item/weapon/chem_grenade))
var/obj/item/weapon/chem_grenade/M = master
M.c_state(1)
else
if(master && istype(master, /obj/item/weapon/chem_grenade))
var/obj/item/weapon/chem_grenade/M = master
M.c_state(0)
if(holder)
holder.update_icon()
return
@@ -92,6 +99,7 @@
if(href_list["time"])
timing = text2num(href_list["time"])
processing_objects.Add(src)
update_icon()
if(href_list["tp"])
@@ -540,6 +540,21 @@ datum
description = "A colorless, odorless, tasteless gas."
reagent_state = GAS
color = "#808080" // rgb: 128, 128, 128
reaction_obj(var/obj/O, var/volume)
if((!O) || (!volume)) return 0
src = null
var/turf/the_turf = get_turf(O)
var/datum/gas_mixture/napalm = new
napalm.nitrogen = volume*10
napalm.temperature = T0C
the_turf.assume_air(napalm)
reaction_turf(var/turf/T, var/volume)
src = null
var/datum/gas_mixture/napalm = new
napalm.nitrogen = volume*10
napalm.temperature = T0C
T.assume_air(napalm)
return
hydrogen
name = "Hydrogen"
+11 -1
View File
@@ -209,7 +209,7 @@
attack_self(mob/user as mob)
if(active == 2)
attached_device.attack_self(usr)
attached_device.attack_self(user)
return
user.machine = src
var/dat = {"<B> Grenade properties: </B>
@@ -289,6 +289,13 @@
if(beaker_two)
beaker_two.loc = get_turf(src.loc)
c_state(var/i = 0)
if(i)
icon_state = initial(icon_state) + "_armed"
else
icon_state = initial(icon_state) + "_locked"
return
large
name = "Large Chem Grenade"
desc = "An oversized grenade that affects a larger area."
@@ -305,6 +312,7 @@
New()
..()
attached_device = new /obj/item/device/assembly/timer(src)
var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
@@ -324,6 +332,7 @@
New()
..()
attached_device = new /obj/item/device/assembly/timer(src)
var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
@@ -343,6 +352,7 @@
New()
..()
attached_device = new /obj/item/device/assembly/timer(src)
var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)