makes the collabs remove the car battery attached to my balls (#38735)

* remove foliage regrowth

* Update vgstation13.dme

* foliage SS removal cleanup

* surely this will have no unforeseen consequences :clueless:

* special check code cleanup

* missed one

* that should be the last of the bear trap stuff

* i hate whitespace

* merged animal code to SA

* adjusting base and croc for new type

* mob hunting fix

* base grass turf addition

* grass tiles swapped type

* tool use refactor

* Update zoo.dmm

* cleanup for jungle grass for var changes

* dirt type change, further code cleaning

* moved sand

* more replacments

* all types swapped over, compiler issues fixed

* base code moved over

* runtime fix

* please don't kill me

* unemptied some subtypes

* tsm

* turf speed to parent

* Apply suggestions from code review

Co-authored-by: west3436 <[email protected]>

* water overlay type change

---------

Co-authored-by: west3436 <[email protected]>

Author: CrazyAmphibian

__DEFINES/_macros.dm

@@ -82,7 +82,7 @@
 
 #define isrobot(A) istype(A, /mob/living/silicon/robot)
 
-#define isanimal(A) istype(A, /mob/living/simple_animal) || istype(A,/mob/living/complex_animal)
+#define isanimal(A) istype(A, /mob/living/simple_animal)
 
 #define iscorgi(A) istype(A, /mob/living/simple_animal/corgi)
 

__DEFINES/subsystem.dm

@@ -30,7 +30,6 @@
 #define SS_INIT_PERSISTENCE_MAP	  -98
 #define SS_INIT_PATHFINDER        -100
 #define SS_INIT_DAYNIGHT		  -200
-#define SS_INIT_FOLIAGE_REGROW		-300
 
 #define SS_PRIORITY_TIMER          1000
 #define FIRE_PRIORITY_RUNECHAT	   410
@@ -69,7 +68,6 @@
 #define SS_PRIORITY_INACTIVITY     1
 #define SS_PRIORITY_BURNABLE	  -50
 #define SS_PRIORITY_DAYNIGHT	  -200
-#define SS_PRIORITY_FOLIAGE_REGROW	-300
 #define SS_PRIORITY_NEWS          -1000
 
 #define SS_WAIT_WEATHER         	2 SECONDS
@@ -107,7 +105,6 @@
 #define SS_DISPLAY_THERM_ENTROPY   13
 #define SS_DISPLAY_THERM_DISS      14
 #define SS_DISPLAY_DBCORE		   15
-#define SS_DISPLAY_FOLIAGE_REGROW	19
 #define SS_DISPLAY_DAYNIGHT		   20
 #define SS_DISPLAY_BURNABLE		   21
 

code/controllers/subsystem/foliage_regrowth.dm

@@ -2186,7 +2186,7 @@ var/global/list/adminbusteleportlocs = list()
 /area/surface/jungle/landing
 	name = "\improper Landing Area"
 	icon_state="jungle_landing"
-	base_turf_type=/turf/unsimulated/floor/jungle/concrete
+	base_turf_type=/turf/unsimulated/floor/planetary/concrete/jungle
 	holomap_color = HOLOMAP_AREACOLOR_ESCAPE
 
 //DJSTATION

code/game/area/Space Station 13 areas.dm

@@ -1176,8 +1176,6 @@ About the new airlock wires panel:
 		if(SA.environment_smash_flags & OPEN_DOOR_STRONG)
 			level_of_door_opening = 2
 		dooropendelay=SA.force_airlock_time
-	else if(istype(M,/mob/living/complex_animal))
-		level_of_door_opening = 1
 
 
 

code/game/machinery/doors/airlock.dm

@@ -216,10 +216,6 @@
 			return
 		dmg=M.melee_damage_upper
 		visible_message("<span class='warning'>\The [M.name] [M.attacktext] against \the [name].</span>", 1)
-	else if(istype(user,/mob/living/complex_animal))
-		var/mob/living/complex_animal/M = user
-		dmg= M.base_damage+rand(-M.damage_variance ,M.damage_variance )
-		visible_message("<span class='warning'>\The [M.name] smacks against \the [name].</span>", 1)
 	user.do_attack_animation(src, user)
 	user.delayNextAttack(8)
 	playsound(src, 'sound/effects/Glasshit.ogg', 75, 1)

code/game/machinery/doors/windowdoor.dm

@@ -249,13 +249,6 @@
 			try_break()
 		else
 			. = ..()
-	else if(istype(L,/mob/living/complex_animal))
-		var/mob/living/complex_animal/M=L
-		M.do_attack_animation(src, M)
-		M.delayNextAttack(1 SECONDS)
-		var/glanced=!take_damage(M.base_damage +rand(-M.damage_variance,M.damage_variance), skip_break = TRUE)
-		M.visible_message("<span class='warning'>\The [M] attacks \the [src][generate_break_text(glanced,TRUE)]</span>","<span class='notice'>You attack \the [src][generate_break_text(glanced)]</span>")
-		try_break()
 
 
 //Object ballistically colliding with something

code/game/objects/breakable.dm

@@ -453,8 +453,7 @@ var/list/available_redphone_names3 = list("1","2","3","4","5","6","7","8","9")
 	var/trapped = 0
 	var/datum/organ/external/trappedorgan //The limb currently trapped, it must be a leg
 	var/mob/living/carbon/human/trappeduser
-	var/mob/living/simple_animal/hostile/bear/trappedbear
-	var/mob/living/complex_animal/trappedcanimal
+	var/mob/living/simple_animal/trappedbear
 	var/obj/item/weapon/grenade/iedcasing/IED = null
 	var/image/ied_overlay
 	health=60 //so animals don't break it in 1 hit if they attack it.
@@ -475,9 +474,6 @@ var/list/available_redphone_names3 = list("1","2","3","4","5","6","7","8","9")
 	if (trappedbear)
 		unlock_atom(trappedbear)
 	trappedbear = null
-	if (trappedcanimal)
-		unlock_atom(trappedcanimal)
-	trappedcanimal=null
 	if (IED)
 		qdel(IED)
 	IED = null
@@ -609,38 +605,22 @@ var/list/available_redphone_names3 = list("1","2","3","4","5","6","7","8","9")
 					trappedbear.update_icon()
 					trappedbear = null
 					anchored = FALSE
+					
+					if(istype(trappedbear,/mob/living/simple_animal/complex))
+						var/mob/living/simple_animal/complex/CA=trappedbear
+						CA.family+=user
+						to_chat(user,"<span class='notice'>\The [trappedbear] seems appreciative.</span>")
 					return
 				else
 					user.visible_message("<span class='warning'>\The [H] fails to pry \the [src] off of \the [trappedbear], and crushes their leg even more!</span>", \
 					"<span class='warning'>You fail to pry \the [src] off of \the [trappedbear], and you crush their leg even more!</span>")
 					trappedbear.adjustBruteLoss(5)
 					return
-			else if (trappedcanimal)
-				user.visible_message("<span class='notice'>[H] tries to pry \the [src] off of \the [trappedcanimal]!</span>", \
-				"<span class='notice'>You try to pry open \the [src] with your bare hands.</span>")
-
-				if(do_after(user, src, 40) && prob(60))
-					user.visible_message("<span class='notice'>\The [H] managed to pry \the [src] off of \the [trappedcanimal]!</span>", \
-					"<span class='notice'>You manage to pry \the [src] off!</span>")
-					playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3)
-					trapped = 0
-					unlock_atom(trappedcanimal)
-					trappedcanimal.update_icon()
-					trappedcanimal = null
-					anchored = FALSE
-					trappedcanimal.family+=user
-					to_chat(user,"<span class='notice'>\The [trappedcanimal] seems appreciative.</span>")
-					return
-				else
-					user.visible_message("<span class='warning'>\The [H] fails to pry \the [src] off of \the [trappedcanimal], and crushes their leg even more!</span>", \
-					"<span class='warning'>You fail to pry \the [src] off of \the [trappedcanimal], and you crush their leg even more!</span>")
-					trappedcanimal.adjustBruteLoss(5)
-					return
 	..()
 
 /obj/item/weapon/beartrap/try_break(datum/throwparams/propelparams, hit_atom)
 	if(health <= 0)
