Merge branch 'master' into pugs-eastern-euro-imports

_maps/map_files/Pahrump-AB/Pahrump-AB.dmm

@@ -32080,6 +32080,13 @@
 	icon_state = "horizontaltopborderbottom2"
 	},
 /area/f13/wasteland)
+"hdz" = (
+/obj/structure/fermenting_barrel/broc/xander,
+/turf/open/indestructible/ground/outside/desert/sonora{
+	dir = 4;
+	icon_state = "desertsmooth5"
+	},
+/area/f13/wasteland)
 "hdP" = (
 /obj/structure/flora/grass/wasteland{
 	icon_state = "tall_grass_4"
@@ -36443,6 +36450,13 @@
 	icon_state = "shadowleft"
 	},
 /area/f13/wasteland)
+"iTp" = (
+/obj/structure/fermenting_barrel/broc/cactus,
+/turf/open/indestructible/ground/outside/desert/sonora{
+	dir = 4;
+	icon_state = "desertsmooth4"
+	},
+/area/f13/wasteland)
 "iTu" = (
 /obj/structure/flora/brushwoodalt,
 /turf/open/indestructible/ground/outside/desert,
@@ -59754,6 +59768,13 @@
 	},
 /turf/open/indestructible/ground/outside/dirt,
 /area/f13/wasteland)
