Resurgence Clan Update: Villages [DONE]

ModularTegustation/fishing/code/fishing_items/fishing_net.dm

@@ -186,3 +186,23 @@
 	fishin_power = 1
 	enemy_chance = 95
 	capacity = 1
+
+//Clan Nets
+/obj/item/fishing_net/resurgence
+	name = "resurgence clan fishing net"
+	desc = "Resurgence Clan nets are slightly better then the normal fishing net, and have a slightly higher chance at catching foes"
+	icon = 'ModularTegustation/fishing/icons/fishing.dmi'
+	icon_state = "clan_net"
+	w_class = WEIGHT_CLASS_HUGE
+	deploy_type = /obj/structure/destructible/fishing_net/resurgence
+
+/obj/structure/destructible/fishing_net/resurgence
+	name = "resurgence clan fishing net"
+	desc = "A wall of twine and wires that traps fish. Alt click to harvest."
+	icon_state = "trawling_net_clan"
+	icon_state_fished = "trawling_net_clan_full"
+	debris = list(/obj/item/fishing_net/resurgence = 1)
+	net_type = /obj/item/fishing_net/resurgence
+	fishin_cooldown = 30 SECONDS
+	fishin_power = 1
+	enemy_chance = 25

ModularTegustation/fishing/code/rod_components/fishing_lines.dm

@@ -39,3 +39,10 @@
 	icon_state = "green"
 	fishing_value = 0.4
 	line_color = "#2b9c2b"
+
+/obj/item/fishing_component/line/clan
+	name = "resurgence clan fishing line reel"
+	desc = "Essential for fishing in the outskirts."
+	icon_state = "clan"
+	fishing_value = 0.6
+	line_color = "#057A71"

ModularTegustation/tegu_items/associations/!overwrites.dm

@@ -1,5 +1,49 @@
+/mob/living/simple_animal/hostile/ordeal/steel_dawn/Initialize()
+	. = ..()
+	if(SSmaptype.maptype in SSmaptype.citymaps)
+		guaranteed_butcher_results += list(/obj/item/food/meat/slab/human/mutant/moth = 1)
+
 /mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon/Initialize()
 	. = ..()
 	if(SSmaptype.maptype in SSmaptype.citymaps)
 		maxHealth = 500
 		health = 500
+		melee_damage_lower = 8
+		melee_damage_upper = 10
+
+/mob/living/simple_animal/hostile/ordeal/green_bot_big/Initialize()
+	. = ..()
+	if(SSmaptype.maptype in SSmaptype.citymaps)
+		rapid = 10
+		rapid_fire_delay = 3
+		projectiletype = /obj/projectile/bullet/c9x19mm/greenbot/city
+		firing_cooldown = 2.4
+
+/mob/living/simple_animal/hostile/ordeal/amber_dusk/Initialize()
+	. = ..()
+	if(SSmaptype.maptype in SSmaptype.citymaps)
+		melee_damage_lower = 45
+		melee_damage_upper = 50
+		maxHealth = 700
+		health = 700
+		can_burrow = FALSE
+		attack_cooldown = 100
+
+/mob/living/simple_animal/hostile/ordeal/dog_corrosion/Initialize()
+	. = ..()
+	if(SSmaptype.maptype in SSmaptype.citymaps)
+		gibbing = FALSE
+		maxHealth = 1500
+		health = 1500
+
+/mob/living/simple_animal/hostile/ordeal/snake_corrosion/Initialize()
+	. = ..()
+	if(SSmaptype.maptype in SSmaptype.citymaps)
+		maxHealth = 2000
+		health = 2000
+
+/mob/living/simple_animal/hostile/ordeal/snake_corrosion/strong/Initialize()
+	. = ..()
+	if(SSmaptype.maptype in SSmaptype.citymaps)
+		maxHealth = 3000
+		health = 3000

ModularTegustation/tegu_items/associations/cityspawners.dm

@@ -77,6 +77,7 @@ GLOBAL_VAR_INIT(city_east_enemies, FALSE)
 		"gcorp",
 		"sweeper",
 		"bots",
+		"worms",
 	)
 
 /obj/effect/landmark/backstreetspawn/Initialize()
@@ -99,10 +100,15 @@ GLOBAL_VAR_INIT(city_east_enemies, FALSE)
 			spawning = /mob/living/simple_animal/hostile/ordeal/green_bot
 			if(prob(30))
 				spawning = /mob/living/simple_animal/hostile/ordeal/green_bot_big
-	new spawning(get_turf(src))
-
 
+		if("worms")
+			spawning = /mob/living/simple_animal/hostile/ordeal/amber_bug
+			if(prob(30))
+				spawning = /mob/living/simple_animal/hostile/ordeal/amber_dusk
 