-		if(trappeduser || trappedbear || trappedcanimal)
+		if(trappeduser || trappedbear)
 			armed = 0
 			anchored = FALSE
 			update_icon()
@@ -654,10 +634,6 @@ var/list/available_redphone_names3 = list("1","2","3","4","5","6","7","8","9")
 				unlock_atom(trappedbear)
 				trappedbear.update_icon()
 				trappedbear = null
-			if(trappedcanimal)
-				unlock_atom(trappedcanimal)
-				trappedcanimal.update_icon()
-				trappedcanimal = null
 			return FALSE
 
 		visible_message("\the [src] is smashed apart into nothing but metal...")
@@ -725,21 +701,10 @@ var/list/available_redphone_names3 = list("1","2","3","4","5","6","7","8","9")
 				unlock_atom(trappedbear)
 				trappedbear.update_icon()
 				trappedbear = null
-		else if (trappedcanimal)
-			user.visible_message("<span class='notice'>[user] tries to pry \the [src] off of \the [trappedcanimal]!</span>", \
-			"<span class='notice'>You try to pry open \the [src] with \the [I.name].</span>")
-			if(do_after(user, src, 30))
-				user.visible_message("<span class='notice'>\The [user] managed to pry \the [src] off of \the [trappedcanimal]!</span>", \
-				"<span class='notice'>You pry open the bear trap with \the [I.name].</span>")
-				playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3)
-				trapped = 0
-				unlock_atom(trappedcanimal)
-				trappedcanimal.update_icon()
-				trappedcanimal = null
-				anchored = FALSE
-				trappedcanimal.family+=user
-				to_chat(user,"<span class='notice'>\The [trappedcanimal] seems appreciative.</span>")
-				return
+				if(istype(trappedbear,/mob/living/simple_animal/complex))
+					var/mob/living/simple_animal/complex/CA=trappedbear
+					CA.family+=user
+					to_chat(user,"<span class='notice'>\The [trappedbear] seems appreciative.</span>")
 	else
 		to_chat(user, "<span class='notice'>You carefully set the bear trap off with \the [I.name].</span>")
 		playsound(src, 'sound/effects/snap.ogg', 60, 1)
