Random Changes, Fixes, Additions Go (#7128)

maps/southern_cross/southern_cross-1.dmm

@@ -10309,8 +10309,7 @@
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/airlock/glass_research{
 	name = "Expedition Shuttle";
-	req_access = list();
-	req_one_access = list(5,11,24,43,67)
+	req_one_access = null
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/hangar/three)
@@ -12996,7 +12995,7 @@
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/airlock/glass_research{
 	name = "Expedition Shuttle";
-	req_access = list(43)
+	req_access = list(47)
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/rnd/research/firstdeck/hallway)

maps/southern_cross/southern_cross-2.dmm

@@ -33840,10 +33840,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/green{
 	d1 = 2;

maps/southern_cross/submaps/gateway/darkrps.dmm

@@ -1650,7 +1650,7 @@
 /area/awaymission/darkrp/brokehouse)
 "ceR" = (
 /obj/effect/decal/cleanable/dirt,
-/mob/living/simple_mob/humanoid/merc/melee/drone,
+/mob/living/simple_mob/humanoid/merc/melee,
 /turf/simulated/floor/tiled,
 /area/awaymission/darkrp/warehouse2)
 "cfu" = (

modular_chomp/code/datums/crafting/recipes.dm

@@ -0,0 +1,34 @@
+/datum/crafting_recipe/ziplaser
+	name = "Ziplaser"
+	result = /obj/item/weapon/gun/energy/zip/craftable
+	reqs = list(list(/obj/item/weapon/cell/high  = 1),
+		list(/obj/item/stack/rods  = 2),
+		list(/obj/item/stack/material/steel  = 8),
+		list(/obj/item/stack/material/plastic  = 5),
+		list(/obj/item/weapon/cell/device  = 2)
+		)
+	time = 120
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+
+/datum/crafting_recipe/primitive_platecarrier
+	name = "primitive plate carrier"
+	result = /obj/item/clothing/suit/armor/pcarrier/primative
+	reqs = list(
+		list(/obj/item/stack/material/leather = 10),
+		list(/obj/item/stack/rods = 4),
+		list(/obj/item/stack/material/cloth = 5)
+	)
+	time = 120
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/surgerytable
+	name = "surgery table"
+	result = /obj/machinery/optable
+	reqs = list(
+		list(/obj/item/stack/material/silver = 12),
+		list(/obj/item/stack/rods = 10),
+		list(/obj/item/stack/material/leather = 1)
+	)
+	time = 240
+	category = CAT_MISC

modular_chomp/code/modules/client/preference_setup/loadout/loadout_suit.dm

@@ -15,3 +15,14 @@
 	"Tan Plate Carrier" = /obj/item/clothing/suit/armor/pcarrier/tan
 	)
 	gear_tweaks += new/datum/gear_tweak/path(pcarriers)
+
+
+/datum/gear/suit/winterhood
+	display_name = "Winter Hood"
+	path = /obj/item/clothing/head/hood/cloak/winter
+	cost = 0
+
+/datum/gear/suit/martianminer
+	display_name = "Martian Miner Coat"
+	path = /obj/item/clothing/suit/storage/vest/martian_miner/unarmored
+	cost = 1

modular_chomp/code/modules/clothing/suits/armor.dm

@@ -3,3 +3,14 @@
 		SPECIES_TESHARI = 'icons/inventory/suit/mob_teshari.dmi',
 		SPECIES_VOX = 'modular_chomp/icons/inventory/suit/mob_vox.dmi'
 		)
+/obj/item/clothing/suit/armor/pcarrier/primative
+	name = "makeshift suit"
+	desc = "A lightweight makeshift plate carrier vest"
+	slowdown = 0.5
+	icon_state = "explorer"
+	flags = THICKMATERIAL
+	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
+	cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+
+/obj/item/clothing/suit/storage/vest/martian_miner/unarmored
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 25, bio = 0, rad = 0)

modular_chomp/code/modules/mob/living/carbon/human/species/station/traits/negative.dm

@@ -9,5 +9,5 @@
 	custom_only = FALSE
 	can_take = ORGANICS
 
-	var_changes = list("minimum_breath_pressure" = 22)
+	var_changes = list("minimum_breath_pressure" = 18)
 	excludes = list(/datum/trait/positive/light_breather)

modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/sif.dm

@@ -33,6 +33,15 @@
 /mob/living/simple_mob/animal/sif/frostfly
 	maxHealth = 32
 	health = 32
