Merge branch 'master' into self-gulp-size

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

@@ -151,6 +151,14 @@
 	resistance_flags = FIRE_PROOF
 	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
 
+/obj/item/storage/backpack/atmospheric
+	name = "atmospheric backpack"
+	desc = "It's a backpack made of fire resistant fibers. Smells like plasma."
+	icon_state = "atmospack"
+	item_state = "atmospack"
+	resistance_flags = FIRE_PROOF
+	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
+
 /obj/item/storage/backpack/botany
 	name = "botany backpack"
 	desc = "It's a backpack made of all-natural fibers."
@@ -206,6 +214,14 @@
 	resistance_flags = FIRE_PROOF
 	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
 
+/obj/item/storage/backpack/satchel/atmospheric
+	name = "atmospheric satchel"
+	desc = "A tough satchel made of fire resistant fibers. Smells like plasma."
+	icon_state = "satchel-atmos"
+	item_state = "satchel-atmos"
+	resistance_flags = FIRE_PROOF
+	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
+
 /obj/item/storage/backpack/satchel/med
 	name = "medical satchel"
 	desc = "A sterile satchel used in medical departments."
@@ -466,6 +482,14 @@
 	resistance_flags = FIRE_PROOF
 	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
 
+/obj/item/storage/backpack/duffelbag/atmospheric
+	name = "atmospheric duffel bag"
+	desc = "A large duffel bag made of fire resistant fibers. Smells like plasma."
+	icon_state = "duffel-atmos"
+	item_state = "duffel-atmos"
+	resistance_flags = FIRE_PROOF
+	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
+
 /obj/item/storage/backpack/duffelbag/durathread
 	name = "durathread duffel bag"
 	desc = "A lightweight duffel bag made out of durathread."

code/game/objects/items/tanks/tanks.dm

@@ -6,7 +6,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/tanks_righthand.dmi'
 	flags_1 = CONDUCT_1
 	slot_flags = ITEM_SLOT_BACK
-	// worn_icon = 'icons/mob/clothing/back.dmi' //since these can also get thrown into suit storage slots. if something goes on the belt, set this to null.
+	mob_overlay_icon = 'icons/mob/clothing/back.dmi' //since these can also get thrown into suit storage slots. if something goes on the belt, set this to null.
 	hitsound = 'sound/weapons/smash.ogg'
 	pressure_resistance = ONE_ATMOSPHERE * 5
 	force = 5

code/modules/clothing/suits/utility.dm

@@ -19,7 +19,7 @@
 	gas_transfer_coefficient = 0.9
 	permeability_coefficient = 0.5
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
-	allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/extinguisher, /obj/item/crowbar)
+	allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/extinguisher, /obj/item/crowbar, /obj/item/tank/internals/oxygen, /obj/item/tank/internals/air, /obj/item/tank/internals/generic)
 	slowdown = 1
 	armor = list(MELEE = 15, BULLET = 5, LASER = 20, ENERGY = 10, BOMB = 20, BIO = 10, RAD = 20, FIRE = 100, ACID = 50)
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAUR

code/modules/jobs/job_types/engineer/atmospheric_technician.dm

@@ -44,9 +44,9 @@
 	uniform = /obj/item/clothing/under/rank/engineering/atmospheric_technician
 	r_pocket = /obj/item/analyzer
 
-	backpack = /obj/item/storage/backpack/industrial
-	satchel = /obj/item/storage/backpack/satchel/eng
-	duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+	backpack = /obj/item/storage/backpack/atmospheric
+	satchel = /obj/item/storage/backpack/satchel/atmospheric
+	duffelbag = /obj/item/storage/backpack/duffelbag/atmospheric
 	box = /obj/item/storage/box/survival/engineer
 	pda_slot = ITEM_SLOT_LPOCKET
 	backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
@@ -64,9 +64,9 @@
 	gloves = /obj/item/clothing/gloves/combat
 	head = /obj/item/clothing/head/hardhat/red/upgraded
 
-	backpack = /obj/item/storage/backpack/industrial
-	satchel = /obj/item/storage/backpack/satchel/eng
-	duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+	backpack = /obj/item/storage/backpack/atmospheric
+	satchel = /obj/item/storage/backpack/satchel/atmospheric
+	duffelbag = /obj/item/storage/backpack/duffelbag/atmospheric
 	box = /obj/item/storage/box/survival/syndie
 	pda_slot = ITEM_SLOT_LPOCKET
 	backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1, /obj/item/syndicate_uplink=1)

code/modules/mod/mod_theme.dm