+"sBh" = (
+/obj/structure/fermenting_barrel/broc,
+/turf/open/indestructible/ground/outside/desert/sonora{
+	dir = 4;
+	icon_state = "desertsmooth3"
+	},
+/area/f13/wasteland)
 "sBr" = (
 /obj/effect/decal/cleanable/dirt{
 	color = "000000"
@@ -127675,7 +127696,7 @@ fcR
 xaY
 sQy
 vDY
-sVE
+sBh
 oXX
 skv
 xwz
@@ -127932,7 +127953,7 @@ xBX
 xWo
 qqE
 vDY
-xJd
+hdz
 eov
 skv
 xwz
@@ -128189,7 +128210,7 @@ xaY
 aii
 qqE
 vDY
-dJF
+iTp
 uVZ
 skv
 xwz

code/__DEFINES/inventory.dm

@@ -806,7 +806,7 @@ GLOBAL_LIST_INIT(storage_tray_can_hold, typecacheof(list(
  * * * */
 
 /// How many items total fit in a bag thing
-#define STORAGE_BAG_MAX_ITEMS STORAGE_BELT_SPECIALIZED_MAX_ITEMS * 2 //14
+#define STORAGE_BAG_MAX_ITEMS 20
 /// How big a thing can fit in a bag thing
 #define STORAGE_BAG_MAX_SIZE WEIGHT_CLASS_SMALL
 /// How much volume fits in a bag thing
@@ -861,6 +861,13 @@ GLOBAL_LIST_INIT(storage_tray_can_hold, typecacheof(list(
 /// How much volume fits in a casing quiver
 #define STORAGE_QUIVER_HEAVY_TOTAL_SPACE STORAGE_QUIVER_HEAVY_MAX_ITEMS * WEIGHT_CLASS_TINY
 
+/// How many items total fit in a produce bag
+#define STORAGE_PRODUCE_BAG_MAX_ITEMS 100
+/// How big a thing can fit in a produce bag
+#define STORAGE_PRODUCE_BAG_MAX_SIZE WEIGHT_CLASS_NORMAL
+/// How much volume fits in a produce bag 
+#define STORAGE_PRODUCE_BAG_MAX_TOTAL_SPACE STORAGE_PRODUCE_BAG_MAX_ITEMS * STORAGE_PRODUCE_BAG_MAX_SIZE
+
 /* * * *
  * Boxes
  * * * */

code/__DEFINES/tgs.dm

@@ -1,7 +1,7 @@
 // tgstation-server DMAPI
 // The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as described in IETF RFC 2119.
 
-#define TGS_DMAPI_VERSION "7.2.1"
+#define TGS_DMAPI_VERSION "7.3.0"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 

code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm

@@ -305,7 +305,7 @@
 	time = 5
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
-/*
+
 /datum/crafting_recipe/shotgunammo3p
 	name = "12g 3p trainshot box"
 	result = /obj/item/ammo_box/shotgun/trainshot
@@ -345,7 +345,7 @@
 	time = 5
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
-
+/*
 /datum/crafting_recipe/c38boxincin
 	name = ".38 incendiary-tipped ammo box"
 	result = /obj/item/ammo_box/c38box/incendiary
@@ -358,7 +358,7 @@
 	time = 5
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
-
+*/
 /datum/crafting_recipe/c10mmincin
 	name = "10mm incendiary-tipped ammo box"
 	result = /obj/item/ammo_box/c10mm/fire
@@ -494,7 +494,7 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
 */
-
+/*
 /datum/crafting_recipe/a762boxshrap
 	name = "7.62mm micro-shrapnel ammo box"
 	result = /obj/item/ammo_box/a762box/microshrapnel
@@ -508,7 +508,6 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
 */
-
 /*
 /datum/crafting_recipe/a50MGboxuranium
 	name = "12.7mm U-235 ammo box"
@@ -524,7 +523,7 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
 */
-/*
+
 /datum/crafting_recipe/a50MGboxcontaminated
 	name = "12.7mm contaminated ammo box"
 	result = /obj/item/ammo_box/a50MGbox/contam
@@ -553,7 +552,7 @@
 	time = 5
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
-*/
+
 /datum/crafting_recipe/m2mmblender
 	name = "2mm \"Blender\" magazine"
 	result = /obj/item/ammo_box/magazine/m2mm/blender

code/datums/components/storage/concrete/bags.dm

@@ -27,10 +27,10 @@
 
 /// Produce bag
 /datum/component/storage/concrete/bag/produce
-	max_items = STORAGE_TRASH_BAG_MAX_ITEMS
+	max_items = STORAGE_PRODUCE_BAG_MAX_ITEMS
 	max_w_class = WEIGHT_CLASS_NORMAL
-	max_combined_w_class = STORAGE_TRASH_BAG_MAX_TOTAL_SPACE
-	max_volume = STORAGE_TRASH_BAG_MAX_TOTAL_SPACE
+	max_combined_w_class = STORAGE_PRODUCE_BAG_MAX_TOTAL_SPACE
+	max_volume = STORAGE_PRODUCE_BAG_MAX_TOTAL_SPACE
 	display_numerical_stacking = TRUE
 	limited_random_access = FALSE
 

code/game/objects/items/stealthboy.dm

@@ -1,8 +1,8 @@
 /obj/item/stealthboy
-	name = "Stealth Boy"
+	name = "Stealth Boy MK1"
 	desc = "The RobCo Stealth Boy 3001 is a personal stealth device, this one is designed to be worn on your belt and the battery can be taken out if you can find an ALTERNATIVE way to CLICK the back open and take the battery out. (alt click to take the battery out and recharge it)"
-	icon = 'icons/obj/pda.dmi' //Placeholder till ones sprited
-	icon_state = "pda" //Placeholder till ones sprited
+	icon = 'icons/fallout/objects/stealthboy.dmi'
+	icon_state = "stealth_boy"
 	item_flags = NOBLUDGEON
 	slot_flags = ITEM_SLOT_BELT
 	throwforce = 5
@@ -14,6 +14,18 @@
 	var/on = FALSE
 	actions_types = list(/datum/action/item_action/stealthboy_cloak)
 
+
+// Below are Variants of stealth boys that should be increased power usage and less below that one. However I dont know how to make that happen, so they are all the same.
+/obj/item/stealthboy/makeshift
+	name = "Makeshift Stealth Boy"
+	icon_state = "makeshift_stealth"
+	use_per_tick = 800
+
+/obj/item/stealthboy/mk2
+	name = "Stealth Boy MK2"
+	icon_state = "stealth_boy_mk"
+	use_per_tick = 200
+
 /obj/item/stealthboy/Initialize()
 	. = ..()
 	if(ispath(cell))

code/modules/farming/farming_structures.dm

@@ -23,9 +23,40 @@
 	var/open = FALSE
 	var/speed_multiplier = 4 //How fast it distills. Defaults to 100% (1.0). Lower is better.
 
+	var/broc = FALSE // Overlay var
+	var/xander = FALSE // Overlay var
+	var/cactus = FALSE // Overlay var
+
 /obj/structure/fermenting_barrel/Initialize()
-	create_reagents(300, DRAINABLE | AMOUNT_VISIBLE) //Bluespace beakers, but without the portability or efficiency in circuits.
+	create_reagents(500, DRAINABLE | AMOUNT_VISIBLE) //Bluespace beakers, but without the portability or efficiency in circuits.
+	update_icon()
+	. = ..()
+
+/obj/structure/fermenting_barrel/update_overlays()
 	. = ..()
+	if(broc)
+		. += "broc"
+	if(xander)
+		. += "xander"
+	if(cactus)
+		. += "cactus"
+
+	if(reagents.total_volume && open)
+		var/mutable_appearance/filling = mutable_appearance('icons/fallout/farming/farming_structures.dmi', "[icon_state]10", color = mix_color_from_reagents(reagents.reagent_list))
+		switch (reagents.total_volume)
+			if (0 to 40)
+				filling.icon_state = "[icon_state]-10"
+			if (40 to 70)
+				filling.icon_state = "[icon_state]10"
+			if (70 to 140)
+				filling.icon_state = "[icon_state]25"
+			if (140 to 250)
+				filling.icon_state = "[icon_state]50"
+			if (251 to 400)
+				filling.icon_state = "[icon_state]75"
+			if (409 to 501)
+				filling.icon_state = "[icon_state]100"
+		. += filling
 
 /obj/structure/fermenting_barrel/examine(mob/user)
 	. = ..()
@@ -47,6 +78,7 @@
 				data["tastes"] = list(fruit.tastes[1] = 1)
 			reagents.add_reagent(/datum/reagent/consumable/ethanol/fruit_wine, amount, data)
 		qdel(fruit)
+		update_icon() // new
 	playsound(src, 'sound/effects/bubbles.ogg', 50, TRUE)
 
 /obj/structure/fermenting_barrel/attackby(obj/item/I, mob/user, params)
@@ -99,6 +131,22 @@
 	else
 		icon_state = "barrel"
 
+/obj/structure/fermenting_barrel/broc // for bitter production without having to label
+	name = "broc fermenting barrel"
+	desc = "A large wooden barrel with a painted broc flower on it. You can ferment fruits and such inside it, or just use it to hold liquid."
+	icon = 'icons/fallout/farming/farming_structures.dmi'
+	broc = TRUE
+
+/obj/structure/fermenting_barrel/broc/xander // for bitter production without having to label
+	name = "xander fermenting barrel"
+	desc = "A large wooden barrel with a painted xander root on it. You can ferment fruits and such inside it, or just use it to hold liquid."
+	xander = TRUE
+
+/obj/structure/fermenting_barrel/broc/cactus // for bitter production without having to label
+	name = "cactus fermenting barrel"
+	desc = "A large wooden barrel with a painted barrel cactus on it. You can ferment fruits and such inside it, or just use it to hold liquid."
+	cactus = TRUE
+
 
 //////////
 // LOOM //

code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm

@@ -691,9 +691,9 @@
 	var/static/list/alchemyrack_typecache = typecacheof(list(
 		/obj/item/reagent_containers/pill/patch,
 		/obj/item/reagent_containers/glass/bottle/primitive,
-		/obj/item/stack/medical/poultice,
+		/obj/item/stack/medical,
 		/obj/item/smelling_salts,
-		/obj/item/reagent_containers/pill/healingpowder
+		/obj/item/reagent_containers/pill
 	))
 	if(is_type_in_typecache(O, alchemyrack_typecache))
 		return TRUE

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

@@ -131,6 +131,7 @@
 	mob_armor = ARMOR_VALUE_ROBOT_SECURITY
 	maxHealth = 150 
 	health = 150
+	stat_attack = UNCONSCIOUS
 	del_on_death = FALSE
 	melee_damage_lower = 24
 	melee_damage_upper = 55

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

@@ -71,6 +71,7 @@
 /mob/living/simple_animal/hostile/centaur/strong // Mostly for FEV mutation
 	maxHealth = 400
 	health = 400
+	stat_attack = UNCONSCIOUS
 	melee_damage_lower = 35
 	melee_damage_upper = 35
 	armour_penetration = 0.1
@@ -108,6 +109,7 @@
 
 	maxHealth = 1000
 	health = 1000
+	stat_attack = UNCONSCIOUS
 	speed = -0.5
 	harm_intent_damage = 8
 	melee_damage_lower = 30
@@ -176,6 +178,7 @@
 	speed = -0.5
 	maxHealth = 700
 	health = 700
+	stat_attack = UNCONSCIOUS
 	harm_intent_damage = 8
 	melee_damage_lower = 30
 	melee_damage_upper = 40

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

@@ -15,6 +15,7 @@
 	sentience_type = SENTIENCE_BOSS
 	maxHealth = 600
 	health = 600
+	stat_attack = UNCONSCIOUS
 	reach = 2
 	speed = 1
 	obj_damage = 200

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

@@ -214,6 +214,7 @@
 	icon_living = "enclave_armored"
 	maxHealth = 560
 	health = 650
+	stat_attack = UNCONSCIOUS
 	melee_damage_lower = 20
 	melee_damage_upper = 47
 	extra_projectiles = 2
@@ -344,6 +345,7 @@
 	loot = list(/obj/effect/mob_spawn/human/corpse/bs/paladin)
 	maxHealth = 480
 	health = 480
+	stat_attack = UNCONSCIOUS
 	healable = 1
 	ranged = 1
 	projectiletype = /obj/item/projectile/beam/laser/lasgun/hitscan

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

@@ -248,6 +248,7 @@
 	can_ghost_into = FALSE
 	maxHealth = 200
 	health = 200
+	stat_attack = UNCONSCIOUS
 	speed = 2.5
 	harm_intent_damage = 8
 	melee_damage_lower = 20

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

@@ -151,6 +151,7 @@
 	speed = 5
 	maxHealth = 560
 	health = 560
+	stat_attack = UNCONSCIOUS
 	ranged = 1
 	harm_intent_damage = 8
 	obj_damage = 20

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

@@ -69,6 +69,7 @@
 	guaranteed_butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/mirelurk = 4, /obj/item/stack/sheet/sinew = 2)
 	maxHealth = 160
 	health = 160
+	stat_attack = UNCONSCIOUS
 	melee_damage_lower = 15
 	melee_damage_upper = 28
 	gold_core_spawnable = HOSTILE_SPAWN