Merge pull request #5587 from ARF-SS13/bountiful

Bountiful

_maps/map_files/coyote_bayou/Redwater.dmm

@@ -1,6 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aag" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/item/storage/trash_stack/loot/common,
 /turf/open/indestructible/ground/outside/gravel,
 /area/f13/building)
@@ -2635,7 +2635,7 @@
 	},
 /area/f13/building/abandoned)
 "bdm" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/spawner/lootdrop/f13/common_ammo,
 /obj/item/storage/trash_stack/loot/uncommon,
@@ -8182,7 +8182,7 @@
 /turf/open/floor/wood_common,
 /area/f13/building)
 "daH" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/spawner/lootdrop/f13/trash,
 /obj/item/storage/trash_stack/loot/uncommon,
@@ -14120,7 +14120,7 @@
 	},
 /area/f13/building)
 "fjc" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/item/toy/cards/deck{
 	pixel_y = 8
 	},
@@ -20065,7 +20065,7 @@
 /turf/open/floor/carpet/red,
 /area/f13/building/abandoned)
 "hvS" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/reagent_containers/food/snacks/grown/peach,
 /obj/item/storage/trash_stack/loot/uncommon,
@@ -21912,7 +21912,7 @@
 /turf/open/floor/wood_common,
 /area/f13/building)
 "ieU" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/effect/spawner/lootdrop/f13/common_ammo,
 /obj/effect/spawner/lootdrop/f13/common_ammo,
 /obj/item/storage/trash_stack/loot/uncommon,
@@ -23309,7 +23309,7 @@
 /turf/open/indestructible/ground/outside/dirt,
 /area/f13/wasteland/redwater)
 "iCW" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/indestructible/ground/outside/road,
@@ -24213,7 +24213,7 @@
 	},
 /area/f13/building)
 "iSZ" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/item/storage/trash_stack/loot/common,
 /turf/open/indestructible/ground/outside/road,
 /area/f13/building)
@@ -33717,7 +33717,7 @@
 /turf/open/floor/f13/wood,
 /area/f13/building/abandoned)
 "mze" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/item/clothing/mask/cigarette/cigar{
 	pixel_y = 8
 	},
@@ -34988,7 +34988,7 @@
 /turf/open/indestructible/ground/outside/dirt,
 /area/f13/wasteland/redwater)
 "nai" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/item/storage/trash_stack/loot/uncommon,
 /turf/open/indestructible/ground/outside/gravel,
 /area/f13/building)
@@ -36874,7 +36874,7 @@
 /turf/open/indestructible/ground/outside/dirt,
 /area/f13/wasteland/redwater)
 "nPL" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/item/storage/trash_stack/loot/uncommon,
 /turf/open/indestructible/ground/outside/road,
 /area/f13/building)
@@ -38721,7 +38721,7 @@
 /turf/open/indestructible/ground/outside/water,
 /area/f13/wasteland/town)
 "oyv" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/effect/spawner/lootdrop/f13/armor/tier1,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/storage/trash_stack/loot/uncommon,
@@ -38808,7 +38808,7 @@
 /turf/open/floor/wood_common,
 /area/f13/building)
 "ozT" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/item/storage/trash_stack/loot/uncommon,
 /obj/item/storage/trash_stack/loot/uncommon,
 /obj/item/storage/trash_stack/loot/rare,
@@ -41987,7 +41987,7 @@
 /turf/open/floor/wood_common,
 /area/f13/building/abandoned)
 "pLk" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/storage/trash_stack/loot/common,
 /turf/open/indestructible/ground/outside/road,
@@ -43614,7 +43614,7 @@
 /turf/open/indestructible/ground/inside/subway,
 /area/f13/building)
 "qsb" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/storage/trash_stack/loot/common,
 /obj/item/storage/trash_stack/loot/uncommon,
@@ -49776,7 +49776,7 @@
 	},
 /area/f13/building)
 "szR" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/effect/spawner/lootdrop/f13/armor/tier1,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/storage/trash_stack/loot/common,
