Improves Oldstation/Charlie Station (#39248)

* Improves Oldstation/Charlie Station

* Actually adds titanium

* Removes dvars

code/game/objects/items/cards_ids.dm

@@ -384,25 +384,27 @@ update_label("John Doe", "Clowny")
 /obj/item/card/id/away/old
 	name = "a perfectly generic identification card"
 	desc = "A perfectly generic identification card. Looks like it could use some flavor."
-	access = list(ACCESS_AWAY_GENERAL)
+	icon_state = "centcom"
 
 /obj/item/card/id/away/old/sec
-	name = "Security Officer ID"
+	name = "Charlie Station Security Officer's ID card"
-	desc = "Security officers ID card."
+	desc = "A faded Charlie Station ID card. You can make out the rank \"Security Officer\"."
-	icon_state = "centcom"
+	assignment = "Charlie Station Security Officer"
+	access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_SEC)
 
 /obj/item/card/id/away/old/sci
-	name = "Scientist ID"
+	name = "Charlie Station Scientist's ID card"
-	desc = "Scientists ID card."
+	desc = "A faded Charlie Station ID card. You can make out the rank \"Scientist\"."
-	icon_state = "centcom"
+	assignment = "Charlie Station Scientist"
+	access = list(ACCESS_AWAY_GENERAL)
 
 /obj/item/card/id/away/old/eng
-	name = "Engineer ID"
+	name = "Charlie Station Engineer's ID card"
-	desc = "Engineers ID card."
+	desc = "A faded Charlie Station ID card. You can make out the rank \"Station Engineer\"."
-	icon_state = "centcom"
+	assignment = "Charlie Station Engineer"
+	access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_ENGINE)
 
 /obj/item/card/id/away/old/apc
 	name = "APC Access ID"
-	desc = "Special ID card to allow access to APCs."
+	desc = "A special ID card that allows access to APC terminals."
-	icon_state = "centcom"
 	access = list(ACCESS_ENGINE_EQUIP)

code/game/objects/structures/ghost_role_spawners.dm

@@ -477,7 +477,8 @@
 	mob_species = /datum/species/human
 	flavour_text = "<span class='big bold'>You are a security officer working for Nanotrasen,</span><b> stationed onboard a state of the art research station. You vaguely recall rushing into a \
 	cryogenics pod due to an oncoming radiation storm. The last thing you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \
-	your eyes, everything seems rusted and broken, a dark feeling sweels in your gut as you climb out of your pod.</b>"
+	your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod. \
+	Work as a team with your fellow survivors and do not abandon them.</b>"
 	uniform = /obj/item/clothing/under/rank/security
 	shoes = /obj/item/clothing/shoes/jackboots
 	id = /obj/item/card/id/away/old/sec
@@ -501,7 +502,8 @@
 	mob_species = /datum/species/human
 	flavour_text = "<span class='big bold'>You are an engineer working for Nanotrasen,</span><b> stationed onboard a state of the art research station. You vaguely recall rushing into a \
 	cryogenics pod due to an oncoming radiation storm. The last thing you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \
-	your eyes, everything seems rusted and broken, a dark feeling sweels in your gut as you climb out of your pod.</b>"
+	your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod. \
+	Work as a team with your fellow survivors and do not abandon them.</b>"
 	uniform = /obj/item/clothing/under/rank/engineer
 	shoes = /obj/item/clothing/shoes/workboots
 	id = /obj/item/card/id/away/old/eng
@@ -525,7 +527,8 @@
 	mob_species = /datum/species/human
 	flavour_text = "<span class='big bold'>You are a scientist working for Nanotrasen,</span><b> stationed onboard a state of the art research station. You vaguely recall rushing into a \
 	cryogenics pod due to an oncoming radiation storm. The last thing you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \
-	your eyes, everything seems rusted and broken, a dark feeling sweels in your gut as you climb out of your pod.</b>"
+	your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod. \
+	Work as a team with your fellow survivors and do not abandon them.</b>"
 	uniform = /obj/item/clothing/under/rank/scientist
 	shoes = /obj/item/clothing/shoes/laceup
 	id = /obj/item/card/id/away/old/sci

code/modules/reagents/reagent_containers/bottle.dm

@@ -302,3 +302,105 @@
 	name = "BVAK bottle"
 	desc = "A small bottle containing Bio Virus Antidote Kit."
 	list_reagents = list("atropine" = 5, "epinephrine" = 5, "salbutamol" = 10, "spaceacillin" = 10)