+	new spawning(get_turf(src))
+	if (GLOB.city_center_enemies == "worms")
+		new /mob/living/simple_animal/hostile/ordeal/amber_bug (get_turf(src))
 
 /obj/effect/landmark/backstreetspawnwest
 	name = "cityspawn landmark"
@@ -111,6 +117,7 @@ GLOBAL_VAR_INIT(city_east_enemies, FALSE)
 		"gcorp",
 		"sweeper",
 		"bots",
+		"worms",
 	)
 
 /obj/effect/landmark/backstreetspawnwest/Initialize()
@@ -134,7 +141,15 @@ GLOBAL_VAR_INIT(city_east_enemies, FALSE)
 			spawning = /mob/living/simple_animal/hostile/ordeal/green_bot
 			if(prob(30))
 				spawning = /mob/living/simple_animal/hostile/ordeal/green_bot_big
+
+		if("worms")
+			spawning = /mob/living/simple_animal/hostile/ordeal/amber_bug
+			if(prob(30))
+				spawning = /mob/living/simple_animal/hostile/ordeal/amber_dusk
+
 	new spawning(get_turf(src))
+	if (GLOB.city_west_enemies == "worms")
+		new /mob/living/simple_animal/hostile/ordeal/amber_bug (get_turf(src))
 
 
 /obj/effect/landmark/backstreetspawneast
@@ -144,6 +159,7 @@ GLOBAL_VAR_INIT(city_east_enemies, FALSE)
 		"gcorp",
 		"sweeper",
 		"bots",
+		"worms",
 	)
 
 /obj/effect/landmark/backstreetspawneast/Initialize()
@@ -166,5 +182,12 @@ GLOBAL_VAR_INIT(city_east_enemies, FALSE)
 			spawning = /mob/living/simple_animal/hostile/ordeal/green_bot
 			if(prob(30))
 				spawning = /mob/living/simple_animal/hostile/ordeal/green_bot_big
-	new spawning(get_turf(src))
 
+		if("worms")
+			spawning = /mob/living/simple_animal/hostile/ordeal/amber_bug
+			if(prob(30))
+				spawning = /mob/living/simple_animal/hostile/ordeal/amber_dusk
+
+	new spawning(get_turf(src))
+	if (GLOB.city_east_enemies == "worms")
+		new /mob/living/simple_animal/hostile/ordeal/amber_bug (get_turf(src))

ModularTegustation/tegu_items/associations/machines.dm

@@ -25,9 +25,9 @@
 		/obj/item/head_trophy,
 		/obj/item/tape/resurgence,
 		/obj/item/refinedpe,
+		/obj/item/raw_anomaly_core,
 	)
 	var/list/level_3 = list(
-		/obj/item/raw_anomaly_core,
 		/obj/item/documents,
 		/obj/item/folder/syndicate,
 		/obj/item/folder/documents,
@@ -173,6 +173,11 @@
 		JUSTICE_ATTRIBUTE,
 	)
 
+/obj/structure/potential/Initialize()
+	. = ..()
+	new /obj/item/paper/fluff/fixer_skills (get_turf(src))
+	new /obj/item/paper/fluff/fixer_skills (get_turf(src))
+
 //Very dumb way to implement "empty hand AND full hand."
 //These two code blocks are the same except for their triggers - if you've got a better idea, please use it.
 /obj/structure/potential/proc/calculate_grade(mob/living/user)

ModularTegustation/tegu_items/associations/vending.dm

@@ -133,7 +133,8 @@
 		/obj/item/kitchen/knife/combat/survival = 100,
 		/obj/item/weldingtool/mini = 100,
 		/obj/item/reagent_containers/hypospray/medipen/mental = 100,