@@ -149,6 +149,7 @@
 	armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 15, BOMB = 10, BIO = 100, FIRE = 100, ACID = 75, WOUND = 10, RAD = 0)
 	resistance_flags = FIRE_PROOF
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+	siemens_coefficient = 0
 	slowdown_inactive = 1.5
 	slowdown_active = 1
 	skins = list(

code/modules/vending/wardrobes.dm

@@ -177,11 +177,12 @@
 	vend_reply = "Спасибо за использование AtmosDrobe!"
 	products = list(/obj/item/clothing/accessory/pocketprotector = 3,
 					/obj/item/clothing/head/beret/atmos = 3,
-					/obj/item/storage/backpack/industrial = 3,
-					/obj/item/storage/backpack/satchel/eng = 3,
-					/obj/item/storage/backpack/duffelbag/engineering = 3,
+					/obj/item/storage/backpack/atmospheric = 3,
+					/obj/item/storage/backpack/satchel/atmospheric = 3,
+					/obj/item/storage/backpack/duffelbag/atmospheric = 3,
 					/obj/item/clothing/head/hardhat/weldhat/dblue = 3,
 					/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3,
+					/obj/item/toy/plush/atmosian = 1,
 					/obj/item/clothing/under/rank/engineering/atmospheric_technician = 5,
 					/obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt = 5,
 					/obj/item/clothing/shoes/sneakers/black = 5)

modular_bluemoon/code/game/objects/items/plushes.dm

@@ -114,3 +114,12 @@
 	'modular_bluemoon/SmiLeY/sounds/tiamat_meow2.ogg' = 1,
 	'modular_bluemoon/SmiLeY/sounds/tiamat_meow3.ogg' = 1
 	)
+
+/obj/item/toy/plush/atmosian
+	name = "Atmosian Plushie"
+	desc = "Очаровательная мягкая игрушка, напоминающая храброго атмосианина. К сожалению, он не устранит разгерметизацию за вас."
+	icon = 'modular_bluemoon/icons/obj/plushes.dmi'
+	icon_state = "plush_atmosian"
+	item_state = "plush_atmosian"
+	attack_verb = list("thumped", "whomped", "bumped")
+	resistance_flags = FIRE_PROOF

modular_bluemoon/phoenix404/modules/vending/wardrobes.dm