+
+//Oldstation.dmm chemical storage bottles
+
+/obj/item/reagent_containers/glass/bottle/hydrogen
+	name = "hydrogen bottle"
+	list_reagents = list("hydrogen" = 30)
+
+/obj/item/reagent_containers/glass/bottle/lithium
+	name = "lithium bottle"
+	list_reagents = list("lithium" = 30)
+
+/obj/item/reagent_containers/glass/bottle/carbon
+	name = "carbon bottle"
+	list_reagents = list("carbon" = 30)
+
+/obj/item/reagent_containers/glass/bottle/nitrogen
+	name = "nitrogen bottle"
+	list_reagents = list("nitrogen" = 30)
+
+/obj/item/reagent_containers/glass/bottle/oxygen
+	name = "oxygen bottle"
+	list_reagents = list("oxygen" = 30)
+
+/obj/item/reagent_containers/glass/bottle/fluorine
+	name = "fluorine bottle"
+	list_reagents = list("fluorine" = 30)
+
+/obj/item/reagent_containers/glass/bottle/sodium
+	name = "sodium bottle"
+	list_reagents = list("sodium" = 30)
+
+/obj/item/reagent_containers/glass/bottle/aluminium
+	name = "aluminium bottle"
+	list_reagents = list("aluminium" = 30)
+
+/obj/item/reagent_containers/glass/bottle/silicon
+	name = "silicon bottle"
+	list_reagents = list("silicon" = 30)
+
+/obj/item/reagent_containers/glass/bottle/phosphorus
+	name = "phosphorus bottle"
+	list_reagents = list("phosphorus" = 30)
+
+/obj/item/reagent_containers/glass/bottle/sulfur
+	name = "sulfur bottle"
+	list_reagents = list("sulfur" = 30)
+
+/obj/item/reagent_containers/glass/bottle/chlorine
+	name = "chlorine bottle"
+	list_reagents = list("chlorine" = 30)
+
+/obj/item/reagent_containers/glass/bottle/potassium
+	name = "potassium bottle"
+	list_reagents = list("potassium" = 30)
+
+/obj/item/reagent_containers/glass/bottle/iron
+	name = "iron bottle"
+	list_reagents = list("iron" = 30)
+
+/obj/item/reagent_containers/glass/bottle/copper
+	name = "copper bottle"
+	list_reagents = list("copper" = 30)
+
+/obj/item/reagent_containers/glass/bottle/mercury
+	name = "mercury bottle"
+	list_reagents = list("mercury" = 30)
+
+/obj/item/reagent_containers/glass/bottle/radium
+	name = "radium bottle"
+	list_reagents = list("radium" = 30)
+
+/obj/item/reagent_containers/glass/bottle/water
+	name = "water bottle"
+	list_reagents = list("water" = 30)
+
+/obj/item/reagent_containers/glass/bottle/ethanol
+	name = "ethanol bottle"
+	list_reagents = list("ethanol" = 30)
+
+/obj/item/reagent_containers/glass/bottle/sugar
+	name = "sugar bottle"
+	list_reagents = list("sugar" = 30)
+
+/obj/item/reagent_containers/glass/bottle/sacid
+	name = "sulphuric acid bottle"
+	list_reagents = list("sacid" = 30)
+
+/obj/item/reagent_containers/glass/bottle/welding_fuel
+	name = "welding fuel bottle"
+	list_reagents = list("welding_fuel" = 30)
+
+/obj/item/reagent_containers/glass/bottle/silver
+	name = "silver bottle"
+	list_reagents = list("silver" = 30)
+
+/obj/item/reagent_containers/glass/bottle/iodine
+	name = "iodine bottle"
+	list_reagents = list("iodine" = 30)
+
+/obj/item/reagent_containers/glass/bottle/bromine
+	name = "bromine bottle"
+	list_reagents = list("bromine" = 30)

code/modules/reagents/reagent_containers/glass.dm

@@ -331,103 +331,3 @@
 
 /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty
 	list_reagents = list()
-
-/obj/item/reagent_containers/glass/beaker/large/hydrogen
-	name = "hydrogen beaker"
-	list_reagents = list("hydrogen" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/lithium
-	name = "lithium beaker"
-	list_reagents = list("lithium" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/carbon
-	name = "carbon beaker"
-	list_reagents = list("carbon" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/nitrogen
-	name = "nitrogen beaker"
-	list_reagents = list("nitrogen" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/oxygen
-	name = "oxygen beaker"
-	list_reagents = list("oxygen" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/fluorine
-	name = "fluorine beaker"
-	list_reagents = list("fluorine" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/sodium
-	name = "sodium beaker"
-	list_reagents = list("sodium" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/aluminium
-	name = "aluminium beaker"
-	list_reagents = list("aluminium" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/silicon
-	name = "silicon beaker"
-	list_reagents = list("silicon" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/phosphorus
-	name = "phosphorus beaker"
-	list_reagents = list("phosphorus" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/sulfur
-	name = "sulfur beaker"
-	list_reagents = list("sulfur" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/chlorine
-	name = "chlorine beaker"
-	list_reagents = list("chlorine" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/potassium
-	name = "potassium beaker"
-	list_reagents = list("potassium" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/iron
-	name = "iron beaker"
-	list_reagents = list("iron" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/copper
-	name = "copper beaker"
-	list_reagents = list("copper" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/mercury
-	name = "mercury beaker"
-	list_reagents = list("mercury" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/radium
-	name = "radium beaker"
-	list_reagents = list("radium" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/water
-	name = "water beaker"
-	list_reagents = list("water" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/ethanol
-	name = "ethanol beaker"
-	list_reagents = list("ethanol" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/sugar
-	name = "sugar beaker"
-	list_reagents = list("sugar" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/sacid
-	name = "sulphuric acid beaker"
-	list_reagents = list("sacid" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/welding_fuel
-	name = "welding fuel beaker"
-	list_reagents = list("welding_fuel" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/silver
-	name = "silver beaker"
-	list_reagents = list("silver" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/iodine
-	name = "iodine beaker"
-	list_reagents = list("iodine" = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/bromine
-	name = "bromine beaker"
-	list_reagents = list("bromine" = 50)

code/modules/ruins/spaceruin_code/oldstation.dm

@@ -47,3 +47,7 @@
 	<b>SIGNIFICANT EVENTS OF NOTE</b><br>1: The primary radiation detectors were taken offline after 112 years due to power failure, secondary radiation detectors showed no residual \
 	radiation on station. Deduction, primarily detector was malfunctioning and was producing a radiation signal when there was none.<br><br>2: A data burst from a nearby Nanotrasen Space \
 	Station was received, this data burst contained research data that has been uploaded to our RnD labs.<br><br>3: Unknown invasion force has occupied Delta station."
+
+/obj/item/paper/fluff/ruins/oldstation/generator_manual
+	name = "S.U.P.E.R.P.A.C.M.A.N.-type portable generator manual"
+	info = "You can barely make out a faded sentence... <br><br> Wrench down the generator on top of a wire node connected to either a SMES input terminal or the power grid."