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
+6 -3
View File
@@ -102,11 +102,13 @@
if(!emp)
if (!clown_check(user)) return
if(broken)
user.show_message("\red The [src.name] is broken", 2)
if(user)
user.show_message("\red The [src.name] is broken", 2)
return
if(shots_left <= 0)
user.show_message("\red *click* *click*", 2)
if(user)
user.show_message("\red *click* *click*", 2)
return
playsound(src.loc, 'flash.ogg', 100, 1)
@@ -136,7 +138,8 @@
if (prob(2))
broken = 1
user << "\red The bulb has burnt out!"
if(user)
user << "\red The bulb has burnt out!"
return
spawn(60)
+10
View File
@@ -326,6 +326,16 @@ steam.start() -- spawns the effect
M.coughedtime = 0
return
/obj/effects/bad_smoke/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(air_group || (height==0)) return 1
if(istype(mover, /obj/item/projectile/beam))
var/obj/item/projectile/beam/B = mover
B.damage = 10//testing, will just hardcode for now
B.mobdamage = new/list(BRUTE = 0 , BURN = 10, TOX = 0, OXY = 0, CLONE = 0)
return 1
/obj/effects/bad_smoke/HasEntered(mob/living/carbon/M as mob )
..()
if(istype(M, /mob/living/carbon))
@@ -187,9 +187,9 @@ the implant may become unstable and either pre-maturely inject the subject or si
implanted(M as mob)
if(!istype(M, /mob/living/carbon/human)) return
var/mob/living/carbon/human/H = M
if(H.mind in ticker.mode:head_revolutionaries)
for (var/mob/O in viewers(H, null))
O.show_message("\red [H] seems to resist the implant.", 1)
if(H.mind in ticker.mode.head_revolutionaries)
for(var/mob/O in viewers(H, null))
O.show_message(text("\red [] seems to resist the implant.", H), 1)
return
else if(H.mind in ticker.mode:revolutionaries)
ticker.mode:remove_revolutionary(H.mind)
+11 -8
View File
@@ -6,15 +6,12 @@ TABLE AND RACK OBJECT INTERATIONS
//TABLE
/obj/table/ex_act(severity)
switch(severity)
if(1.0)
//SN src = null
del(src)
return
if(2.0)
if (prob(50))
//SN src = null
del(src)
return
if(3.0)
@@ -23,21 +20,23 @@ TABLE AND RACK OBJECT INTERATIONS
else
return
/obj/table/blob_act()
/obj/table/blob_act()
if(prob(75))
if(istype(src, /obj/table/woodentable))
new /obj/item/weapon/table_parts/wood( src.loc )
del(src)
return
new /obj/item/weapon/table_parts( src.loc )
del(src)
return
/obj/table/hand_p(mob/user as mob)
return src.attack_paw(user)
return
/obj/table/attack_paw(mob/user as mob)
if ((usr.mutations & HULK))
usr << text("\blue You destroy the table.")
@@ -62,6 +61,7 @@ TABLE AND RACK OBJECT INTERATIONS
//Foreach goto(69)
return
/obj/table/attack_alien(mob/user as mob) //Removed code for larva since it doesn't work. Previous code is now a larva ability. /N
usr << text("\green You destroy the table.")
for(var/mob/O in oviewers())
@@ -77,6 +77,7 @@ TABLE AND RACK OBJECT INTERATIONS
del(src)
return
/obj/table/attack_hand(mob/user as mob)
if ((usr.mutations & HULK))
usr << text("\blue You destroy the table.")
@@ -94,7 +95,6 @@ TABLE AND RACK OBJECT INTERATIONS
return
/obj/table/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(air_group || (height==0)) return 1
@@ -103,6 +103,7 @@ TABLE AND RACK OBJECT INTERATIONS
else
return 0
/obj/table/MouseDrop_T(obj/O as obj, mob/user as mob)
if ((!( istype(O, /obj/item/weapon) ) || user.equipped() != O))
@@ -114,8 +115,8 @@ TABLE AND RACK OBJECT INTERATIONS
step(O, get_dir(O, src))
return
/obj/table/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/table/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)
var/obj/item/weapon/grab/G = W
if(G.state<2)
@@ -158,6 +159,7 @@ TABLE AND RACK OBJECT INTERATIONS
if(W && W.loc) W.loc = src.loc
return
//WOODEN TABLES
/obj/table/woodentable/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -199,6 +201,7 @@ TABLE AND RACK OBJECT INTERATIONS
if(W && W.loc) W.loc = src.loc
return
//REINFORCED TABLES
/obj/table/reinforced/attackby(obj/item/weapon/W as obj, mob/user as mob)