Merge branch 'wh40k' of https://github.com/800maximum123/PvE-CMSS13 i…

…nto wh40k

.github/workflows/update_changelog.yml

@@ -51,6 +51,6 @@ jobs:
         git commit -m "Automatic changelog compile [ci skip]" -a || true
     - name: "Push"
       if: steps.value_holder.outputs.ACTIONS_ENABLED
-      uses: ad-m/github-push-action@campaign
+      uses: ad-m/github-push-action@master
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}

colonialmarines.dme

@@ -2500,6 +2500,7 @@
 #include "interface\interface.dm"
 #include "interface\skin.dmf"
 #include "maps\_basemap.dm"
+#include "maps\map_files\golden_arrow_forecon\area.dm"
 #include "maps\map_files\LV671_Ark\LV671.dm"
 #include "maps\map_files\tempestbreaker\tempest_area.dm"
 #include "maps\map_files\USCSS_Tortuga\tortuga_areas.dm"
@@ -2513,6 +2514,7 @@
 #include "void-marines\code\rasputin.dm"
 #include "void-marines\code\special_roles.dm"
 #include "void-marines\code\vendors.dm"
+#include "void-marines\code\loadout_presets\rednecks.dm"
 #include "void-marines\code\modules\mob\living\carbon\human\emote.dm"
 #include "void-marines\code\playable_factions\alt_roles.dm"
 #include "void-marines\code\playable_factions\areas.dm"

html/changelogs/AutoChangeLog-pr-54.yml

@@ -0,0 +1,5 @@
+author: "ChaplainMaximum"
+delete-after: True
+changes:
+  - rscadd: "Добавил Голден Арроу"
+  - bugfix: "Юху! Воркфлоу работает!!!"

html/changelogs/archive/2024-08.yml

@@ -104,3 +104,9 @@
   - rscadd: Added something
   private-tristan:
   - rscadd: ports TG strip menu
+2024-08-29:
+  ChaplainMaximum:
+  - rscadd: "\u0414\u043E\u0431\u0430\u0432\u0438\u043B \u0413\u043E\u043B\u0434\u0435\
+      \u043D \u0410\u0440\u0440\u043E\u0443"
+  - bugfix: "\u042E\u0445\u0443! \u0412\u043E\u0440\u043A\u0444\u043B\u043E\u0443\
+      \ \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442!!!"

map_config/shipmaps.txt

@@ -44,5 +44,9 @@ endmap
 map tortuga
 endmap
 
+
 map tempestbreaker
 endmap
+
+map golden_arrow_forecon
+endmap

maps/golden_arrow_forecon.json

@@ -0,0 +1,9 @@
+{
+    "map_name": "USS Golden Arrow Forecon",
+    "map_path": "map_files/golden_arrow_forecon",
+    "map_file": "_golden_arrow_forecon.dmm",
+    "webmap_url": "GoldenArrow",
+    "traits": [{"Marine Main Ship": true}],
+    "nightmare_path": "maps/Nightmare/maps/golden_arrow/",
+    "platoon": "/datum/squad/marine/forecon"
+}

maps/map_files/golden_arrow_forecon/area.dm

@@ -0,0 +1,63 @@
+/area/golden_arrow/forecone/platoon_commander_rooms
+	name = "\improper Platoon Commander's Rooms"
+	icon_state = "livingspace"
+
+/area/golden_arrow/forecone/medical
+	name = "\improper Medical"
+	icon_state = "medical"
+
+/area/golden_arrow/forecone/supply
+	name = "\improper Supply"
+	icon_state = "req"
+
+/area/golden_arrow/forecone/briefing
+	name = "\improper Briefing Area"
+	icon_state = "briefing"
+
+/area/golden_arrow/forecone/dorms
+	name = "\improper Dorms"
+	icon_state = "gruntrnr"
+
+/area/golden_arrow/forecone/canteen
+	name = "\improper Canteen"
+	icon_state = "food"
+
+/area/golden_arrow/forecone/cryo_cells
+	name = "\improper Cryo Cells"
+	icon_state = "cryo"
+
+/area/golden_arrow/forecone/prep_hallway
+	name = "\improper Prep Hallway"
+	icon_state = "port"
+
+/area/golden_arrow/forecone/platoon_sergeant
+	name = "\improper Platoon Sergeant Office"
+	icon_state = "alpha"
+
+/area/golden_arrow/forecone/shared_office
+	name = "\improper Shared Office"
+	icon_state = "alpha"
+
+/area/golden_arrow/forecone/squad_one
+	name = "\improper Squad One Prep"
+	icon_state = "charlie"
+
+/area/golden_arrow/forecone/squad_two
+	name = "\improper Squad Two Prep"
+	icon_state = "delta"
+
+/area/golden_arrow/forecone/synthcloset
+	name = "\improper Synthetic Storage Closet"
+	icon_state = "livingspace"
+
+/area/golden_arrow/forecone/firingrange
+	name = "\improper Firing Range"
+	icon_state = "firingrange"
+
+/area/golden_arrow/forecone/platoonprep
+	name = "\improper Platoon Prep"
+	icon_state = "bravo"
+
+/area/golden_arrow/forecone/platoonarmory
+	name = "\improper Platoon Armory"
+	icon_state = "alpha"