@@ -50827,7 +50827,7 @@
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)
 "sWa" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/item/storage/trash_stack/loot/uncommon,
 /turf/open/indestructible/ground/outside/road{
 	icon_state = "horizontalinnermain0"
@@ -51335,7 +51335,7 @@
 /turf/open/indestructible/ground/outside/dirt,
 /area/f13/wasteland/town)
 "thi" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/item/locked_box/weapon/range/tier3_5,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/indestructible/ground/outside/road,
@@ -52961,7 +52961,7 @@
 /turf/open/floor/wood_common,
 /area/f13/building)
 "tLA" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/storage/trash_stack/loot/uncommon,
@@ -58357,7 +58357,7 @@
 /turf/open/indestructible/ground/outside/dirt,
 /area/f13/wasteland/town)
 "vLt" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/item/storage/box/dice,
 /turf/open/indestructible/ground/outside/dirt,
 /area/f13/wasteland/redwater)
@@ -60405,7 +60405,7 @@
 /turf/open/floor/plasteel/f13/vault_floor/floor/floorsolid,
 /area/f13/building)
 "wBe" = (
-/obj/structure/table/wood/junk,
+/obj/structure/table,
 /obj/effect/spawner/lootdrop/f13/armor/tier1,
 /obj/item/storage/trash_stack/loot/uncommon,
 /turf/open/indestructible/ground/outside/gravel,

code/modules/fallout/obj/structures/mob_spawners.dm

@@ -241,15 +241,15 @@ GLOBAL_LIST_EMPTY(player_made_nests)
 					/mob/living/simple_animal/hostile/russian/ranged/trooper = 2,
 					/mob/living/simple_animal/hostile/russian/ranged/officer = 2)
 
-/obj/structure/nest/syndicate
-	name = "syndicate hideout"
-	max_mobs = 2
-	mob_types = list(/mob/living/simple_animal/hostile/renegade/syndicate/melee/sword/space = 2,
-					/mob/living/simple_animal/hostile/renegade/syndicate/melee/sword/space/stormtrooper = 2,
-					/mob/living/simple_animal/hostile/renegade/syndicate/ranged/smg/space = 2,
-					/mob/living/simple_animal/hostile/renegade/syndicate/ranged/smg/space/stormtrooper = 2,
-					/mob/living/simple_animal/hostile/renegade/syndicate/ranged/shotgun/space,
-					/mob/living/simple_animal/hostile/renegade/syndicate/ranged/shotgun/space/stormtrooper)
+// /obj/structure/nest/syndicate
+// 	name = "syndicate hideout"
+// 	max_mobs = 2
+// 	mob_types = list(/mob/living/simple_animal/hostile/renegade/syndicate/melee/sword/space = 2,
+// 					/mob/living/simple_animal/hostile/renegade/syndicate/melee/sword/space/stormtrooper = 2,
+// 					/mob/living/simple_animal/hostile/renegade/syndicate/ranged/smg/space = 2,
+// 					/mob/living/simple_animal/hostile/renegade/syndicate/ranged/smg/space/stormtrooper = 2,
+// 					/mob/living/simple_animal/hostile/renegade/syndicate/ranged/shotgun/space,
+// 					/mob/living/simple_animal/hostile/renegade/syndicate/ranged/shotgun/space/stormtrooper)
 
 /obj/structure/nest/aethergiest
 	name = "aethergiest nest"

code/modules/mob/living/simple_animal/hostile/f13/mirelurks.dm

@@ -125,7 +125,7 @@
 		MOB_SPEED_LIST(2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8),
 		MOB_SPEED_CHANGE_PER_TURN_CHANCE(100),
 		MOB_HEALTH_LIST(35, 39, 40, 41),
-		MOB_RETREAT_DISTANCE_LIST(5, 6, 7),
+		MOB_RETREAT_DISTANCE_LIST(15, 16),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(100),
 		MOB_MINIMUM_DISTANCE_LIST(3, 4, 5),
 		MOB_MINIMUM_DISTANCE_CHANGE_PER_TURN_CHANCE(100),

code/modules/mob/living/simple_animal/hostile/f13/wasteanimals.dm

@@ -431,7 +431,7 @@
 //Faster and more aggressive than normal geckos, but also easier even squishier.
 
 /mob/living/simple_animal/hostile/gecko/legacy
