Merge branch 'master' into more-balance-tweaks

code/__DEFINES/access.dm

@@ -129,6 +129,7 @@ also be like that but I can't be arsed to go back and change them all*/
 #define ACCESS_NCR_COMMAND 253
 #define ACCESS_LEGION_COMMAND 254
 #define ACCESS_BROTHERHOOD_COMMAND 255 
+#define ACCESS_LEGION_CENTURION 264
 
 #define ACCESS_TOWN 273
 #define ACCESS_TOWN_CIV 274

code/__DEFINES/armor.dm

@@ -69,7 +69,7 @@
 		"rad" = 10, \
 		"fire" = 10, \
 		"acid" = 10, \
-		"wound" = 5, \
+		"wound" = 20, \
 		"damage_threshold" = 1)
 
 /* Medium armor values
@@ -90,7 +90,7 @@
 		"rad" = 25, \
 		"fire" = 25, \
 		"acid" = 25, \
-		"wound" = 10, \
+		"wound" = 35, \
 		"damage_threshold" = 3)
 
 /* Heavy armor values
@@ -111,7 +111,7 @@
 		"rad" = 25, \
 		"fire" = 35, \
 		"acid" = 35, \
-		"wound" = 25, \
+		"wound" = 45, \
 		"damage_threshold" = 5)
 
 /* Salvaged PA values
@@ -133,7 +133,7 @@
 		"rad" = 50, \
 		"fire" = 80, \
 		"acid" = 80, \
-		"wound" = 45, \
+		"wound" = 80, \
 		"damage_threshold" = 10)
 
 /* Power armor values

code/__DEFINES/combat.dm

@@ -507,7 +507,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_DAMAGE_PISTOL_44_HANDLOAD (BULLET_DAMAGE_PISTOL_44 * BULLET_HANDLOAD_MULT_DAMAGE)
 #define BULLET_DAMAGE_PISTOL_44_MATCH (BULLET_DAMAGE_PISTOL_44 * BULLET_MATCH_MULT_DAMAGE)
 #define BULLET_STAMINA_PISTOL_44 (BULLET_DAMAGE_PISTOL_44 * 0.5)
-#define BULLET_RECOIL_PISTOL_44 4
+#define BULLET_RECOIL_PISTOL_44 6
 #define BULLET_RECOIL_PISTOL_44_HANDLOAD (BULLET_RECOIL_PISTOL_44 * BULLET_HANDLOAD_MULT_RECOIL)
 #define BULLET_RECOIL_PISTOL_44_MATCH (BULLET_RECOIL_PISTOL_44 * BULLET_MATCH_MULT_RECOIL)
 #define BULLET_SPEED_PISTOL_44 (BULLET_SPEED_BASE * 0.90)

code/_globalvars/lists/flavor_misc.dm

@@ -104,13 +104,27 @@ GLOBAL_LIST_INIT(security_depts_prefs, list(SEC_DEPT_RANDOM, SEC_DEPT_NONE, SEC_
 #define DDUFFELBAG "Department Duffel Bag"
 GLOBAL_LIST_INIT(backbaglist, list(DBACKPACK, DSATCHEL, DDUFFELBAG, //everything after this point is a non-department backpack
 	"Hiking Backpack" = /obj/item/storage/backpack,
+	"Medical Backpack" = /obj/item/storage/backpack/medic,
 	"Service Backpack" = /obj/item/storage/backpack/enclave,
+	"Security Backpack" = /obj/item/storage/backpack/security,
+	"Captain Backpack" = /obj/item/storage/backpack/captain,
+	"Trekkers Pack" = /obj/item/storage/backpack/trekker,
+	"Trophy Rack" = /obj/item/storage/backpack/cultpack,
+	"Explorer Bag" = /obj/item/storage/backpack/explorer,
 	"Grey Duffel Bag" = /obj/item/storage/backpack/duffelbag,
+	"Medical Duffel Bag" = /obj/item/storage/backpack/duffelbag/med,
+	"Security Duffel Bag" = /obj/item/storage/backpack/duffelbag/sec,
+	"Captain Duffel Bag" = /obj/item/storage/backpack/duffelbag/captain,
 	"Grey Satchel" = /obj/item/storage/backpack/satchel,
 	"Leather Satchel" = /obj/item/storage/backpack/satchel/leather,
 	"Bone Satchel" = /obj/item/storage/backpack/satchel/bone,
+	"Explorer Satchel" = /obj/item/storage/backpack/satchel/explorer,
+	"Medical Satchel" = /obj/item/storage/backpack/satchel/med,
 	"Old Satchel" = /obj/item/storage/backpack/satchel/old,
-	"Service Satchel" = /obj/item/storage/backpack/satchel/enclave
+	"Service Satchel" = /obj/item/storage/backpack/satchel/enclave,
+	"Security Satchel" = /obj/item/storage/backpack/satchel/sec,
+	"Captain Satchel" = /obj/item/storage/backpack/satchel/cap,
+	"Trekkers Satchel" = /obj/item/storage/backpack/satchel/trekker,
 	))
 
 //Suit/Skirt

code/datums/traits/good.dm

@@ -476,7 +476,7 @@ GLOBAL_LIST_INIT(bone_dancer_recipes, list(
 /datum/quirk/bigleagues
 	name = "Melee - Big Leagues"
 	desc = "Swing for the fences! You deal even more additional damage with melee weapons."
-	value = 3
+	value = 4
 	mob_trait = TRAIT_BIG_LEAGUES
 	gain_text = span_notice("You feel like swinging for the fences!")
 	lose_text = span_danger("You feel like bunting.")
@@ -521,7 +521,7 @@ GLOBAL_LIST_INIT(bone_dancer_recipes, list(
 	gain_text = span_notice("You realize how to use Power Armor.")
 	lose_text = span_danger("You forget how Power Armor works.")
 	locked = FALSE
-
+/*
 /datum/quirk/hard_yards
 	name = "Mobility - Wasteland Trekker"
 	desc = "You've spent a lot of time wandering the wastes, and for your hard work you out pace most folks when travelling across them."
@@ -539,7 +539,7 @@ GLOBAL_LIST_INIT(bone_dancer_recipes, list(
 	gain_text = span_notice("Rain or shine only slow you down a little.")
 	lose_text = span_danger("You walk with a less sure gait, the ground seeming less firm somehow.")
 	locked = FALSE
-
+*/
 /datum/quirk/lifegiver
 	name = "Health - Tough"
 	desc = "You embody wellness! Instantly gain +10 maximum Health."