maps/map_files/golden_arrow_forecon/sprinkles/.gitkeep

@@ -0,0 +1 @@
+

void-marines/code/loadout_presets/rednecks.dm

@@ -0,0 +1,95 @@
+/datum/equipment_preset/redneck
+	name = "Angry Redneck"
+	flags = EQUIPMENT_PRESET_EXTRA
+	assignment = JOB_COLONIST
+	rank = JOB_COLONIST
+	faction = FACTION_COLONIST
+	languages = list()
+	access = list(ACCESS_CIVILIAN_PUBLIC)
+	skills = /datum/skills/clf
+	idtype = /obj/item/card/id/lanyard
+
+/datum/equipment_preset/redneck/basic
+	name = "Angry Redneck (Basic)"
+	assignment = "Civilian"
+	flags = EQUIPMENT_PRESET_START_OF_ROUND
+
+/datum/equipment_preset/redneck/basic/load_gear(mob/living/carbon/human/new_human)
+
+	var/random_clothing = rand(1,5)
+	switch(random_clothing)
+		if(1) // Colonist
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing/five_slots(new_human), WEAR_ACCESSORY)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/trucker(new_human), WEAR_HEAD)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/hybrisa/civilian_vest(new_human), WEAR_JACKET)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/brown(new_human), WEAR_BODY)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET)
+			new_human.equip_to_slot_or_del(new /obj/item/storage/backpack(new_human), WEAR_BACK)
+
+		if(2) // Colonist
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/head/headband/red(new_human), WEAR_HEAD)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/kelland_mining(new_human), WEAR_JACKET)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/w_br(new_human), WEAR_BODY)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET)
+			new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/industrial(new_human), WEAR_BACK)
+
+		if(3) // Colonist
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing/five_slots(new_human), WEAR_ACCESSORY)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/head/militia/bucket(new_human), WEAR_HEAD)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia/partial(new_human), WEAR_JACKET)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/prison_boiler(new_human), WEAR_BODY)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(new_human), WEAR_FEET)
+			new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK)
+
+		if(4) // Colonist
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/head/welding(new_human), WEAR_HEAD)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/hybrisa/civilian_vest(new_human), WEAR_JACKET)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/wy_davisone(new_human), WEAR_BODY)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/brown(new_human), WEAR_FEET)
+			new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK)
+
+		if(5) // Colonist
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/trucker/red(new_human), WEAR_HEAD)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/darkred(new_human), WEAR_BODY)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET)
+			new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK)
+
+	var/random_gear = rand(1,5)
+	switch(random_gear)
+		if(1) // Colonist
+			new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/nailgun(new_human), WEAR_J_STORE)
+			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun(new_human), WEAR_IN_BACK)
+			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun(new_human), WEAR_IN_BACK)
+
+			new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov(new_human), WEAR_IN_ACCESSORY)
+			new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov(new_human), WEAR_IN_ACCESSORY)
+			new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov(new_human), WEAR_IN_ACCESSORY)
+
+		if(2) // Colonist
+			new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/p90(new_human), WEAR_J_STORE)
+			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/p90(new_human), WEAR_IN_BACK)
+			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/p90(new_human), WEAR_IN_BACK)
+
+		if(3) // Colonist
+			new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/skorpion(new_human), WEAR_J_STORE)
+			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/skorpion(new_human), WEAR_IN_BACK)
+			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/skorpion(new_human), WEAR_IN_BACK)
+
+		if(4) // Colonist
+			new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb(new_human), WEAR_J_STORE)
+			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot(new_human), WEAR_IN_BACK)
+			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot(new_human), WEAR_IN_BACK)
+			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot(new_human), WEAR_IN_BACK)
+			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot(new_human), WEAR_IN_BACK)
+
+		if(5) // Colonist
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing/five_slots(new_human), WEAR_ACCESSORY)
+			new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov(new_human), WEAR_IN_ACCESSORY)
+			new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov(new_human), WEAR_IN_ACCESSORY)
+			new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov(new_human), WEAR_IN_ACCESSORY)
+
+			new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/nailgun(new_human), WEAR_J_STORE)
+			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun(new_human), WEAR_IN_BACK)
+			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun(new_human), WEAR_IN_BACK)
+	..()