cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added some more feedbacks on the blood_DNA stuff

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/infrared.dm
+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)
code/modules/assembly/proximity.dm
+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"])
code/modules/assembly/timer.dm
+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"])