-		/obj/item/reagent_containers/hypospray/medipen/salacid = 100
+		/obj/item/reagent_containers/hypospray/medipen/salacid = 100,
+		/obj/item/gps/fixer = 100,
 	)
 
 	premium = list(

ModularTegustation/tegu_items/backstreets/templates.dm

@@ -33,6 +33,11 @@
 	room_id = "abandoned_lcorp"
 	mappath = "_maps/RandomRooms/backstreetlayout/lcorp_backstreets.dmm"
 
+/datum/map_template/random_room/backstreet_template/outskirts
+	name = "Outskirts Template"
+	room_id = "outskirts"
+	mappath = "_maps/RandomRooms/backstreetlayout/outskirts.dmm"
+
 /datum/map_template/random_room/backstreet_template/la_mancha_land
 	name = "La Mancha Land Template"
 	room_id = "la_mancha_land_backstreets"

ModularTegustation/tegu_items/prosthetics/resurgence_core.dm

@@ -0,0 +1,43 @@
+/obj/item/organ/cyberimp/chest/resurgence_core
+	name = "Resurgence Clan Augment: Echo Step"
+	desc = "An augment designed by the resurgence clan, which lets the user teleport a short distance a the cost of their sanity."
+	syndicate_implant = TRUE
+	actions_types = list(/datum/action/item_action/organ_action/use/resurgence_core)
+	implant_overlay = "chest_resurgence_core"
+
+/datum/action/item_action/organ_action/use/resurgence_core
+	var/tp_distance = 2
+
+/datum/action/item_action/organ_action/use/resurgence_core/Trigger()
+	if(!IsAvailable())
+		return
+	get_teleport_loc()
+	var/turf/T
+	if(owner.dir == 1)
+		T = get_teleport_loc(owner.loc, owner, tp_distance, FALSE, 0, 0, 0, tp_distance)
+	if(owner.dir == 2)
+		T = get_teleport_loc(owner.loc, owner, tp_distance, FALSE, 0, 0, 0, (-1 * tp_distance))
+	if(owner.dir == 4)
+		T = get_teleport_loc(owner.loc, owner, tp_distance, FALSE, 0, 0, tp_distance, 0)
+	if(owner.dir == 8)
+		T = get_teleport_loc(owner.loc, owner, tp_distance, FALSE, 0, 0, (-1 * tp_distance), 0)
+	if(T.density)
+		to_chat(owner, span_danger("ERROR: Dense object detected in Echo Step destination."))
+		return
+	if(T.x>world.maxx || T.x<1)
+		to_chat(owner, span_danger("ERROR: Dense object detected in Echo Step destination."))
+		return
+	if(T.y>world.maxy || T.y<1)
+		to_chat(owner, span_danger("ERROR: Dense object detected in Echo Step destination."))
+		return
+	if (ishuman(owner))
+		var/mob/living/carbon/human/human = owner
+		playsound(owner, 'sound/effects/contractorbatonhit.ogg', 20, FALSE, 9)
+		new /obj/effect/temp_visual/dir_setting/ninja/phase/out (get_turf(owner))
+		if (T in view(tp_distance, owner))
+			human.adjustSanityLoss(human.maxSanity * 0.025)
+		else
+			human.adjustSanityLoss(human.maxSanity * 0.25)
+			to_chat(human, span_danger("WARNING: Echo Step destination is not visible, increasing power usage by 1000%."))
+		human.loc = T
+		new /obj/effect/temp_visual/dir_setting/ninja/phase (get_turf(owner))

ModularTegustation/tegu_items/refinery/crates/_crate.dm

@@ -59,6 +59,7 @@
 		veryrarechance += (repmodifier/crate_multiplier)
 
 	if(SSmaptype.maptype in SSmaptype.citymaps)	//Fuckers shouldn't loot like this
+		SEND_GLOBAL_SIGNAL(COMSIG_CRATE_LOOTING_STARTED, user, src)
 		if(!do_after(user, 7 SECONDS, src))
 			return
 
@@ -76,5 +77,9 @@
 		new cloot(get_turf(src))
 
 	to_chat(user, span_notice("You open the crate!"))
+	if(SSmaptype.maptype in SSmaptype.citymaps)
+		SEND_GLOBAL_SIGNAL(COMSIG_CRATE_LOOTING_ENDED, user, src)
+
 	new loot(get_turf(src))
 	qdel(src)
+

ModularTegustation/tegu_mobs/lc13_corrosions.dm

@@ -381,6 +381,7 @@
 	var/damage_threshold = 450
 	var/dash_damage = 80
 	var/charge_sound = 'sound/effects/ordeals/gold/growl1.ogg'
+	var/gibbing = TRUE
 
 /mob/living/simple_animal/hostile/ordeal/dog_corrosion/Move()
 	if(charging)
@@ -419,7 +420,7 @@
 	if(!ishuman(attacked_target))
 		return
 	var/mob/living/carbon/human/H = attacked_target
-	if(H.health < 0)
+	if(H.health < 0 || gibbing)
 		H.gib()
 		playsound(src, "sound/abnormalities/clouded_monk/eat.ogg", 75, 1)
 		adjustBruteLoss(-heal_amount)
@@ -494,7 +495,7 @@
 		if(!ishuman(L))
 			continue
 		var/mob/living/carbon/human/H = L
-		if(H.health < 0)
+		if(H.health < 0 || gibbing)
 			H.gib()
 			playsound(src, "sound/abnormalities/clouded_monk/eat.ogg", 75, 1)
 			adjustBruteLoss(-heal_amount)

ModularTegustation/tegu_mobs/lc13_humanoids.dm

@@ -70,7 +70,7 @@ Skittish, they prefer to move in groups and will run away if the enemies are in
 
 /mob/living/simple_animal/hostile/humanoid/rat/Initialize()
 	. = ..()
-	if(SSmaptype.maptype == "fixers" || SSmaptype.maptype == "city")
+	if(SSmaptype.maptype in SSmaptype.citymaps)
 		del_on_death = FALSE
 
 //Knife - The leader, has a pathetically weak dash, attacks fast