From 19bb8599232ea18c59ed932d1020c887188d63de Mon Sep 17 00:00:00 2001 From: Ben <91219575+Ben10083@users.noreply.github.com> Date: Sat, 8 Jun 2024 12:39:38 -0400 Subject: [PATCH] Kosmostrelki now know Baghrar (#19356) As stated in da lore: 'The Kosmostrelki are usually trained in the martial art of Baghrar, both to instill discipline and help with their balance. ' To reflect this, ERT and Kosmostrelki ghostroles now have the martial art of Baghrar. --------- Co-authored-by: Ben10083 --- code/datums/outfits/ert/kosmostrelki.dm | 7 +++ code/modules/ghostroles/spawner/human/pra.dm | 3 +- html/changelogs/Ben10083 - Karate Kats.yml | 58 +++++++++++++++++++ .../peoples_station_ghostroles.dm | 4 ++ .../pra/headmaster/headmaster_ghostroles.dm | 4 ++ 5 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Ben10083 - Karate Kats.yml diff --git a/code/datums/outfits/ert/kosmostrelki.dm b/code/datums/outfits/ert/kosmostrelki.dm index 7bd35089286..e7d6249e6b4 100644 --- a/code/datums/outfits/ert/kosmostrelki.dm +++ b/code/datums/outfits/ert/kosmostrelki.dm @@ -22,6 +22,7 @@ back = /obj/item/gun/projectile/automatic/rifle/adhomian accessory = /obj/item/clothing/accessory/badge/hadii_card r_pocket = /obj/item/crowbar/red + l_hand = /obj/item/martial_manual/tajara /obj/outfit/admin/ert/pra_cosmonaut/get_id_access() return get_distress_access() @@ -50,6 +51,7 @@ l_pocket = /obj/item/device/megaphone accessory = /obj/item/clothing/accessory/hadii_pin + l_hand = /obj/item/martial_manual/tajara /obj/outfit/admin/ert/pra_cosmonaut/commander name = "Kosmostrelki Commander" @@ -72,6 +74,7 @@ /obj/item/ammo_magazine/submachinedrum = 1) l_pocket = /obj/item/device/megaphone + l_hand = /obj/item/martial_manual/tajara /obj/outfit/admin/ert/pra_cosmonaut/tesla name = "Tesla Trooper" @@ -88,6 +91,7 @@ /obj/item/grenade/frag = 2, /obj/item/grenade/smokebomb = 1, /obj/item/gun/projectile/pistol/adhomai = 1, + /obj/item/martial_manual/tajara = 1, /obj/item/material/knife/trench = 1 ) @@ -128,6 +132,8 @@ /obj/item/device/healthanalyzer = 1 ) + l_hand = /obj/item/martial_manual/tajara + /obj/outfit/admin/ert/pra_cosmonaut/engineer name = "Kosmostrelki Sapper" @@ -152,3 +158,4 @@ ) belt_contents = null + l_hand = /obj/item/martial_manual/tajara diff --git a/code/modules/ghostroles/spawner/human/pra.dm b/code/modules/ghostroles/spawner/human/pra.dm index daebdcbeab3..ef2738d740f 100644 --- a/code/modules/ghostroles/spawner/human/pra.dm +++ b/code/modules/ghostroles/spawner/human/pra.dm @@ -50,6 +50,7 @@ /obj/item/ammo_magazine/mc9mm = 2 ) r_hand = /obj/item/storage/field_ration + l_hand = /obj/item/martial_manual/tajara /obj/outfit/admin/pra_cosmonaut/commissar name = "Party Commissar" @@ -68,4 +69,4 @@ /obj/item/storage/box/hadii_card = 1 ) l_hand = /obj/item/device/megaphone - r_hand = null + r_hand = /obj/item/martial_manual/tajara diff --git a/html/changelogs/Ben10083 - Karate Kats.yml b/html/changelogs/Ben10083 - Karate Kats.yml new file mode 100644 index 00000000000..7ac6c284efd --- /dev/null +++ b/html/changelogs/Ben10083 - Karate Kats.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Ben10083 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Kosmostrelki forces now have Baghrar fighting style, as reflected in lore." diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station_ghostroles.dm b/maps/away/away_site/tajara/peoples_station/peoples_station_ghostroles.dm index b024b71441b..75c0e2c04c3 100644 --- a/maps/away/away_site/tajara/peoples_station/peoples_station_ghostroles.dm +++ b/maps/away/away_site/tajara/peoples_station/peoples_station_ghostroles.dm @@ -34,6 +34,8 @@ accessory = /obj/item/clothing/accessory/badge/hadii_card r_pocket = /obj/item/storage/wallet/random + l_hand = /obj/item/martial_manual/tajara + /obj/outfit/admin/peoples_station_crew/get_id_access() return list(ACCESS_PRA, ACCESS_EXTERNAL_AIRLOCKS) @@ -69,6 +71,7 @@ /obj/item/gun/projectile/pistol/adhomai = 1 ) l_hand = /obj/item/clothing/accessory/badge/hadii_card/member + r_hand = /obj/item/martial_manual/tajara /datum/ghostspawner/human/peoples_station_crew/commissar @@ -106,3 +109,4 @@ /obj/item/storage/box/hadii_card = 1 ) l_hand = /obj/item/device/megaphone + r_hand = /obj/item/martial_manual/tajara diff --git a/maps/away/ships/pra/headmaster/headmaster_ghostroles.dm b/maps/away/ships/pra/headmaster/headmaster_ghostroles.dm index 8dbac263ee6..fa1ccf6afab 100644 --- a/maps/away/ships/pra/headmaster/headmaster_ghostroles.dm +++ b/maps/away/ships/pra/headmaster/headmaster_ghostroles.dm @@ -30,6 +30,7 @@ accessory = /obj/item/clothing/accessory/badge/hadii_card r_pocket = /obj/item/storage/wallet/random + l_hand = /obj/item/martial_manual/tajara /obj/outfit/admin/headmaster_kosmostrelki/get_id_access() return list(ACCESS_PRA, ACCESS_EXTERNAL_AIRLOCKS) @@ -62,6 +63,8 @@ /obj/item/gun/projectile/pistol/adhomai = 1 ) + l_hand = /obj/item/martial_manual/tajara + /datum/ghostspawner/human/headmaster_kosmostrelki/commissar short_name = "headmaster_commissar" @@ -96,3 +99,4 @@ /obj/item/storage/box/hadii_card = 1 ) l_hand = /obj/item/device/megaphone + r_hand = /obj/item/martial_manual/tajara