Merge branch 'master' into cyclops-fixes

aurorastation.dme

@@ -3150,6 +3150,7 @@
 #include "code\modules\power\fractal_reactor.dm"
 #include "code\modules\power\generator.dm"
 #include "code\modules\power\gravitygenerator.dm"
+#include "code\modules\power\outlet.dm"
 #include "code\modules\power\portgen.dm"
 #include "code\modules\power\power.dm"
 #include "code\modules\power\power_usage.dm"

code/game/machinery/atmoalter/canister.dm

@@ -169,7 +169,7 @@
 	can_label = 0
 
 /obj/machinery/portable_atmospherics/canister/air/airlock
-	start_pressure = 3 * ONE_ATMOSPHERE
+	start_pressure = 6 * ONE_ATMOSPHERE
 
 /obj/machinery/portable_atmospherics/canister/empty
 	start_pressure = 0

code/game/objects/items/weapons/cigs_lighters.dm

@@ -583,6 +583,7 @@ ABSTRACT_TYPE(/obj/item/clothing/mask/smokable)
 	icon_off = "pipeoff"
 	w_class = WEIGHT_CLASS_TINY
 	chem_volume = 30
+	burn_rate = 0.003
 	matchmes = SPAN_NOTICE("USER lights their NAME with their FLAME.")
 	lightermes = SPAN_NOTICE("USER manages to light their NAME with FLAME.")
 	zippomes = SPAN_NOTICE("With much care, USER lights their NAME with their FLAME.")

code/game/objects/random/clothing.dm

@@ -1,5 +1,6 @@
 /obj/random/belt
 	name = "random belt"
