Fixed a few runtimes

Blob mode updated slightly
Wizard smoke from his smoke spell will partly block lasers that go through it.
Going to try and test a diff way for the singularity to "del" items, might cause less lag, it will also eat absorb other singularities.
RD lost tech storage access, see http://nanotrasen.com/phpBB3/viewtopic.php?f=9&t=5991 for details


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2192 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-09-13 07:30:07 +00:00
parent 9b7afeb978
commit 81c68898ae
17 changed files with 595 additions and 88 deletions

View File

@@ -147,6 +147,7 @@
verbs += /client/proc/cmd_debug_del_all
verbs += /client/proc/cmd_debug_tog_aliens
verbs += /client/proc/ticklag
verbs += /client/proc/mapload
verbs += /obj/admins/proc/spawn_atom
verbs += /client/proc/check_words
verbs += /client/proc/drop_bomb
@@ -281,6 +282,7 @@
verbs -= /client/proc/cmd_debug_del_all
verbs -= /client/proc/cmd_debug_tog_aliens
verbs -= /client/proc/ticklag
verbs -= /client/proc/mapload
verbs -= /obj/admins/proc/spawn_atom
verbs -= /client/proc/check_words
verbs -= /client/proc/drop_bomb
@@ -370,6 +372,7 @@
verbs -= /client/proc/restartcontroller
verbs -= /client/proc/play_local_sound
verbs -= /client/proc/enable_mapping_debug
verbs -= /client/proc/toggleprayers
return

View File

@@ -104,6 +104,30 @@
src.Die()
/obj/critter/blob
name = "blob"
desc = "Some blob thing."
icon_state = "blob"
pass_flags = PASSBLOB
health = 20
max_health = 20
aggressive = 1
defensive = 0
wanderer = 1
atkcarbon = 1
atksilicon = 1
firevuln = 2
brutevuln = 0.5
melee_damage_lower = 2
melee_damage_upper = 8
angertext = "charges at"
attacktext = "hits"
Die()
..()
del(src)
/obj/critter/spesscarp
name = "Spess Carp"

View File

@@ -1106,7 +1106,7 @@
overlays += face_standing
// Uniform
if (w_uniform)
if(w_uniform)
if (mutations & FAT && !(w_uniform.flags & ONESIZEFITSALL))
src << "\red You burst out of the [w_uniform.name]!"
var/obj/item/clothing/c = w_uniform
@@ -1117,8 +1117,9 @@
c:loc = loc
c:dropped(src)
c:layer = initial(c:layer)
w_uniform.screen_loc = ui_iclothing
if (istype(w_uniform, /obj/item/clothing/under))
if(w_uniform)//I should really not need these
w_uniform.screen_loc = ui_iclothing
if(istype(w_uniform, /obj/item/clothing/under))
var/t1 = w_uniform.color
if (!t1)
t1 = icon_state

View File

@@ -1,10 +1,9 @@
var/global/list/uneatable = list(
/obj/machinery/singularity,
/turf/space,
/obj/effects,
/obj/overlay,
/obj/decal/cleanable,
/obj/rune,
/obj/rune
)
/obj/machinery/singularity/
@@ -32,7 +31,7 @@ var/global/list/uneatable = list(
event_chance = 15 //Prob for event each tick
target = null //its target. moves towards the target if it has one
last_failed_movement = 0//Will not move in the same dir if it couldnt before, will help with the getting stuck on fields thing
teleport_del = 0
New(loc, var/starting_energy = 50, var/temp = 0)
src.energy = starting_energy
@@ -250,8 +249,21 @@ var/global/list/uneatable = list(
A:gib()
sleep(1)
else if(istype(A,/obj/))
A:ex_act(1.0)
if(A) del(A)
if(istype(A, /obj/machinery/singularity))//Welp now you did it
var/obj/machinery/singularity/S = A
src.energy += S.energy
del(S)
explosion(src.loc,20,25,30,40,1)
return//Quits here, the obj should be gone, hell we might be
if((teleport_del) && (!istype(A, /obj/machinery)))//Going to see if it does not lag less to tele items over to Z 2
var/obj/O = A
O.x = 2
O.y = 2
O.z = 2
else
A:ex_act(1.0)
if(A) del(A)
gain = 2
else if(isturf(A))
var/turf/T = A