-	bounty = 12
+	bounty = 6
 	name = "newt"
 	desc = "A large dog sized amphibious biped with an oddly large mouth for its size. Probably related to geckos in some way."
 	icon = 'icons/fallout/mobs/legacymobs.dmi'

modular_coyote/code/modules/znuguns/code/guns/tier1.dm

@@ -1,7 +1,7 @@
 // Put tier respective guns (and loadout options) here. Ammo goes in their respective files somewhere around modular_coyote/code/modules/znuguns/code/ammo .
 
 /obj/item/gun/ballistic/automatic/pistol/ninemil
-	name = "nine"
+	name = "Hi Power 9mm"
 	desc = "A mass produced pre-fall 9mm pistol."
 	icon_state = "ninemil"
 	init_mag_type = /obj/item/ammo_box/magazine/m9mm/doublestack
@@ -42,7 +42,7 @@
 	weapon_class = WEAPON_CLASS_TINY
 
 /obj/item/gun/ballistic/automatic/pistol/ninemil/makarov
-	name = "eastern pistol"
+	name = "makarov"
 	desc = "An easy to conceal pistol chambered in 9mm."
 	icon_state = "makarov"
 	inhand_icon_state = "glock"
@@ -54,7 +54,7 @@
 	weapon_class = WEAPON_CLASS_SMALL
 
 /obj/item/gun/ballistic/automatic/pistol/ninemil/c93/luger
-	name = "trophy pistol"
+	name = "luger"
 	desc = "A foreign 9mm pistol."
 	icon_state = "p08"
 	inhand_icon_state = "p38"
@@ -65,7 +65,7 @@
 	damage_multiplier = TIER1
 
 /obj/item/gun/ballistic/automatic/pistol/ninemil/glock
-	name = "P.D."
+	name = "glock"
 	desc = "Chambered in 9mm, this is a versatile compact pistol. It fits comfortably in the hand or a chest rig, and its solid design lets it survive mud, sand, and sometimes even peanut butter."
 	icon_state = "glock"
 	inhand_icon_state = "glock"
@@ -74,7 +74,7 @@
 	righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
 
 /obj/item/gun/ballistic/automatic/pistol/type17
-	name = "broomie"
+	name = "broomhandle"
 	desc = "The ones around are old and worn, but somewhat popular due to the long barrel and rechambered in 9mm after the original ammo ran dry centuries ago."
 	icon_state = "chinapistol"
 	init_mag_type = /obj/item/ammo_box/magazine/m9mm/doublestack
@@ -94,7 +94,7 @@
 	damage_multiplier = TIER1
 
 /obj/item/gun/ballistic/revolver/revolver45
-	name = ".45 ACP two step"
+	name = ".45 Single Action"
 	desc = "Post-fall revolver firing .45 ACP from a seven round cylinder."
 	inhand_icon_state = "45revolver"
 	icon_state = "45revolver"
@@ -109,7 +109,7 @@
 	damage_multiplier = TIER1
 
 /obj/item/gun/ballistic/revolver/colt357
-	name = ".357 two step"
+	name = "Single Action Army"
 	desc = "A no-nonsense revolver, more than likely made in some crude workshop in one of the more prosperous frontier towns."
 	icon_state = "357colt"
 	inhand_icon_state = "357colt"
@@ -124,7 +124,7 @@
 	damage_multiplier = TIER1
 
 /obj/item/gun/ballistic/revolver/revolver44
-	name = ".44 two step"
+	name = ".44 Single Action"
 	desc = "A fairly large post-fall revolver chambered in .44, chunky."
 	inhand_icon_state = "44colt"
 	icon_state = "44colt"
@@ -161,7 +161,7 @@
 	can_bayonet = FALSE
 
 /obj/item/gun/ballistic/revolver/derringerLC
-	name = "garnet"
+	name = "derringer"
 	desc = "A classy, pearl handled pistol firing .45 in a very compact package."
 	icon = 'modular_coyote/icons/objects/pistols.dmi'
 	icon_state = "remington_95_ivory"
