Mobs can attack windows

fixes
DS-13-Dev-Team · Jul 22, 2018 · 52f77b0 · 52f77b0
1 parent 32a6590
commit 52f77b0
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 2 deletions.
diff --git a/code/modules/mob/living/simple_animal/crow/crow.dm b/code/modules/mob/living/simple_animal/crow/crow.dm
@@ -30,6 +30,7 @@
 	response_harm   = "swats"
 	stop_automated_movement = TRUE
 	universal_speak = TRUE
+	pass_flags = PASS_FLAG_TABLE
 
 	var/obj/item/weapon/storage/messenger/messenger_bag
 	var/obj/item/weapon/card/id/access_card

diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -25,6 +25,7 @@
 	holder_type = /obj/item/weapon/holder/cat
 	mob_size = MOB_SMALL
 	possession_candidate = 1
+	pass_flags = PASS_FLAG_TABLE
 
 /mob/living/simple_animal/cat/Life()
 	if(!..() || incapacitated() || client)

diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -23,6 +23,7 @@
 	holder_type = /obj/item/weapon/holder/corgi
 	var/obj/item/inventory_head
 	var/obj/item/inventory_back
+	pass_flags = PASS_FLAG_TABLE
 
 //IAN! SQUEEEEEEEEE~
 /mob/living/simple_animal/corgi/Ian

diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm
@@ -22,6 +22,7 @@
 	var/obj/item/inventory_mask
 	possession_candidate = 1
 	can_escape = 1 //snip snip
+	pass_flags = PASS_FLAG_TABLE
 
 /mob/living/simple_animal/crab/Life()
 	..()

diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm
@@ -16,4 +16,5 @@
 	response_harm   = "stomps on"
 	mob_size = MOB_MINISCULE
 	possession_candidate = 1
-	can_escape = 1
+	can_escape = 1
+	pass_flags = PASS_FLAG_TABLE
diff --git a/code/modules/mob/living/simple_animal/friendly/mushroom.dm b/code/modules/mob/living/simple_animal/friendly/mushroom.dm
@@ -18,6 +18,7 @@
 	var/harvest_time
 	var/min_explode_time = 1200
 	var/global/total_mushrooms = 0
+	pass_flags = PASS_FLAG_TABLE
 
 /mob/living/simple_animal/mushroom/New()
 	..()

diff --git a/code/modules/mob/living/simple_animal/friendly/slime.dm b/code/modules/mob/living/simple_animal/friendly/slime.dm
@@ -13,6 +13,7 @@
 	response_harm   = "stomps on"
 	emote_see = list("jiggles", "bounces in place")
 	var/colour = "grey"
+	pass_flags = PASS_FLAG_TABLE
 
 /mob/living/simple_animal/slime/can_force_feed(var/feeder, var/food, var/feedback)
 	if(feedback)

diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
@@ -40,6 +40,8 @@
 	pass_flags = PASS_FLAG_TABLE
 	speak_emote = list("beeps","clicks","chirps")
 
+	pass_flags = PASS_FLAG_TABLE
+
 /mob/living/simple_animal/spiderbot/New()
 	..()
 	add_language(LANGUAGE_GALCOM)

diff --git a/code/modules/mob/living/simple_animal/friendly/tomato.dm b/code/modules/mob/living/simple_animal/friendly/tomato.dm
@@ -15,4 +15,5 @@
 	harm_intent_damage = 5
 	melee_damage_upper = 15
 	melee_damage_lower = 10
-	attacktext = "mauled"
+	attacktext = "mauled"
+	pass_flags = PASS_FLAG_TABLE
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -32,6 +32,8 @@
 
 	faction = "carp"
 
+	pass_flags = PASS_FLAG_TABLE
+
 /mob/living/simple_animal/hostile/carp/Allow_Spacemove(var/check_drift = 0)
 	return 1	//No drifting in space for space carp!	//original comments do not steal
 

diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -36,6 +36,7 @@
 	speed = 3
 	max_gas = list("phoron" = 1, "carbon_dioxide" = 5, "methyl_bromide" = 1)
 	mob_size = MOB_LARGE
+	pass_flags = PASS_FLAG_TABLE
 
 //nursemaids - these create webs and eggs
 /mob/living/simple_animal/hostile/giant_spider/nurse

diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -234,3 +234,13 @@
 			var/obj/structure/obstacle = locate(/obj/structure, get_step(src, dir))
 			if(istype(obstacle, /obj/structure/window) || istype(obstacle, /obj/structure/closet) || istype(obstacle, /obj/structure/table) || istype(obstacle, /obj/structure/grille))
 				obstacle.attack_generic(src,rand(melee_damage_lower,melee_damage_upper),attacktext)
+				return
+			if(istype(obstacle, /obj/structure/wall_frame))
+				var/turf/T = get_turf(obstacle)
+				var/obj/structure/struct = locate(/obj/structure/window) in T
+				if(!struct)
+					struct = locate(/obj/structure/grille) in T
+				if(struct)
+					struct.attack_generic(src,rand(melee_damage_lower,melee_damage_upper),attacktext)
+					return
+				obstacle.attack_generic(src,rand(melee_damage_lower,melee_damage_upper),attacktext)
diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm
@@ -48,6 +48,7 @@ var/global/list/protected_objects = list(/obj/machinery,
 	var/weakref/creator // the creator
 	var/destroy_objects = 0
 	var/knockdown_people = 0
+	pass_flags = PASS_FLAG_TABLE
 
 /mob/living/simple_animal/hostile/mimic/New(newloc, var/obj/o, var/mob/living/creator)
 	..()

diff --git a/code/modules/mob/living/simple_animal/hostile/vagrant.dm b/code/modules/mob/living/simple_animal/hostile/vagrant.dm
@@ -32,6 +32,7 @@
 	var/mob/living/carbon/human/gripping = null
 	var/blood_per_tick = 4.25
 	var/health_per_tick = 0.8
+	pass_flags = PASS_FLAG_TABLE
 
 /mob/living/simple_animal/hostile/vagrant/Initialize()
 	. = ..()