@@ -997,7 +997,7 @@ GLOBAL_LIST_INIT(bone_dancer_recipes, list(
 	gain_text = span_notice("Your footsteps fade away.")
 	lose_text = span_danger("You're pretty sure that's the sound of your asscheeks clapping, but it might be footsteps.")
 	locked =  FALSE
-
+/*
 /datum/quirk/deadeye
 	name = "Dead Eye"
 	desc = "You hit the shots you aim. No ifs, ands, or buts."
@@ -1006,11 +1006,11 @@ GLOBAL_LIST_INIT(bone_dancer_recipes, list(
 	gain_text = span_notice("Your aim is legendary, and you know it.")
 	lose_text = span_danger("Your aim could use some work...")
 	locked =  FALSE
-
+*/
 /datum/quirk/straightshooter
 	name = "Straight Shooter"
 	desc = "You're a better than average shot."
-	value = 4
+	value = 6
 	mob_trait = TRAIT_NICE_SHOT
 	gain_text = span_notice("Your aim is amazing, and you know it.")
 	lose_text = span_danger("Your aim could use some work...")

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -511,7 +511,8 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
  * Durathread
  */
 GLOBAL_LIST_INIT(durathread_recipes, list ( \
-	new/datum/stack_recipe("durathread dufflebag", /obj/item/storage/backpack/duffelbag/durathread, 6, time = 60)
+	new/datum/stack_recipe("durathread dufflebag", /obj/item/storage/backpack/duffelbag/durathread, 6, time = 60), \
+	new/datum/stack_recipe("dark durathread dufflebag", /obj/item/storage/backpack/duffelbag/durathread/dark, 6, time = 60) \
 ))
 
 /obj/item/stack/sheet/durathread

code/game/objects/items/storage/backpack.dm

@@ -461,6 +461,12 @@
 	resistance_flags = FIRE_PROOF
 	slowdown = 0
 
+/obj/item/storage/backpack/duffelbag/durathread/dark
+	name = "dark durathread duffel bag"
+	desc = "A lightweight duffel bag made out of durathread."
+	icon_state = "duffel-syndie"
+	item_state = "duffel-syndieammo"
+
 /obj/item/storage/backpack/duffelbag/drone
 	name = "drone duffel bag"
 	desc = "A large duffel bag for holding tools and hats."

code/game/objects/items/storage/firstaid.dm

@@ -75,6 +75,25 @@
 	new /obj/item/reagent_containers/hypospray/medipen/stimpak/epipak(src)
 	new /obj/item/reagent_containers/hypospray/medipen/stimpak/glucose(src)
 
+/obj/item/storage/firstaid/bandagekit
+	name = "bandage first-aid kit"
+	desc = "A first aid kit with the ability to bandage wounds and burns."
+	icon_state = "purple"
+	item_state = "firstaid"
+	possible_icons = list("purple","purple2","purple3","purple4")
+
+/obj/item/storage/firstaid/bandagekit/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/stack/medical/gauze(src)
+	new /obj/item/stack/medical/suture(src)
+	new /obj/item/stack/medical/suture(src)
+	new /obj/item/stack/medical/suture(src)
+	new /obj/item/stack/medical/ointment(src)
+	new /obj/item/stack/medical/ointment(src)
+	new /obj/item/stack/medical/ointment(src)
+	new /obj/item/healthanalyzer(src)
+
 /obj/item/storage/firstaid/fire
 	name = "burn treatment kit"
 	desc = "A specialized medical kit for when the toxins lab <i>-spontaneously-</i> burns down."

code/modules/clothing/head/f13factionhead.dm

@@ -325,6 +325,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot
 	desc = "The distinct helmet used by slavemasters."
 	icon_state = "legion-slavemaster"
 	item_state = "legion-slavemaster"
+	mob_overlay_icon = 'icons/fallout/onmob/clothes/head.dmi'
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR
 	flags_cover = HEADCOVERSEYES
 	dog_fashion = null
@@ -352,6 +353,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot
 /obj/item/clothing/head/helmet/f13/legion/vet/combvexil
 	name = "legion bear vexillarius helmet"
 	desc = "This helmet is decorated with the pelt of a ashland bear."
+	mob_overlay_icon = 'icons/fallout/onmob/clothes/head.dmi'
 	icon_state = "legion-vex"
 	item_state = "legion-vex"
 	armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_UP_DT_T2)
@@ -366,6 +368,7 @@ obj/item/clothing/head/helmet/f13/enclave/usmcriot
 /obj/item/clothing/head/helmet/f13/legion/vet/nightvexil
 	name = "legion nightstalker vexillarius helmet"
 	desc = "This helmet is decorated with the pelt of a nightstalker."
+	mob_overlay_icon = 'icons/fallout/onmob/clothes/head.dmi'
 	icon_state = "legion-vex-night"
 	item_state = "legion-vex-night"
 	armor_tokens = list(ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_UP_DT_T2)

code/modules/jobs/job_types/legion.dm

@@ -202,8 +202,8 @@ Weapons		Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
 	outfit = /datum/outfit/job/CaesarsLegion/Legionnaire/f13centurion
 	exp_requirements = 750
 
-	access = list(ACCESS_LEGION, ACCESS_CHANGE_IDS, ACCESS_LEGION_COMMAND)
-	minimal_access = list(ACCESS_LEGION, ACCESS_CHANGE_IDS, ACCESS_LEGION_COMMAND)
+	access = list(ACCESS_LEGION, ACCESS_CHANGE_IDS, ACCESS_LEGION_COMMAND, ACCESS_LEGION_CENTURION)
+	minimal_access = list(ACCESS_LEGION, ACCESS_CHANGE_IDS, ACCESS_LEGION_COMMAND, ACCESS_LEGION_CENTURION)
 
 	loadout_options = list(
 		/datum/outfit/loadout/palacent,		// BAR
@@ -1133,7 +1133,7 @@ Weapons		Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
 	belt = /obj/item/storage/belt/medical/primitive
 	backpack_contents = list(
 	//	/obj/item/storage/bag/money/small/legenlisted = 1,
-		/obj/item/storage/firstaid/ancient = 1,
+		/obj/item/storage/firstaid/bandagekit = 1,
 		/obj/item/stack/sticky_tape/surgical = 1,
 		/obj/item/stack/medical/bone_gel = 1,
 		/obj/item/book/granter/trait/midsurgery = 1,

code/modules/mob/special_stats.dm

@@ -55,10 +55,10 @@ proc/get_top_level_mob(mob/S)
 /// STRENGTH
 
 /obj/item/proc/calc_melee_dam_mod_from_special(mob/living/user)
-	return ((user.special_s - SPECIAL_DEFAULT_ATTR_VALUE) * 2)
+	return ((user.special_s - SPECIAL_DEFAULT_ATTR_VALUE) * 1.5)
 
 /datum/species/proc/calc_unarmed_dam_mod_from_special(mob/living/user)
-	return ((user.special_s - SPECIAL_DEFAULT_ATTR_VALUE) * 2)
+	return ((user.special_s - SPECIAL_DEFAULT_ATTR_VALUE) * 1.5)
 
 /// PERCEPTION
 
@@ -211,7 +211,7 @@ proc/get_top_level_mob(mob/S)
 	return (1 - ((special_a - SPECIAL_DEFAULT_ATTR_VALUE) * 0.1))
 
 /mob/proc/calc_movespeed_mod_from_special()
-	return -((special_a - SPECIAL_DEFAULT_ATTR_VALUE) * 0.05)
+	return -((special_a - SPECIAL_DEFAULT_ATTR_VALUE) * 0.03)
 
 /// LUCK
 

code/modules/projectiles/projectile/bullets/pistol.dm

@@ -858,7 +858,7 @@
  * * * * * * * */
 
 /* 44 fmj
- * DAMAGE: 44
+ * DAMAGE: 35
  * STAMIN: 52
  * RECOIL: 1
  * WOUNDS: 20
@@ -867,7 +867,7 @@
 /obj/item/projectile/bullet/m44
 	name = ".44 FMJ bullet"
 	damage = BULLET_DAMAGE_PISTOL_44
-	armour_penetration = 0.3
+	armour_penetration = 0.1
 	stamina = BULLET_STAMINA_PISTOL_44
 	spread = BULLET_SPREAD_SURPLUS
 	recoil = BULLET_RECOIL_PISTOL_44

code/modules/projectiles/projectile/bullets/rifle.dm

@@ -945,15 +945,15 @@
  * * * * * * * */
 
 /* .45-70 match
- * DAMAGE: 70
+ * DAMAGE: OUTDATED
  * STAMIN: 70
  * RECOIL: 1
  * WOUNDS: 25
  * WNAKED: 15
  */
 /obj/item/projectile/bullet/c4570
 	name = ".45-70 bullet"
-	armour_penetration = 0.1
+	armour_penetration = 0.2
 	damage = BULLET_DAMAGE_RIFLE_4570
 	stamina = BULLET_STAMINA_RIFLE_4570
 	spread = BULLET_SPREAD_SURPLUS

modular_BD2/legio_invicta/code/legio_invicta.dm

@@ -561,11 +561,11 @@
 	AddComponent(/datum/component/armor_plate)
 // ------------------- HELMETS -----------------------------
 
-/obj/item/clothing/head/helmet/f13/legion
+/*/obj/item/clothing/head/helmet/f13/legion
 	icon = 'modular_BD2/legio_invicta/icons/icons_legion.dmi'
 	righthand_file = 'modular_BD2/legio_invicta/icons/onmob_legion_righthand.dmi'
 	lefthand_file = 'modular_BD2/legio_invicta/icons/onmob_legion_lefthand.dmi'
-	mob_overlay_icon = 'modular_BD2/legio_invicta/icons/onmob_legion.dmi'
+	mob_overlay_icon = 'modular_BD2/legio_invicta/icons/onmob_legion.dmi'*/
 
 /obj/item/clothing/head/f13/servant
 	icon = 'modular_BD2/legio_invicta/icons/icons_legion.dmi'
@@ -585,18 +585,38 @@
 	item_state = "hat_auxilia"
 
 /obj/item/clothing/head/helmet/f13/legion/recruit
+	icon = 'modular_BD2/legio_invicta/icons/icons_legion.dmi'
+	righthand_file = 'modular_BD2/legio_invicta/icons/onmob_legion_righthand.dmi'
+	lefthand_file = 'modular_BD2/legio_invicta/icons/onmob_legion_lefthand.dmi'
+	mob_overlay_icon = 'modular_BD2/legio_invicta/icons/onmob_legion.dmi'
 	icon_state = "helmet_recruit"
 
 /obj/item/clothing/head/helmet/f13/legion/prime
+	icon = 'modular_BD2/legio_invicta/icons/icons_legion.dmi'
+	righthand_file = 'modular_BD2/legio_invicta/icons/onmob_legion_righthand.dmi'
+	lefthand_file = 'modular_BD2/legio_invicta/icons/onmob_legion_lefthand.dmi'
+	mob_overlay_icon = 'modular_BD2/legio_invicta/icons/onmob_legion.dmi'
 	icon_state = "helmet_prime"
 
 /obj/item/clothing/head/helmet/f13/legion/explorer
+	icon = 'modular_BD2/legio_invicta/icons/icons_legion.dmi'
+	righthand_file = 'modular_BD2/legio_invicta/icons/onmob_legion_righthand.dmi'
+	lefthand_file = 'modular_BD2/legio_invicta/icons/onmob_legion_lefthand.dmi'
+	mob_overlay_icon = 'modular_BD2/legio_invicta/icons/onmob_legion.dmi'
 	icon_state = "helmet_explorer"
 
 /obj/item/clothing/head/helmet/f13/legion/vet
+	icon = 'modular_BD2/legio_invicta/icons/icons_legion.dmi'
+	righthand_file = 'modular_BD2/legio_invicta/icons/onmob_legion_righthand.dmi'
+	lefthand_file = 'modular_BD2/legio_invicta/icons/onmob_legion_lefthand.dmi'
+	mob_overlay_icon = 'modular_BD2/legio_invicta/icons/onmob_legion.dmi'
 	icon_state = "helmet_veteran"
 
 /obj/item/clothing/head/helmet/f13/legion/vet/vexil
+	icon = 'modular_BD2/legio_invicta/icons/icons_legion.dmi'
+	righthand_file = 'modular_BD2/legio_invicta/icons/onmob_legion_righthand.dmi'
+	lefthand_file = 'modular_BD2/legio_invicta/icons/onmob_legion_lefthand.dmi'
+	mob_overlay_icon = 'modular_BD2/legio_invicta/icons/onmob_legion.dmi'
 	icon_state = "helmet_vexillarius"
 
 
@@ -935,11 +955,11 @@
 
 /obj/machinery/door/unpowered/securedoor/legion/warroom
 	name = "war room"
-	req_access_txt = "254" // ACCESS_LEGION_CPMMAND
+	req_access_txt = "254" // ACCESS_LEGION_COMMAND
 
 /obj/machinery/door/unpowered/securedoor/legion/centurion
 	name = "centurions quarters"
-	req_access_txt = "264" // ACCESS_LEGION4
+	req_access_txt = "264" // ACCESS_LEGION_CENTURION