Merge branch 'master' into Viper-9

code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm

@@ -125,20 +125,13 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list(
 //------------CLOTHING VENDOR---------------
 
 GLOBAL_LIST_INIT(cm_vending_clothing_medic, list(
-		list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
-		list("Standard Marine Apparel", 0, list(/obj/item/clothing/under/marine/medic, /obj/item/clothing/shoes/marine/knife, /obj/item/clothing/gloves/marine, /obj/item/device/radio/headset/almayer/marine), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
-		list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
-
-
-		list("ARMOR (CHOOSE 1)", 0, null, null, null),
-		list("Medium Armor", 0, /obj/item/clothing/suit/marine, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED),
 
 		list("ARMOR PAINT (CHOOSE 1)", 0, null, null, null),
 		list("Red Cross Paint", 0, /obj/item/clothing/accessory/paint/medic, MARINE_CAN_BUY_PAINT, VENDOR_ITEM_RECOMMENDED),
 
 		list("HELMET (CHOOSE 1)", 0, null, null, null),
-		list("M10 Corpsman Helmet", 0, /obj/item/clothing/head/helmet/marine/medic, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
-		list("M10 Helmet", 0, /obj/item/clothing/head/helmet/marine, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
+		list("M10 Helmet (Red Cross)", 0, /obj/item/clothing/head/helmet/marine/medic, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
+		list("M10 Helmet (Plain)", 0, /obj/item/clothing/head/helmet/marine/medic/plain, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
 
 		list("BACKPACK (CHOOSE 1)", 0, null, null, null),
 		list("Medical Backpack", 0, /obj/item/storage/backpack/marine/medic, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),

code/modules/clothing/head/helmet.dm

@@ -825,6 +825,11 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
 	flags_marine_helmet = HELMET_GARB_OVERLAY|HELMET_DAMAGE_OVERLAY
 
+/obj/item/clothing/head/helmet/marine/medic/plain
+	desc = "M10 combat helmet issued to marine hospital corpsmen. Identical to the standard marine M10, with the exception of the integrated medical optic sight."
+	icon_state = "helmet"
+	specialty = "M10 pattern medic"
+
 /obj/item/clothing/head/helmet/marine/covert
 	name = "\improper M10 covert helmet"
 	desc = "An M10 marine helmet version designed for use in darkened environments. It is coated with a special anti-reflective paint."

code/modules/gear_presets/clf.dm

@@ -1,6 +1,6 @@
 /datum/equipment_preset/clf
 	name = FACTION_CLF
-	languages = list(LANGUAGE_SPANISH)
+	languages = list(LANGUAGE_JAPANESE, LANGUAGE_ENGLISH)
 	assignment = JOB_CLF
 	rank = FACTION_CLF
 	paygrades = list(PAY_SHORT_REB = JOB_PLAYTIME_TIER_0)
@@ -10,7 +10,6 @@
 
 /datum/equipment_preset/clf/New()
 	. = ..()
-	languages += pick_weight(list(LANGUAGE_ENGLISH = 5, LANGUAGE_JAPANESE = 3, LANGUAGE_RUSSIAN = 2, LANGUAGE_CHINESE = 2))
 	access = get_access(ACCESS_LIST_CLF_BASE)
 
 /datum/equipment_preset/clf/load_name(mob/living/carbon/human/new_human, randomise)

code/modules/gear_presets/cmb.dm

@@ -4,13 +4,12 @@
 	faction_group = list(FACTION_MARSHAL, FACTION_MARINE)
 	rank = JOB_CMB
 	idtype = /obj/item/card/id/deputy
-	languages = list(LANGUAGE_ENGLISH)
+	languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE)
 	var/human_versus_human = FALSE
 	var/headset_type = /obj/item/device/radio/headset/distress/CMB/limited
 
 /datum/equipment_preset/cmb/New()
 	. = ..()
-	languages += pick_weight(list(LANGUAGE_SPANISH = 5, LANGUAGE_JAPANESE = 3, LANGUAGE_RUSSIAN = 1, LANGUAGE_CHINESE = 1))
 	access = get_access(ACCESS_LIST_UA)
 
 /datum/equipment_preset/cmb/load_name(mob/living/carbon/human/new_human, randomise)

html/changelogs/AutoChangeLog-pr-650.yml

@@ -0,0 +1,5 @@
+author: "AmoryBlaine"
+delete-after: True
+changes:
+  - rscadd: "plain medic helmet"
+  - rscdel: "essentials, armor, MRE from medic vendor"

html/changelogs/AutoChangeLog-pr-684.yml

@@ -0,0 +1,4 @@
+author: "AmoryBlaine"
+delete-after: True
+changes:
+  - rscdel: "Unwanted wheels on maps"

html/changelogs/AutoChangeLog-pr-690.yml

@@ -0,0 +1,4 @@
+author: "DexterDude"
+delete-after: True
+changes:
+  - code_imp: "Reverts #585"

maps/map_files/golden_arrow/golden_arrow.dmm

@@ -8488,13 +8488,6 @@
 	},
 /turf/open/floor/almayer/mono,
 /area/golden_arrow/hangar)
-"aCU" = (
-/obj/effect/decal/cleanable/dirt{
-	layer = 2.52
-	},
-/obj/item/hardpoint/locomotion/apc_wheels,
-/turf/open/floor/almayer/plate,
-/area/golden_arrow/hangar)
 "aCV" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -9176,10 +9169,6 @@
 	},
 /turf/open/floor/almayer/plate,
 /area/golden_arrow/briefing)
-"aFc" = (
-/obj/item/hardpoint/locomotion/apc_wheels/arc,
-/turf/open/floor/almayer/plating/northeast,
-/area/golden_arrow/motor_pool)
 "aFd" = (
 /obj/structure/cable/heavyduty{
 	icon_state = "1-2-8"
@@ -15555,9 +15544,6 @@
 	pixel_y = 8;
 	pixel_x = 3
 	},
-/obj/item/clothing/head/helmet/marine/medic{
-	pixel_y = -9
-	},
 /turf/open/floor/almayer/plate,
 /area/golden_arrow/medical)
 "cWH" = (
@@ -32861,7 +32847,7 @@ ayX
 ayX
 adz
 aGv
-aFc
+aGv
 aBB
 aBB
 aDG
@@ -38946,7 +38932,7 @@ adz
 adz
 adz
 adz
-aCU
+aKa
 aby
 srv
 srv

maps/templates/lazy_templates/uscm_ert_station.dmm

@@ -1119,11 +1119,6 @@
 	},
 /turf/open/floor/almayer_hull,
 /area/space)
-"na" = (
-/obj/effect/decal/cleanable/blood/oil,
-/obj/item/hardpoint/locomotion/apc_wheels,
-/turf/open/floor/almayer/plating/northeast,
-/area/adminlevel/ert_station/uscm_station)
 "nc" = (
 /obj/structure/pipes/vents/pump/siphon/on{
 	dir = 1;
@@ -8943,7 +8938,7 @@ kZ
 kZ
 zK
 cz
-na
+VI
 sd
 JI
 yf