Foam nerfs, chem fixes, they're making me commit this quickly proper info incoming in a comment

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3153 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-02-19 01:33:47 +00:00
parent 6c712d4478
commit ccbe00d380
6 changed files with 3986 additions and 234 deletions
+2 -1
View File
@@ -51,7 +51,7 @@
src.get_targets()
src.icon_state = "cleanbot[src.on]"
should_patrol = 0
should_patrol = 1
src.botcard = new /obj/item/weapon/card/id(src)
src.botcard.access = get_access("Janitor")
@@ -313,6 +313,7 @@ text("<A href='?src=\ref[src];operation=oddbutton'>[src.oddbutton ? "Yes" : "No"
target_types += /obj/effect/decal/cleanable/xenoblood/xgibs
target_types += /obj/effect/decal/cleanable/blood/
target_types += /obj/effect/decal/cleanable/blood/gibs/
target_types += /obj/effect/decal/cleanable/dirt
/obj/machinery/bot/cleanbot/proc/clean(var/obj/effect/decal/cleanable/target)
src.anchored = 1
+6 -2
View File
@@ -408,7 +408,11 @@ steam.start() -- spawns the effect
/obj/effect/effect/chem_smoke/Move()
..()
for(var/atom/A in view(1, src))
reagents.reaction(A)
if(reagents.has_reagent("radium")||reagents.has_reagent("uranium")||reagents.has_reagent("carbon")||reagents.has_reagent("thermite"))//Prevents unholy radium spam by reducing the number of 'greenglows' down to something reasonable -Sieve
if(prob(5))
reagents.reaction(A)
else
reagents.reaction(A)
return
@@ -910,7 +914,7 @@ steam.start() -- spawns the effect
set_up(amt=5, loca, var/datum/reagents/carry = null, var/metalfoam = 0)
amount = round(amt/5, 1)
amount = round(sqrt(amt / 3), 1)
if(istype(loca, /turf/))
location = loca
else
+3 -3
View File
@@ -452,7 +452,7 @@ datum
holder.remove_reagent(src.id, 0.1)
return
silicate
/* silicate
name = "Silicate"
id = "silicate"
description = "A compound that can be used to reinforce glass."
@@ -486,7 +486,7 @@ datum
O.icon = I
O:silicateIcon = I
return
return*/
oxygen
name = "Oxygen"
@@ -765,11 +765,11 @@ datum
..()
return
reaction_turf(var/turf/T, var/volume)
src = null
if(!istype(T, /turf/space))
new /obj/effect/decal/cleanable/greenglow(T)
return
ryetalyn
+2 -3
View File
@@ -451,7 +451,6 @@ datum
holder.clear_reagents()
return
metalfoam
name = "Metal Foam"
id = "metalfoam"
@@ -468,7 +467,7 @@ datum
M << "\red The solution spews out a metalic foam!"
var/datum/effect/effect/system/foam_spread/s = new()
s.set_up(created_volume/2, location, holder, 1)
s.set_up(created_volume, location, holder, 1)
s.start()
return
@@ -488,7 +487,7 @@ datum
M << "\red The solution spews out a metalic foam!"
var/datum/effect/effect/system/foam_spread/s = new()
s.set_up(created_volume/2, location, holder, 2)
s.set_up(created_volume, location, holder, 2)
s.start()
return
+3973 -224
View File
File diff suppressed because one or more lines are too long
-1
View File
@@ -163,7 +163,6 @@
#define FILE_DIR "icons/vending_icons"
#define FILE_DIR "interface"
#define FILE_DIR "maps"
#define FILE_DIR "maps/backup"
#define FILE_DIR "sound"
#define FILE_DIR "sound/ambience"
#define FILE_DIR "sound/announcer"