@@ -768,7 +733,7 @@ var/list/available_redphone_names3 = list("1","2","3","4","5","6","7","8","9")
 
 			else if (istype(AM,/mob/living/simple_animal/hostile/bear))
 				trap(AM)
-			else if (istype(AM,/mob/living/complex_animal))
+			else if (istype(AM,/mob/living/simple_animal/complex))
 				trap(AM)
 			else if(isanimal(AM))
 				armed = 0
@@ -822,13 +787,6 @@ var/list/available_redphone_names3 = list("1","2","3","4","5","6","7","8","9")
 			trapped = 0
 			trappedbear = null
 			anchored = FALSE
-		
-		if(trappedcanimal)
-			unlock_atom(trappedcanimal)
-			trappedcanimal.gib()
-			trapped = 0
-			trappedcanimal = null
-			anchored = FALSE
 
 // Called when the dude is moved from the trap on way or the other.
 /obj/item/weapon/beartrap/proc/forcefully_remove(atom/movable/mover)

code/game/objects/misc_weapons.dm

@@ -432,13 +432,6 @@
 				dump_electronics()
 			dump_contents()
 			qdel(src)
-	else if(istype(user,/mob/living/complex_animal))
-		visible_message("<span class='warning'>[user] destroys the [src]. </span>")
-		broken = 1
-		if(has_electronics)
-			dump_electronics()
-		dump_contents()
-		qdel(src)
 // this should probably use dump_contents()
 /obj/structure/closet/blob_act()
 	anim(target = loc, a_icon = 'icons/mob/blob/blob.dmi', flick_anim = "blob_act", sleeptime = 15, lay = 12)

code/game/objects/structures/crates_lockers/closets.dm

@@ -11,12 +11,9 @@
 	update_icon()
 
 /obj/structure/flora/Destroy()
-	if(istype(loc,/turf/unsimulated/floor/jungle/grass))
-		var/turf/unsimulated/floor/jungle/grass/G=loc
+	if(istype(loc,/turf/unsimulated/floor/planetary/grass/jungle))
+		var/turf/unsimulated/floor/planetary/grass/jungle/G=loc
 		G.turf_speed_multiplier=1.0
-		if(SSFoliageRegrow)
-			turfs_to_regrow +=G
-			G.regrowticks=world.time
 	..()
 
 /obj/structure/flora/update_icon()