cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3509 from Cheridan/MeteorsSuck

Browse Source 
Meteor Stuff
This commit is contained in:
Cheridan
2014-05-17 18:42:16 -05:00
parent 1bf05c4406 231bf92ff9
commit 36bb032957
50 changed files with 192 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
-6
View File
@@ -163,12 +163,6 @@
A.loc = src.loc
qdel(src)
/obj/structure/closet/meteorhit(obj/O as obj)
if(O.icon_state == "flaming")
for(var/mob/M in src)
M.meteorhit(O)
src.dump_contents()
qdel(src)
/obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(src.opened)
code/game/objects/structures/crates_lockers/closets/statue.dm
-6
View File
@@ -121,12 +121,6 @@
for(var/mob/M in src)
shatter(M)
/obj/structure/closet/statue/meteorhit(obj/O as obj)
if(O.icon_state == "flaming")
for(var/mob/M in src)
M.meteorhit(O)
shatter(M)
/obj/structure/closet/statue/attackby(obj/item/I as obj, mob/user as mob)
health -= I.force
visible_message("\red [user] strikes [src] with [I].")
code/game/objects/structures/displaycase.dm
-6
View File
@@ -45,12 +45,6 @@
qdel(src)
/obj/structure/displaycase/meteorhit(obj/O as obj)
new /obj/item/weapon/shard( src.loc )
new /obj/item/weapon/gun/energy/laser/captain( src.loc )
qdel(src)
/obj/structure/displaycase/proc/healthcheck()
if (src.health <= 0)
if (!( src.destroyed ))
code/game/objects/structures/grille.dm
-4
View File
@@ -18,10 +18,6 @@
/obj/structure/grille/blob_act()
qdel(src)
/obj/structure/grille/meteorhit(var/obj/M)
qdel(src)
/obj/structure/grille/Bumped(atom/user)
if(ismob(user)) shock(user, 70)
code/game/objects/structures/lamarr_cage.dm
-6
View File
@@ -40,12 +40,6 @@
qdel(src)
/obj/structure/lamarr/meteorhit(obj/O as obj)
new /obj/item/weapon/shard( src.loc )
Break()
qdel(src)
/obj/structure/lamarr/proc/healthcheck()
if (src.health <= 0)
if (!( src.destroyed ))
code/game/objects/structures/safe.dm
-5
View File
@@ -165,15 +165,10 @@ FLOOR SAFES
obj/structure/safe/blob_act()
return
obj/structure/safe/ex_act(severity)
return
obj/structure/safe/meteorhit(obj/O as obj)
return
//FLOOR SAFES
/obj/structure/safe/floor
name = "floor safe"
code/game/objects/structures/tables_racks.dm
-3
View File
@@ -730,9 +730,6 @@ Destroy type values:
if(W && W.loc) W.loc = src.loc
return 1
/obj/structure/rack/meteorhit(obj/O as obj)
qdel(src)
/obj/structure/rack/attack_hand(mob/user)
if(HULK in user.mutations)
code/game/objects/structures/window.dm
-6
View File
@@ -50,12 +50,6 @@
qdel(src)
/obj/structure/window/meteorhit()
//world << "glass at [x],[y],[z] Mhit"
new /obj/item/weapon/shard( loc )
if(reinf) new /obj/item/stack/rods( loc)
qdel(src)
/obj/structure/window/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(istype(mover) && mover.checkpass(PASSGLASS))
return 1