+	armor_soak = list(
+			"melee" = 0,
+			"bullet" = 0,
+			"laser" = 5,
+			"energy" = 0,
+			"bomb" = 0,
+			"bio" = 0,
+			"rad" = 0
+			)
 
 /mob/living/simple_mob/vore/aggressive/deathclaw
 	maxHealth = 100

modular_chomp/code/modules/projectiles/guns/alts.dm

@@ -0,0 +1,2 @@
+/obj/item/weapon/gun/energy/zip/craftable
+	battery_lock = 1 //makeshift gun has flaws

modular_chomp/code/modules/projectiles/precursor/freezegun.dm

@@ -9,7 +9,7 @@
 	origin_tech = list(TECH_COMBAT = 6, TECH_POWER = 5, TECH_PRECURSOR = 3)
 
 
-	charge_cost = 480 //How much energy is needed to fire.
+	charge_cost = 120 //How much energy is needed to fire.
 
 	accept_cell_type = /obj/item/weapon/cell/device
 	cell_type = /obj/item/weapon/cell/device/weapon

modular_chomp/maps/overmap/space_pois/debris2_20x20.dmm

@@ -1,68 +1,629 @@
-"a" = (/turf/template_noop,/area/template_noop)
-"b" = (/turf/simulated/floor/tiled/airless,/area/submap/debris2)
-"c" = (/obj/random/medical/pillbottle,/turf/simulated/floor/tiled/airless,/area/submap/debris2)
-"d" = (/turf/simulated/wall/r_wall,/area/submap/debris2)
-"e" = (/obj/item/stack/cable_coil/cut,/turf/simulated/floor,/area/submap/debris2)
-"h" = (/obj/structure/girder,/turf/template_noop,/area/submap/debris2)
-"i" = (/obj/item/stack/rods,/mob/living/simple_mob/animal/space/carp/large,/turf/template_noop,/area/submap/debris2)
-"j" = (/obj/structure/loot_pile/surface/bones,/turf/simulated/floor/tiled/airless,/area/submap/debris2)
-"k" = (/mob/living/simple_mob/animal/space/carp/large/huge,/turf/template_noop,/area/submap/debris2)
-"l" = (/obj/structure/girder,/turf/simulated/floor/plating,/area/submap/debris2)
-"m" = (/obj/structure/grille/broken,/turf/template_noop,/area/submap/debris2)
-"n" = (/obj/item/stack/cable_coil/cut,/turf/template_noop,/area/submap/debris2)
-"o" = (/obj/machinery/door/airlock/command,/turf/simulated/floor/airless,/area/submap/debris2)
-"p" = (/mob/living/simple_mob/hostile/carp/pike,/turf/simulated/floor,/area/submap/debris2)
-"r" = (/obj/random/maintenance/medical,/turf/simulated/floor/tiled/airless,/area/submap/debris2)
-"s" = (/obj/item/stack/rods,/turf/simulated/floor,/area/submap/debris2)
-"t" = (/obj/structure/door_assembly/door_assembly_com,/turf/template_noop,/area/submap/debris2)
-"u" = (/obj/item/clothing/head/bio_hood/virology,/turf/template_noop,/area/submap/debris2)
-"w" = (/obj/structure/lattice,/turf/template_noop,/area/submap/debris2)
-"x" = (/turf/template_noop,/area/submap/debris2)
-"y" = (/obj/structure/lattice,/obj/machinery/door/airlock/vault/bolted,/turf/simulated/floor/plating,/area/submap/debris2)
-"z" = (/obj/item/stack/rods,/turf/template_noop,/area/submap/debris2)
-"A" = (/obj/structure/closet/crate,/obj/item/weapon/reagent_containers/glass/beaker/bluespace,/turf/simulated/floor/tiled/airless,/area/submap/debris2)
-"C" = (/obj/item/stack/material/steel,/mob/living/simple_mob/animal/space/carp,/turf/template_noop,/area/submap/debris2)
-"E" = (/obj/random/maintenance/medical,/turf/simulated/floor,/area/submap/debris2)
-"F" = (/obj/random/medical/lite,/turf/simulated/floor,/area/submap/debris2)
-"G" = (/obj/structure/safe,/obj/item/weapon/dnainjector/xraymut,/obj/item/weapon/dnainjector/runfast,/obj/item/weapon/dnainjector/antistutt,/turf/simulated/floor/tiled/airless,/area/submap/debris2)
-"H" = (/obj/structure/table,/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/floor/tiled/airless,/area/submap/debris2)
-"J" = (/obj/structure/loot_pile/surface,/turf/simulated/floor/tiled/airless,/area/submap/debris2)
-"K" = (/mob/living/simple_mob/hostile/carp/pike,/turf/template_noop,/area/submap/debris2)
-"L" = (/obj/item/weapon/material/shard,/turf/template_noop,/area/submap/debris2)
-"M" = (/turf/simulated/floor,/area/submap/debris2)
-"N" = (/obj/item/clothing/suit/bio_suit/virology,/turf/template_noop,/area/submap/debris2)
-"O" = (/obj/item/weapon/material/shard{icon_state = "small"},/turf/template_noop,/area/submap/debris2)
-"P" = (/obj/item/stack/material/steel,/turf/simulated/floor,/area/submap/debris2)
-"Q" = (/mob/living/simple_mob/animal/space/carp/large,/turf/template_noop,/area/submap/debris2)
-"R" = (/obj/item/stack/material/steel,/turf/template_noop,/area/submap/debris2)
-"S" = (/obj/item/weapon/reagent_containers/spray/cleaner,/turf/template_noop,/area/submap/debris2)
-"T" = (/turf/simulated/wall,/area/submap/debris2)
-"U" = (/obj/item/clothing/accessory/stethoscope,/turf/simulated/floor/tiled/airless,/area/submap/debris2)
-"V" = (/mob/living/simple_mob/animal/space/carp,/turf/template_noop,/area/submap/debris2)
-"W" = (/turf/simulated/floor/airless,/area/submap/debris2)
-"X" = (/mob/living/simple_mob/animal/space/carp,/turf/simulated/floor,/area/submap/debris2)
-"Y" = (/obj/structure/girder/reinforced,/turf/simulated/floor/airless,/area/submap/debris2)
-"Z" = (/obj/machinery/computer{dir = 8},/turf/simulated/floor/tiled/airless,/area/submap/debris2)
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/simulated/floor/tiled/airless,
+/area/submap/debris2)
+"c" = (
+/obj/random/medical/pillbottle,
+/turf/simulated/floor/tiled/airless,
+/area/submap/debris2)
+"d" = (
+/turf/simulated/wall/r_wall,
+/area/submap/debris2)
+"e" = (
+/obj/item/stack/cable_coil/cut,
+/turf/simulated/floor,
+/area/submap/debris2)
+"h" = (
+/obj/structure/girder,
+/turf/template_noop,
+/area/submap/debris2)
+"i" = (
+/obj/item/stack/rods,
+/mob/living/simple_mob/animal/space/carp/large,
+/turf/template_noop,
+/area/submap/debris2)
+"j" = (
+/obj/structure/loot_pile/surface/bones,
+/turf/simulated/floor/tiled/airless,
+/area/submap/debris2)
+"k" = (
+/mob/living/simple_mob/animal/space/carp/large/huge,
+/turf/template_noop,
+/area/submap/debris2)
+"l" = (
+/obj/structure/girder,
+/turf/simulated/floor/plating,
+/area/submap/debris2)
+"m" = (
+/obj/structure/grille/broken,
+/turf/template_noop,
+/area/submap/debris2)
+"n" = (
+/obj/item/stack/cable_coil/cut,
+/turf/template_noop,
+/area/submap/debris2)
+"o" = (
+/obj/machinery/door/airlock/command,
+/turf/simulated/floor/airless,
+/area/submap/debris2)
+"p" = (
+/mob/living/simple_mob/hostile/carp/pike,
+/turf/simulated/floor,
+/area/submap/debris2)
+"r" = (
+/obj/random/maintenance/medical,
+/turf/simulated/floor/tiled/airless,
+/area/submap/debris2)
+"s" = (
+/obj/item/stack/rods,
+/turf/simulated/floor,
+/area/submap/debris2)
+"t" = (
+/obj/structure/door_assembly/door_assembly_com,
+/turf/template_noop,
+/area/submap/debris2)
+"u" = (
+/obj/item/clothing/head/bio_hood/virology,
+/turf/template_noop,
+/area/submap/debris2)
+"w" = (
+/obj/structure/lattice,
+/turf/template_noop,
+/area/submap/debris2)
+"x" = (
+/turf/template_noop,
+/area/submap/debris2)
+"y" = (
+/obj/structure/lattice,
+/obj/machinery/door/airlock/vault/bolted,
+/turf/simulated/floor/plating,
+/area/submap/debris2)
+"z" = (
+/obj/item/stack/rods,
+/turf/template_noop,
+/area/submap/debris2)
+"A" = (
+/obj/structure/closet/crate,
+/obj/item/weapon/reagent_containers/glass/beaker/bluespace,
+/turf/simulated/floor/tiled/airless,
+/area/submap/debris2)
+"C" = (
+/obj/item/stack/material/steel,
+/mob/living/simple_mob/animal/space/carp,
+/turf/template_noop,
+/area/submap/debris2)
+"E" = (
+/obj/random/maintenance/medical,
+/turf/simulated/floor,
+/area/submap/debris2)
+"F" = (
+/obj/random/medical/lite,
+/turf/simulated/floor,
+/area/submap/debris2)
+"G" = (
+/obj/structure/safe,
+/obj/item/weapon/dnainjector/xraymut,
+/obj/item/weapon/dnainjector/runfast,
+/obj/item/weapon/dnainjector/antistutt,
+/turf/simulated/floor/tiled/airless,
+/area/submap/debris2)
+"H" = (
+/obj/structure/table,
+/obj/item/weapon/material/shard{
+	icon_state = "medium"
+	},
+/turf/simulated/floor/tiled/airless,
+/area/submap/debris2)
+"J" = (
+/obj/structure/loot_pile/maint/technical,
+/turf/simulated/floor/tiled/airless,
+/area/submap/debris2)
+"K" = (
+/mob/living/simple_mob/hostile/carp/pike,
+/turf/template_noop,
+/area/submap/debris2)
+"L" = (
+/obj/item/weapon/material/shard,
+/turf/template_noop,
+/area/submap/debris2)
+"M" = (
+/turf/simulated/floor,
+/area/submap/debris2)
+"N" = (
+/obj/item/clothing/suit/bio_suit/virology,
+/turf/template_noop,
+/area/submap/debris2)
+"O" = (
+/obj/item/weapon/material/shard{
+	icon_state = "small"
+	},
+/turf/template_noop,
+/area/submap/debris2)
+"P" = (
+/obj/item/stack/material/steel,
+/turf/simulated/floor,
+/area/submap/debris2)
+"Q" = (
+/mob/living/simple_mob/animal/space/carp/large,
+/turf/template_noop,
+/area/submap/debris2)
+"R" = (
+/obj/item/stack/material/steel,
+/turf/template_noop,
+/area/submap/debris2)
+"S" = (
+/obj/item/weapon/reagent_containers/spray/cleaner,
+/turf/template_noop,
+/area/submap/debris2)
+"T" = (
+/turf/simulated/wall,
+/area/submap/debris2)
+"U" = (
+/obj/item/clothing/accessory/stethoscope,
+/turf/simulated/floor/tiled/airless,
+/area/submap/debris2)
+"V" = (
+/mob/living/simple_mob/animal/space/carp,
+/turf/template_noop,
+/area/submap/debris2)
+"W" = (
+/turf/simulated/floor/airless,
+/area/submap/debris2)
+"X" = (
+/mob/living/simple_mob/animal/space/carp,
+/turf/simulated/floor,
+/area/submap/debris2)
+"Y" = (
+/obj/structure/girder/reinforced,
+/turf/simulated/floor/airless,
+/area/submap/debris2)
+"Z" = (
+/obj/machinery/computer{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/airless,
+/area/submap/debris2)
 
 (1,1,1) = {"
-aaaaaaaaaaaaaaaaaaaa
-addYYdxxxzxRxxwxxxxa
-adGcMdxVzxxxxzxxxxxa
-adAUMypxTTTTlxxxCxxa
-adbjMdMxmEJxTxzxxxxa
-adFbwdMMwMMMTxwxnxxa
-aYdddYSxTTTNTxRwxxxa
-axzxixxkRxMsMMMxxhxa
-aSTwmwMPMXMxKxQOxxxa
-axTEMMTxOxrxuxzxMxxa
-axTbMnTwxxMLmxhwMRxa
-axTJExTxwxbwWrTMexxa
-axoMMwKbxQmwbHTMxxxa
-axTTTTTxxxbbrZTMwxxa
-axxwxxMxzxTTTTTxxxRa
-aRxxxxxxxxxxxxxxxxxa
-axOxMxwxzxxzxxxRxxxa
-axxxMRxxxxxxxxxxxxxa
-axxxxxxxxxtxxxxxxxxa
-aaaaaaaaaaaaaaaaaaaa
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+d
+d
+d
+d
+d
+Y
+x
+S
+x
+x
+x
+x
+x
+x
+R
+x
+x
+x
+a
+"}
+(3,1,1) = {"
+a
+d
+G
+A
+b
+F
+d
+z
+T
+T
+T
+T
+o
+T
+x
+x
+O
+x
+x
+a
+"}
+(4,1,1) = {"
+a
+Y
+c
+U
+j
+b
+d
+x
+w
+E
+b
+J
+M
+T
+w
+x
+x
+x
+x
+a
+"}
+(5,1,1) = {"
+a
+Y
+M
+M
+M
+w
+d
+i
+m
+M
+M
+E
+M
+T
+x
+x
+M
+M
+x
+a
+"}
+(6,1,1) = {"
+a
+d
+d
+y
+d
+d
+Y
+x
+w
+M
+n
+x
+w
+T
+x
+x
+x
+R
+x
+a
+"}
+(7,1,1) = {"
+a
+x
+x
+p
+M
+M
+S
+x
+M
+T
+T
+T
+K
+T
+M
+x
+w
+x
+x
+a
+"}
+(8,1,1) = {"
+a
+x
+V
+x
+x
+M
+x
+k
+P
+x
+w
+x
+b
+x
+x
+x
+x
+x
+x
+a
+"}
+(9,1,1) = {"
+a
+x
+z
+T
+m
+w
+T
+R
+M
+O
+x
+w
+x
+x
+z
+x
+z
+x
+x
+a
+"}
+(10,1,1) = {"
+a
+z
+x
+T
+E
+M
+T
+x
+X
+x
+x
+x
+Q
+x
+x
+x
+x
+x
+x
+a
+"}
+(11,1,1) = {"
+a
+x
+x
+T
+J
+M
+T
+M
+M
+r
+M
+b
+m
+b
+T
+x
+x
+x
+t
+a
+"}
+(12,1,1) = {"
+a
+R
+x
+T
+x
+M
+N
+s
+x
+x
+L
+w
+w
+b
+T
+x
+z
+x
+x
+a
+"}
+(13,1,1) = {"
+a
+x
+x
+l
+T
+T
+T
+M
+K
+u
+m
+W
+b
+r
+T
+x
+x
+x
+x
+a
+"}
+(14,1,1) = {"
+a
+x
+z
+x
+x
+x
+x
+M
+x
+x
+x
+r
+H
+Z
+T
+x
+x
+x
+x
+a
+"}
+(15,1,1) = {"
+a
+w
+x
+x
+z
+w
+R
+M
+Q
+z
+h
+T
+T
+T
+T
+x
+x
+x
+x
+a
+"}
+(16,1,1) = {"
+a
+x
+x
+x
+x
+x
+w
+x
+O
+x
+w
+M
+M
+M
+x
+x
+R
+x
+x
+a
+"}
+(17,1,1) = {"
+a
+x
+x
+C
+x
+n
+x
+x
+x
+M
+M
+e
+x
+w
+x
+x
+x
+x
+x
+a
+"}
+(18,1,1) = {"
+a
+x
+x
+x
+x
+x
+x
+h
+x
+x
+R
+x
+x
+x
+x
+x
+x
+x
+x
+a
+"}
+(19,1,1) = {"
+a
+x
+x
+x
+x
+x
+x
+x
+x
+x
+x
+x
+x
+x
+R
+x
+x
+x
+x
+a
+"}
+(20,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 "}

modular_chomp/maps/submaps/surface_submaps/valley/xenobioeclipse.dmm

@@ -326,7 +326,7 @@
 /area/submap/xenobioeclipse)
 "Tr" = (
 /obj/effect/floor_decal/corner/red/diagonal,
-/mob/living/simple_mob/slime/xenobio/amber{
+/mob/living/simple_mob/slime/xenobio/silver{
 	faction = "eclipse";
 	unity = 1
 	},

vorestation.dme

@@ -4590,6 +4590,7 @@
 #include "modular_chomp\code\datums\browser\color_matrix_picker.dm"
 #include "modular_chomp\code\datums\changelog\changelog.dm"
 #include "modular_chomp\code\datums\components\gargoyle.dm"
+#include "modular_chomp\code\datums\crafting\recipes.dm"
 #include "modular_chomp\code\datums\interfaces\appearance.dm"
 #include "modular_chomp\code\datums\outfits\jobs\command.dm"
 #include "modular_chomp\code\datums\outfits\jobs\noncrew.dm"
@@ -4810,6 +4811,7 @@
 #include "modular_chomp\code\modules\projectiles\mob.dm"
 #include "modular_chomp\code\modules\projectiles\projectile.dm"
 #include "modular_chomp\code\modules\projectiles\clockwork\clockwork_guns_ch.dm"
+#include "modular_chomp\code\modules\projectiles\guns\alts.dm"
 #include "modular_chomp\code\modules\projectiles\guns\ammo.dm"
 #include "modular_chomp\code\modules\projectiles\guns\beam.dm"
 #include "modular_chomp\code\modules\projectiles\guns\bullet.dm"