@@ -177,7 +177,7 @@
 	fire_sound = 'sound/f13weapons/45revolver.ogg'
 
 /obj/item/gun/ballistic/automatic/smg/cg45
-	name = "open bolt sweeper"
+	name = "open bolt smg"
 	desc = "Post-cataclysm submachine gun crudely constructed out of various steel parts using advanced powered hand tools; likely one of the most complex guns that is feasible to make outside of a machine shop."
 	icon_state = "cg45"
 	inhand_icon_state = "cg45"
@@ -194,7 +194,7 @@
 	fire_sound = 'sound/f13weapons/10mm_fire_03.ogg'
 
 /obj/item/gun/ballistic/automatic/m1carbine
-	name = "reservist carbine"
+	name = "M1 Carbine"
 	desc = "A design thought to have been used hundreds of years ago by a now long gone power. It's ubiquitous nature made it prime for post-fall gunsmiths to restore."
 	icon_state = "m1carbine"
 	inhand_icon_state = "rifle"
@@ -225,7 +225,7 @@
 	fire_sound = 'sound/f13weapons/varmint_rifle.ogg'
 
 /obj/item/gun/ballistic/revolver/shotpistol
-	name = "blaster"
+	name = "single shot shotgunpistol"
 	desc = "Exactly one half of a hammer fired double barrel shotgun, stripped down and streamlined to fit snugly in someone's pocket."
 	icon = 'icons/fallout/objects/guns/ballistic.dmi'
 	lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
@@ -243,7 +243,7 @@
 	fire_sound = 'sound/f13weapons/max_sawn_off.ogg'
 
 /obj/item/gun/ballistic/revolver/widowmaker
-	name = "flyswatter"
+	name = "double barrel shotgunned"
 	desc = "A simple hammer fired double barrel shotgun."
 	icon = 'icons/fallout/objects/guns/ballistic.dmi'
 	lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
@@ -263,7 +263,7 @@
 	damage_multiplier = TIER1
 
 /obj/item/gun/ballistic/shotgun/automatic/combat/shotgunlever/stock
-	name = "slapback"
+	name = "lever shotgun"
 	desc = "A speedy lever action shotgun with a five-shell capacity underneath plus one in chamber."
 	icon_state = "lashotgunstocked"
 	inhand_icon_state = "shotgunlever"
@@ -282,7 +282,7 @@
 	damage_multiplier = TIER1
 
 /obj/item/gun/ballistic/rifle/repeater/cowboy
-	name = "cavalry rifle"
+	name = "Winchester Lever Action"
 	desc = "A lever action rifle chambered in .357 Magnum. Smells vaguely of whiskey and cigarettes."
 	icon_state = "cowboyrepeater"
 	inhand_icon_state = "cowboyrepeater"
@@ -298,7 +298,7 @@
 	damage_multiplier = TIER1
 
 /obj/item/gun/ballistic/rifle/antique/gras
-	name = "Mardi-Gras rifle"
+	name = "Gras rifle"
 	desc = "A post-catacylsm copy of an old black powder cartridge gun of foreign lineage. No one is sure where the name came from, but it stuck."
 	icon = 'modular_coyote/icons/objects/rifles.dmi'
 	icon_state = "gras"
@@ -328,7 +328,7 @@
 	damage_multiplier = TIER1
 
 /obj/item/gun/ballistic/rifle/mag/boys
-	name = "salvaged bolt-action rifle"
+	name = "Boys anti tank rifle"
 	desc = "A heavy rifle boasting a strong kick and an even stronger punch. This one probably won't even come apart from the excess pressures (hose clamps not included)!"
 	icon = 'icons/fallout/objects/guns/longguns.dmi'
 	icon_state = "boys"
@@ -352,7 +352,7 @@
 	damage_multiplier = TIER1
 
 /obj/item/gun/ballistic/rifle/salvaged_eastern_rifle
-	name = "salvaged eastern dragon"
+	name = "salvaged AK"
 	desc = "A clever design adapted out of salvaged surplus eastern wyverns and wasteland scarcity. The magazine is welded to the frame and a port was added after."
 	icon = 'icons/fallout/objects/guns/ballistic.dmi'
 	lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'