From 6dc9e56a446ba6d0e185256e9afc4197eabdec52 Mon Sep 17 00:00:00 2001
From: Unknown <RedKerensky@Gmail.com>
Date: Tue, 16 Oct 2018 17:27:35 -0400
Subject: [PATCH] Shelter Capsule Content Tweaks

- Adds some more synth batteries to both capsules
- Removed the Adv first aid kit from the table
- Adds a Basic/Adv/O2/Fire/Toxin kit to luxury storage
- Removes the violin due to being a source of grief
- Changes the bag of dice to a bag of gaming dice
- Luxury capsule now has twice the amount of MREs

The main reasons for this PR:
- Removes shelter capsules as a source of violins, which have been involved in a few... incidents
- Equals the amount of batteries to the amount of liquid foods in the basic capsule, so that synth crew are not required to push for the luxury capsule and its recharger
- Adds a toxin kit to shelter capsules, since toxins are a bigger issue in the phoron-based atmosphere of V2
- Provides a health analyzer to the shelter capsule, the omission of which was very strange.

Rest of the kits were added just for completion sake. All of the ones included be obtained from cargo for a single ten point crate, so the effects on balance will be minimal.
---
 code/modules/mining/shelter_atoms.dm | 28 ++++++++++++++++++++++------
 maps/submaps/shelters/shelter_2.dmm  |  5 +----
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/code/modules/mining/shelter_atoms.dm b/code/modules/mining/shelter_atoms.dm
index 25af7b13940..aa5bbed628b 100644
--- a/code/modules/mining/shelter_atoms.dm
+++ b/code/modules/mining/shelter_atoms.dm
@@ -211,6 +211,7 @@
 	pixel_y = -4
 	max_n_of_items = 10
 	var/empty = FALSE
+	var/luxury = FALSE
 
 /obj/machinery/smartfridge/survival_pod/initialize(mapload)
 	. = ..()
@@ -219,15 +220,27 @@
 	for(var/i in 1 to 5)
 		var/obj/item/weapon/reagent_containers/food/snacks/liquidfood/W = new(src)
 		stock(W)
-	for(var/i in 1 to 2)
+	for(var/i in 1 to 5)
 		var/obj/item/device/fbp_backup_cell/W = new(src)
 		stock(W)
-	if(prob(50))
-		var/obj/item/weapon/storage/pill_bottle/dice/D = new(src)
+	for(var/i in 1 to 1)
+		var/obj/item/weapon/storage/pill_bottle/dice_nerd/D = new(src)
 		stock(D)
-	else
-		var/obj/item/device/instrument/violin/V = new(src)
-		stock(V)
+	if(luxury)
+		for(var/i in 1 to 5)
+			var/obj/item/weapon/reagent_containers/food/snacks/liquidfood/W = new(src)
+			stock(W)
+		for(var/i in 1 to 1)
+			var/obj/item/weapon/storage/firstaid/regular/B = new(src)
+			stock(B)
+			var/obj/item/weapon/storage/firstaid/fire/F = new(src)
+			stock(F)
+			var/obj/item/weapon/storage/firstaid/toxin/T = new(src)
+			stock(T)
+			var/obj/item/weapon/storage/firstaid/o2/O = new(src)
+			stock(O)
+			var/obj/item/weapon/storage/firstaid/adv/A = new(src)
+			stock(A)
 
 /obj/machinery/smartfridge/survival_pod/accept_check(obj/item/O)
 	return isitem(O)
@@ -237,6 +250,9 @@
 	desc = "A heated storage unit. This one's seen better days."
 	empty = TRUE
 
+/obj/machinery/smartfridge/survival_pod/luxury
+	luxury = TRUE
+
 //Fans
 /obj/structure/fans
 	icon = 'icons/obj/survival_pod.dmi'
diff --git a/maps/submaps/shelters/shelter_2.dmm b/maps/submaps/shelters/shelter_2.dmm
index f06fb904205..a4ce4684801 100644
--- a/maps/submaps/shelters/shelter_2.dmm
+++ b/maps/submaps/shelters/shelter_2.dmm
@@ -31,7 +31,7 @@
 /turf/simulated/shuttle/floor/voidcraft,
 /area/survivalpod)
 "f" = (
-/obj/machinery/smartfridge/survival_pod,
+/obj/machinery/smartfridge/survival_pod/luxury,
 /turf/simulated/shuttle/floor/voidcraft,
 /area/survivalpod)
 "g" = (
@@ -87,9 +87,6 @@
 /area/survivalpod)
 "p" = (
 /obj/structure/table/survival_pod,
-/obj/item/weapon/storage/firstaid/adv{
-	pixel_x = 4
-	},
 /turf/simulated/shuttle/floor/voidcraft,
 /area/survivalpod)
 "q" = (