@@ -234,11 +234,12 @@
 	products = list(
 		/obj/item/clothing/accessory/pocketprotector = 3,
 		/obj/item/clothing/head/beret/atmos = 3,
-		/obj/item/storage/backpack/industrial = 3,
-		/obj/item/storage/backpack/satchel/eng = 3,
-		/obj/item/storage/backpack/duffelbag/engineering = 3,
+		/obj/item/storage/backpack/atmospheric = 3,
+		/obj/item/storage/backpack/satchel/atmospheric = 3,
+		/obj/item/storage/backpack/duffelbag/atmospheric = 3,
 		/obj/item/clothing/head/hardhat/weldhat/dblue = 3,
 		/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3,
+		/obj/item/toy/plush/atmosian = 1,
 		/obj/item/clothing/under/rank/engineering/atmospheric_technician = 5,
 		/obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt = 5,
 		/obj/item/clothing/shoes/sneakers/black = 5,

tgstation.dme

@@ -1074,7 +1074,6 @@
 #include "code\game\machinery\airlock_control.dm"
 #include "code\game\machinery\announcement_system.dm"
 #include "code\game\machinery\aug_manipulator.dm"
-#include "modular_bluemoon\code\game\machinery\aug_manipulator.dm"
 #include "code\game\machinery\autolathe.dm"
 #include "code\game\machinery\autoloom.dm"
 #include "code\game\machinery\bank_machine.dm"
@@ -1111,7 +1110,6 @@
 #include "code\game\machinery\mass_driver.dm"
 #include "code\game\machinery\navbeacon.dm"
 #include "code\game\machinery\PDApainter.dm"
-#include "modular_bluemoon\code\game\machinery\PDApainter.dm"
 #include "code\game\machinery\posi_alert.dm"
 #include "code\game\machinery\prisonlabor.dm"
 #include "code\game\machinery\quantum_pad.dm"
@@ -1375,7 +1373,6 @@
 #include "code\game\objects\items\circuitboards\circuitboard.dm"
 #include "code\game\objects\items\circuitboards\computer_circuitboards.dm"
 #include "code\game\objects\items\circuitboards\machine_circuitboards.dm"
-#include "modular_bluemoon\code\game\objects\items\circuitboards\machine_circuitboards.dm"
 #include "code\game\objects\items\devices\aicard.dm"
 #include "code\game\objects\items\devices\anomaly_neutralizer.dm"
 #include "code\game\objects\items\devices\beacon.dm"
@@ -4237,11 +4234,6 @@
 #include "modular__juicy\code\modules\vending\kinkmate.dm"
 #include "modular_bluemoon\0451\code\modules\mining\shelters.dm"
 #include "modular_bluemoon\0451\code\modules\mining\equipment\survival_pod.dm"
-#include "modular_bluemoon\icemoon\icemoon_areas.dm"
-#include "modular_bluemoon\icemoon\items.dm"
-#include "modular_bluemoon\replica_stamps\code\paper.dm"
-#include "modular_bluemoon\replica_stamps\code\replica_stamps.dm"
-#include "modular_bluemoon\replica_stamps\code\stamp_base.dm"
 #include "modular_bluemoon\_maps\PrisonStation\job_changes.dm"
 #include "modular_bluemoon\_medicalAndCyberpunk\code\augments_arms.dm"
 #include "modular_bluemoon\_medicalAndCyberpunk\code\augments_chest.dm"
@@ -4268,13 +4260,16 @@
 #include "modular_bluemoon\code\datums\mood_events\negative_mood_events.dm"
 #include "modular_bluemoon\code\datums\mood_events\positive_mood_events.dm"
 #include "modular_bluemoon\code\datums\traits\neutral.dm"
+#include "modular_bluemoon\code\game\machinery\aug_manipulator.dm"
 #include "modular_bluemoon\code\game\machinery\cloth_drive.dm"
+#include "modular_bluemoon\code\game\machinery\PDApainter.dm"
 #include "modular_bluemoon\code\game\objects\anti_singulo.dm"
 #include "modular_bluemoon\code\game\objects\effects\decals\cleanable\misc.dm"
 #include "modular_bluemoon\code\game\objects\items\fleshlight.dm"
 #include "modular_bluemoon\code\game\objects\items\inducer.dm"
 #include "modular_bluemoon\code\game\objects\items\pinpointer.dm"
 #include "modular_bluemoon\code\game\objects\items\plushes.dm"
+#include "modular_bluemoon\code\game\objects\items\circuitboards\machine_circuitboards.dm"
 #include "modular_bluemoon\code\game\objects\items\devices\multitool.dm"
 #include "modular_bluemoon\code\game\objects\items\devices\scanners.dm"
 #include "modular_bluemoon\code\game\objects\items\lewd_items\genital_equipment\chastity\flat_chastity_cage.dm"
@@ -4316,6 +4311,7 @@
 #include "modular_bluemoon\code\modules\projectiles\projectile.dm"
 #include "modular_bluemoon\code\modules\reagents\chemistry\reagents\other_reagents.dm"
 #include "modular_bluemoon\code\modules\reagents\chemistry\recipes\recipes.dm"
+#include "modular_bluemoon\code\modules\research\designs\machine_desings\machine_designs_all_misc.dm"
 #include "modular_bluemoon\code\modules\resize\resizing.dm"
 #include "modular_bluemoon\code\modules\surgery\amputation_robotic.dm"
 #include "modular_bluemoon\cooling_device\cooling_device.dm"
@@ -4462,6 +4458,8 @@
 #include "modular_bluemoon\heavy_and_superheavy_quirks\traits.dm"
 #include "modular_bluemoon\honest_box\honest_box.dm"
 #include "modular_bluemoon\iamasay's_things\pieces_of_paper.dm"
+#include "modular_bluemoon\icemoon\icemoon_areas.dm"
+#include "modular_bluemoon\icemoon\items.dm"
 #include "modular_bluemoon\icons\code\under.dm"
 #include "modular_bluemoon\jobs_species_blacklist\jobs_species_blacklist.dm"
 #include "modular_bluemoon\jukebox\jukebox_function.dm"
@@ -4555,6 +4553,7 @@
 #include "modular_bluemoon\MRSKO\code\modules\mod\mod_types.dm"
 #include "modular_bluemoon\MRSKO\code\uplink\uplink_items.dm"
 #include "modular_bluemoon\nopeingeener\code\donator.dm"
+#include "modular_bluemoon\olgachan\greysonplush\code\grayson.dm"
 #include "modular_bluemoon\oni3288\code\catcrin_stuff.dm"
 #include "modular_bluemoon\oni3288\code\pipebomb.dm"
 #include "modular_bluemoon\Painiscupcake\code\game\objects\items\heroin.dm"
@@ -4641,6 +4640,9 @@
 #include "modular_bluemoon\Ren\Code\staff\bundles_and_outfits.dm"
 #include "modular_bluemoon\Ren\Code\staff\plasma_weapon.dm"
 #include "modular_bluemoon\Ren\Code\staff\uplink.dm"
+#include "modular_bluemoon\replica_stamps\code\paper.dm"
+#include "modular_bluemoon\replica_stamps\code\replica_stamps.dm"
+#include "modular_bluemoon\replica_stamps\code\stamp_base.dm"
 #include "modular_bluemoon\sanecman\_include.dm"
 #include "modular_bluemoon\sanecman\code\katana_zero\outfit.dm"
 #include "modular_bluemoon\service_staff\service_staff.dm"
@@ -5948,5 +5950,4 @@
 #include "modular_splurt\code\modules\vending\snack.dm"
 #include "modular_splurt\code\modules\vending\wardrobes.dm"
 #include "tools\Redirector\textprocs.dm"
-#include "modular_bluemoon/olgachan/greysonplush/code/grayson.dm"
 // END_INCLUDE