diff --git a/code/modules/jungle/jungle.dm b/code/modules/jungle/jungle.dm index f22f0dede9a..541b5c039a4 100644 --- a/code/modules/jungle/jungle.dm +++ b/code/modules/jungle/jungle.dm @@ -215,16 +215,6 @@ path_nodes.Add(new /obj/effect/landmark/path_waypoint(J)) num_spawned++ - //put a native tribe somewhere - num_spawned = 0 - while(num_spawned < 1) - var/turf/unsimulated/jungle/J = locate(rand(RANDOM_LOWER_X, RANDOM_UPPER_X), rand(RANDOM_LOWER_Y, RANDOM_UPPER_Y), src.z) - if(!J || !J.bushes_spawn) - continue - new /obj/effect/jungle_tribe_spawn(J) - path_nodes.Add(new /obj/effect/landmark/path_waypoint(J)) - num_spawned++ - //place some random path waypoints to confuse players max = rand(1,3) num_spawned = 0 diff --git a/code/modules/jungle/jungle_tribe.dm b/code/modules/jungle/jungle_tribe.dm deleted file mode 100644 index 70dade70dbf..00000000000 --- a/code/modules/jungle/jungle_tribe.dm +++ /dev/null @@ -1,92 +0,0 @@ - - -/obj/item/projectile/jungle_spear - damage = 10 - damage_type = TOX - icon_state = "bullet" - -/obj/effect/jungle_tribe_spawn - name = "campfire" - desc = "Looks cosy, in an alien sort of way." - icon = 'code/modules/jungle/jungle.dmi' - icon_state = "campfire" - anchored = 1 - var/list/tribesmen = list() - var/list/enemy_players = list() - var/tribe_type = 1 - -/obj/effect/jungle_tribe_spawn/New() - processing_objects.Add(src) - tribe_type = rand(1,5) - - var/num_tribesmen = rand(3,6) - for(var/i=0,i[src] throws a spear at [target_mob]!", 1) - flick(src, "native[my_type]_act") - - var/tturf = get_turf(target_mob) - Shoot(tturf, src.loc, src) diff --git a/paradise.dme b/paradise.dme index d14841666f0..72829cda04b 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1233,7 +1233,6 @@ #include "code\modules\jungle\jungle_animals.dm" #include "code\modules\jungle\jungle_plants.dm" #include "code\modules\jungle\jungle_temple.dm" -#include "code\modules\jungle\jungle_tribe.dm" #include "code\modules\jungle\jungle_turfs.dm" #include "code\modules\jungle\misc_helpers.dm" #include "code\modules\karma\karma.dm"