cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replaced wall_smash in simple_animal with environment_smash, because before, you either tables AND walls, or nothing. If set to 1, smash crate/locker/rack/table, 2 for wallsmash, 3 for rwall smash

Browse Source 
Hostile mobs with environment smash will also unbuckle themselves by destroying whatever they're buckled to when angered.

Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/game/objects/structures/tables_racks.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/simple_animal/hostile/hostile.dm
This commit is contained in:
Ergovisavi
2014-01-22 20:37:47 -08:00
committed by ZomgPonies
parent 8ef0c5c859
commit 7ad68dd693
11 changed files with 27 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+1 -1
View File
@@ -166,7 +166,7 @@
return
/obj/structure/closet/attack_animal(mob/living/simple_animal/user as mob)
if(user.wall_smash)
if(user.environment_smash)
visible_message("\red [user] destroys the [src]. ")
for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc
code/game/objects/structures/crates_lockers/closets/statue.dm
+2 -2
View File
@@ -99,7 +99,7 @@
return
/obj/structure/closet/statue/attack_animal(mob/living/simple_animal/user as mob)
if(user.wall_smash)
if(user.environment_smash)
for(var/mob/M in src)
shatter(M)
@@ -142,4 +142,4 @@
user.dust()
dump_contents()
visible_message("\red [src] shatters!. ")
del(src)
del(src)
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+7
View File
@@ -36,9 +36,16 @@
manual_unbuckle(user)
return
/obj/structure/stool/bed/MouseDrop(atom/over_object)
return
/obj/structure/stool/bed/attack_animal(var/mob/living/simple_animal/M)//No more buckling hostile mobs to chairs to render them immobile forever
if(M.environment_smash)
new /obj/item/stack/sheet/metal(src.loc)
del(src)
/obj/structure/stool/bed/MouseDrop_T(mob/M as mob, mob/user as mob)
if(!istype(M)) return
buckle_mob(M, user)
code/game/objects/structures/tables_racks.dm
+2 -2
View File
@@ -391,7 +391,7 @@
destroy()
/obj/structure/table/attack_animal(mob/living/simple_animal/user)
if(user.wall_smash || istype(user,/mob/living/simple_animal/hostile/carp))
if(user.environment_smash)
visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
destroy()
@@ -867,7 +867,7 @@
/obj/structure/rack/attack_animal(mob/living/simple_animal/user)
if(user.wall_smash)
if(user.environment_smash)
visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
destroy()