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

Bay/-tg- Meteor port

Browse Source 
Meteors now have different types, properly integrated.
Meteoract has been removed, meteors now just call ex_act.
This commit is contained in:
Tigercat2000
2015-06-21 18:39:39 -07:00
parent 6d990e2179
commit 7c9139d6e0
53 changed files with 273 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
-7
View File
@@ -175,13 +175,6 @@
A.loc = src.loc
del(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()
del(src)
/obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/rcs) && !src.opened)
var/obj/item/weapon/rcs/E = W
code/game/objects/structures/crates_lockers/closets/statue.dm
+11 -12
View File
@@ -99,12 +99,15 @@
/obj/structure/closet/statue/toggle()
return
/obj/structure/closet/statue/bullet_act(var/obj/item/projectile/Proj)
health -= Proj.damage
/obj/structure/closet/statue/proc/check_health()
if(health <= 0)
for(var/mob/M in src)
shatter(M)
/obj/structure/closet/statue/bullet_act(var/obj/item/projectile/Proj)
health -= Proj.damage
check_health()
return
/obj/structure/closet/statue/attack_animal(mob/living/simple_animal/user as mob)
@@ -116,21 +119,17 @@
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/ex_act(severity)
for(var/mob/M in src)
M.ex_act(severity)
health -= 60 / severity
check_health()
/obj/structure/closet/statue/attackby(obj/item/I as obj, mob/user as mob, params)
user.changeNext_move(CLICK_CD_MELEE)
health -= I.force
visible_message("\red [user] strikes [src] with [I].")
if(health <= 0)
for(var/mob/M in src)
shatter(M)
check_health()
/obj/structure/closet/statue/MouseDrop_T()
return
code/game/objects/structures/displaycase.dm
-7
View File
@@ -125,13 +125,6 @@
if(occupant) dump()
del(src)
/obj/structure/displaycase/meteorhit(obj/O as obj)
getFromPool(/obj/item/weapon/shard, loc)
if(occupant) dump()
del(src)
/obj/structure/displaycase/proc/healthcheck()
if (src.health <= 0)
if (!( src.destroyed ))
code/game/objects/structures/grille.dm
-4
View File
@@ -46,10 +46,6 @@
/obj/structure/grille/blob_act()
returnToPool(src)
/obj/structure/grille/meteorhit(var/obj/M)
returnToPool(src)
/obj/structure/grille/Bumped(atom/user)
if(ismob(user)) shock(user, 70)
code/game/objects/structures/inflatable.dm
-5
View File
@@ -62,11 +62,6 @@
blob_act()
deflate(1)
meteorhit()
//world << "glass at [x],[y],[z] Mhit"
deflate(1)
attack_hand(mob/user as mob)
add_fingerprint(user)
return
code/game/objects/structures/lamarr_cage.dm
-7
View File
@@ -39,13 +39,6 @@
Break()
qdel(src)
/obj/structure/lamarr/meteorhit(obj/O as obj)
getFromPool(/obj/item/weapon/shard, loc)
Break()
qdel(src)
/obj/structure/lamarr/proc/healthcheck()
if (src.health <= 0)
if (!( src.destroyed ))
code/game/objects/structures/safe.dm
-4
View File
@@ -168,10 +168,6 @@ 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
-4
View File
@@ -905,10 +905,6 @@
W.Move(loc)
return
/obj/structure/rack/meteorhit(obj/O as obj)
del(src)
/obj/structure/table/attack_hand(mob/user)
if(HULK in user.mutations)
visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
code/game/objects/structures/window.dm
-3
View File
@@ -76,9 +76,6 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
/obj/structure/window/blob_act()
destroy()
/obj/structure/window/meteorhit()
destroy()
/obj/structure/window/singularity_pull(S, current_size)
if(current_size >= STAGE_FIVE)
destroy()