+	icon_state = "toolbelt"
 	problist = list(
 		/obj/item/storage/belt/utility = 1,
 		/obj/item/storage/belt/medical = 0.4,
@@ -14,6 +15,7 @@
 // Novelty and rare backpacks have lower weights.
 /obj/random/backpack
 	name = "random backpack"
+	icon_state = "backpack"
 	problist = list(
 		/obj/item/storage/backpack = 3,
 		/obj/item/storage/backpack/cultpack = 2,
@@ -63,8 +65,7 @@
 /obj/random/colored_jumpsuit
 	name = "random colored jumpsuit"
 	desc = "This is a random colored jumpsuit."
-	icon = 'icons/obj/clothing/uniforms.dmi'
-	icon_state = "black"
+	icon_state = "uniform"
 	spawnlist = list(
 		/obj/item/clothing/under/color/black,
 		/obj/item/clothing/under/color/blue,
@@ -91,8 +92,7 @@
 /obj/random/suit
 	name = "random suit"
 	desc = "This is a random suit."
-	icon = 'icons/obj/clothing/uniforms.dmi'
-	icon_state = "checkered_suit"
+	icon_state = "uniform"
 	spawnlist = list(
 		/obj/item/clothing/under/suit_jacket/charcoal,
 		/obj/item/clothing/under/suit_jacket/navy,
@@ -109,8 +109,7 @@
 /obj/random/chameleon
 	name = "random possible chameleon item"
 	desc = "A random possible chameleon item. What could possibly go wrong?"
-	icon = 'icons/obj/clothing/gloves.dmi'
-	icon_state = "yellow"
+	icon_state = "uniform"
 	problist = list(
 
 		/obj/item/clothing/gloves/chameleon = 1,
@@ -143,8 +142,7 @@
 /obj/random/gloves
 	name = "random gloves"
 	desc = "Random gloves, assorted usefulness."
-	icon = 'icons/obj/clothing/gloves.dmi'
-	icon_state = "yellow"
+	icon_state = "gloves"
 	problist = list(
 		/obj/item/clothing/gloves/black = 1,
 		/obj/item/clothing/gloves/black_leather = 0.5,
@@ -162,7 +160,6 @@
 /obj/random/watches
 	name = "random watches"
 	desc = "Random watches, probably able to tell the time."
-	icon = 'icons/obj/clothing/gloves.dmi'
 	icon_state = "watch"
 	problist = list(
 		/obj/item/clothing/wrists/watch = 1,
@@ -174,8 +171,7 @@
 /obj/random/hoodie
 	name = "random winter coat"
 	desc = "This is a random winter coat."
-	icon = 'icons/obj/clothing/hoodies.dmi'
-	icon_state = "coatwinter"
+	icon_state = "wintercoat"
 	problist = list(
 		/obj/item/clothing/suit/storage/hooded/wintercoat = 5,
 		/obj/item/clothing/suit/storage/hooded/wintercoat/engineering = 3,
@@ -192,7 +188,6 @@
 /obj/random/bandana
 	name = "random bandana"
 	desc = "This is a random bandana."
-	icon = 'icons/obj/clothing/hats/bandanas.dmi'
 	icon_state = "bandana"
 	problist = list(
 		/obj/item/clothing/head/bandana/colorable/random = 5,
@@ -210,7 +205,6 @@
 /obj/random/softcap
 	name = "random softcap"
 	desc = "This is a random softcap."
-	icon = 'icons/obj/clothing/hats/soft_caps.dmi'
 	icon_state = "softcap"
 	problist = list(
 		/obj/item/clothing/head/softcap/colorable/random = 5,
@@ -228,7 +222,6 @@
 /obj/random/beret
 	name = "random beret"
 	desc = "This is a random beret."
-	icon = 'icons/obj/clothing/hats/berets.dmi'
 	icon_state = "beret"
 	problist = list(
 		/obj/item/clothing/head/beret/colorable/random = 5,
@@ -247,8 +240,7 @@
 /obj/random/hardhat
 	name = "random hardhat"
 	desc = "This is a random hardhat."
-	icon = 'icons/obj/clothing/hats/hardhats.dmi'
-	icon_state = "hardhat_yellow"
+	icon_state = "hardhat"
 	problist = list(
 		/obj/item/clothing/head/hardhat = 1,
 		/obj/item/clothing/head/hardhat/orange = 1,
@@ -264,8 +256,7 @@
 /obj/random/wizard_dressup
 	name = "random wizard clothes"
 	desc = "This is a random piece of fake wizard clothing."
-	icon = 'icons/obj/wizard.dmi'
-	icon_state = "staff"
+	icon_state = "wizardstaff"
 	has_postspawn = TRUE
 
 /obj/random/wizard_dressup/spawn_item()

code/game/objects/random/food.dm

@@ -1,8 +1,7 @@
 /obj/random/mre
 	name = "random MRE"
 	desc = "This is a random single MRE."
-	icon = 'icons/obj/storage/fancy/mre.dmi'
-	icon_state = "mre"
+	icon_state = "mre_bag"
 	spawnlist = list(
 		/obj/item/storage/box/fancy/mre,
 		/obj/item/storage/box/fancy/mre/menu2,
@@ -19,7 +18,7 @@
 /obj/random/mre/main
 	name = "random MRE main course"
 	desc = "This is a random main course for MREs."
-	icon_state = "pouch_medium"
+	icon_state = "mre_meal"
 	spawnlist = list(
 		/obj/item/storage/box/fancy/mrebag,
 		/obj/item/storage/box/fancy/mrebag/menu2,
@@ -34,7 +33,7 @@
 /obj/random/mre/dessert
 	name = "random MRE dessert"
 	desc = "This is a random dessert for MREs."
-	icon_state = "pouch_medium"
+	icon_state = "mre_desert"
 	spawnlist = list(
 		/obj/item/reagent_containers/food/snacks/candy,
 		/obj/item/reagent_containers/food/snacks/cb01,
@@ -93,7 +92,7 @@
 /obj/random/mre/spread
 	name = "random MRE spread"
 	desc = "This is a random spread packet for MREs."
-	icon_state = "packet_small"
+	icon_state = "packet_medium"
 	spawnlist = list(
 		/obj/item/reagent_containers/food/condiment/small/packet/jelly,
 		/obj/item/reagent_containers/food/condiment/small/packet/honey
@@ -107,7 +106,7 @@
 /obj/random/mre/sauce
 	name = "random MRE sauce"
 	desc = "This is a random sauce packet for MREs."
-	icon_state = "packet_small"
+	icon_state = "packet_medium"
 	spawnlist = list(
 		/obj/item/reagent_containers/food/condiment/small/packet/salt,
 		/obj/item/reagent_containers/food/condiment/small/packet/pepper,
@@ -152,7 +151,6 @@
 /obj/random/booze
 	name = "random alcohol bottle"
 	desc = "This is a random alcohol bottle."
-	icon = 'icons/obj/drinks.dmi'
 	icon_state = "broken_bottle"
 	spawnlist = list(
 		/obj/item/reagent_containers/food/drinks/bottle/gin,
@@ -190,8 +188,7 @@
 /obj/random/keg
 	name = "random alcohol keg"
 	desc = "Contains a random alcohol keg."
-	icon = 'icons/obj/reagent_dispensers.dmi'
-	icon_state = "beertankTEMP"
+	icon_state = "keg"
 	spawnlist = list(
 		/obj/structure/reagent_dispensers/keg/beerkeg = 2,
 		/obj/structure/reagent_dispensers/keg/beerkeg/rice = 0.5,
@@ -203,8 +200,7 @@
 /obj/random/pizzabox
 	name = "random pizzabox"
 	desc = "Contains a random pizzabox."
-	icon = 'icons/obj/storage/fancy/pizzabox.dmi'
-	icon_state = "pizzabox1"
+	icon_state = "pizzabox"
 	spawnlist = list(
 		/obj/item/pizzabox/margherita,
 		/obj/item/pizzabox/vegetable,