diff --git a/code/datums/uplink/gear loadout.dm b/code/datums/uplink/gear loadout.dm index defe6e17346..ede3db2474d 100644 --- a/code/datums/uplink/gear loadout.dm +++ b/code/datums/uplink/gear loadout.dm @@ -47,6 +47,15 @@ path = /obj/structure/closet/crate/secure/gear_loadout/sol_single item_cost = DEFAULT_TELECRYSTAL_AMOUNT +/datum/uplink_item/item/gear_loadout/dominia + name = "Empire of Dominia Assets (Group)" + path = /obj/structure/closet/crate/secure/gear_loadout/dominia + +/datum/uplink_item/item/gear_loadout/dominia_single + name = "Empire of Dominia Assets (Single)" + path = /obj/structure/closet/crate/secure/gear_loadout/dominia/single + item_cost = DEFAULT_TELECRYSTAL_AMOUNT + /datum/uplink_item/item/gear_loadout/cowboys name = "Frontier Cowboys (Group)" path = /obj/structure/closet/crate/secure/gear_loadout/ram_ranch @@ -55,4 +64,4 @@ /datum/uplink_item/item/gear_loadout/cowboy_single name = "Frontier Cowboy (Single)" path = /obj/structure/closet/crate/secure/gear_loadout/ram_ranch/single - item_cost = DEFAULT_TELECRYSTAL_AMOUNT/2 \ No newline at end of file + item_cost = DEFAULT_TELECRYSTAL_AMOUNT/2 diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 758deb33e06..d365f25b76e 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -268,6 +268,18 @@ else set_light(0) +/obj/item/shield/energy/dominia + name = "dominian energy barrier" + desc = "A hardlight energy shield meant to provide excellent protection in melee engagements." + icon_state = "dominian-eshield0" + +/obj/item/shield/energy/dominia/update_icon() + icon_state = "dominian-eshield[active]" + if(active) + set_light(1.5, 1.5, "#ff5132") + else + set_light(0) + // tact /obj/item/shield/riot/tact name = "tactical shield" diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm index db067b658a5..63bc9922cc8 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -259,4 +259,29 @@ new /obj/item/clothing/head/helmet/space/void/einstein(src) new /obj/item/clothing/suit/space/void/einstein(src) new /obj/item/tank/oxygen/red(src) - new /obj/item/clothing/shoes/magboots(src) \ No newline at end of file + new /obj/item/clothing/shoes/magboots(src) + +/obj/structure/closet/crate/secure/gear_loadout/dominia/fill() + new /obj/item/rig/jinxiang/equipped(src) + new /obj/item/clothing/head/helmet/space/void/dominia(src) + new /obj/item/clothing/head/helmet/space/void/dominia(src) + new /obj/item/clothing/head/helmet/space/void/dominia(src) + new /obj/item/clothing/head/helmet/space/void/dominia(src) + new /obj/item/clothing/suit/space/void/dominia(src) + new /obj/item/clothing/suit/space/void/dominia(src) + new /obj/item/clothing/suit/space/void/dominia(src) + new /obj/item/clothing/suit/space/void/dominia(src) + new /obj/item/melee/energy/sword/pirate(src) + new /obj/item/melee/energy/sword/pirate(src) + new /obj/item/melee/energy/sword/pirate(src) + new /obj/item/melee/energy/sword/pirate(src) + new /obj/item/shield/energy/dominia(src) + new /obj/item/shield/energy/dominia(src) + new /obj/item/shield/energy/dominia(src) + new /obj/item/shield/energy/dominia(src) + +/obj/structure/closet/crate/secure/gear_loadout/dominia/single/fill() + new /obj/item/clothing/head/helmet/space/void/dominia(src) + new /obj/item/clothing/suit/space/void/dominia(src) + new /obj/item/melee/energy/sword/pirate(src) + new /obj/item/shield/energy/dominia(src) diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 54dc0b0db17..df8203c2886 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -221,6 +221,8 @@ suit["dominia sweater"] = /obj/item/clothing/under/dominia/sweater suit["lyodsuit"] = /obj/item/clothing/under/dominia/lyodsuit suit["hoodied lyodsuit"] = /obj/item/clothing/under/dominia/lyodsuit/hoodie + suit["dominia noblewoman dress"] = /obj/item/clothing/under/dominia/dress + suit["dominia summer dress"] = /obj/item/clothing/under/dominia/dress/summer gear_tweaks += new/datum/gear_tweak/path(suit) /datum/gear/uniform/elyra_holo @@ -314,4 +316,4 @@ var/pyjamas = list() pyjamas["blue pyjamas"] = /obj/item/clothing/under/pj/blue pyjamas["red pyjamas"] = /obj/item/clothing/under/pj/red - gear_tweaks += new/datum/gear_tweak/path(pyjamas) + gear_tweaks += new/datum/gear_tweak/path(pyjamas) \ No newline at end of file diff --git a/code/modules/clothing/factions/dominia.dm b/code/modules/clothing/factions/dominia.dm index 06ab77af08a..b11da23bc19 100644 --- a/code/modules/clothing/factions/dominia.dm +++ b/code/modules/clothing/factions/dominia.dm @@ -223,3 +223,20 @@ ..() if(rolled_down == TRUE) remove_mask() + +/obj/item/clothing/under/dominia/dress + name = "dominian noblewoman dress" + desc = "This is a dress in the style of Dominian nobility. It's the latest fashion across Dominian space." + icon = 'icons/clothing/under/uniforms/dominia_noble_dress.dmi' + icon_state = "dom_dress" + item_state = "dom_dress" + contained_sprite = TRUE + +/obj/item/clothing/under/dominia/dress/summer + name = "dominian summer dress" + desc = "This is a dress in the style of Dominian nobility. It's the latest fashion across Dominian space." + icon = 'icons/clothing/under/uniforms/dominia_summer_dress.dmi' + icon_state = "dom_dress" + item_state = "dom_dress" + contained_sprite = TRUE + diff --git a/code/modules/clothing/factions/himeo.dm b/code/modules/clothing/factions/himeo.dm index 60d736217b9..055c4a233ce 100644 --- a/code/modules/clothing/factions/himeo.dm +++ b/code/modules/clothing/factions/himeo.dm @@ -12,7 +12,7 @@ /obj/item/clothing/head/soft/himeo name = "himean cap" - desc = "A heavy winter coat from Himeo, made of synthetic fish fur. It looks extremely comfortable, if a bit hot for the Aurora's normal temperature." + desc = "A field cap of Himean origin. This particular cap has the United Syndicates of Himeo's typical symbol - a white hexagon surrounded by red triangles - on its face." desc_fluff = "The M372 field cap is a standard-issue cap of Himeo's military, and a common sight throughout the planet and the space around it. This particular model is a reproduction, due to its lack of the traditional ear covers on the Himean model." icon = 'icons/clothing/head/himeo_cap.dmi' icon_state = "cap_himeo" diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm index 64add32eace..2c888e088f9 100644 --- a/code/modules/clothing/spacesuits/rig/suits/combat.dm +++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm @@ -209,3 +209,27 @@ /obj/item/rig_module/device/drill, /obj/item/rig_module/fabricator/energy_net ) + +/obj/item/rig/jinxiang + name = "jinxiang-pattern combat suit control module" + desc = "An off-shoot of the core Bunker Suit design, utilized by the Imperial Dominian military and painted accordingly. This is a powerful suit specializing in melee confrontations." + icon_state = "jinxiang" + suit_type = "jinxiang combat suit" + armor = list(melee = 80, bullet = 40, laser = 30, energy = 20, bomb = 15, bio = 100, rad = 25) + offline_vision_restriction = TINT_HEAVY + offline_slowdown = 10 + + allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA + + species_restricted = list("Human") + + max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE + + glove_type = /obj/item/clothing/gloves/powerfist + +/obj/item/rig/jinxiang/equipped + initial_modules = list( + /obj/item/rig_module/actuators/combat + ) diff --git a/code/modules/clothing/spacesuits/void/misc.dm b/code/modules/clothing/spacesuits/void/misc.dm index 6b7ba968d95..f79396b814b 100644 --- a/code/modules/clothing/spacesuits/void/misc.dm +++ b/code/modules/clothing/spacesuits/void/misc.dm @@ -10,7 +10,6 @@ brightness_on = 6 refittable = FALSE - /obj/item/clothing/suit/space/void/sol name = "military voidsuit" desc = "A sleek black space suit designed for combat. Looks to have seamless composite plating. Painted in Sol Alliance colors." @@ -328,3 +327,30 @@ desc = "A large suit of spaceproof armour, segmented and worked together expertly. Tabs on the shoulders indicate it belongs to the Kataphracts of the Unathi Izweski Hegemony. This one has the markings of a Knight." icon_state = "rig-kataphract-lead" item_state = "rig-kataphract-lead" + +/obj/item/clothing/head/helmet/space/void/dominia + name = "dominian prejoroub combat helmet" + desc = "A glamorous, decorated helmet with thick plating across its faces. It holds the emblematic markings of the Empire of Dominia, if its design wasn't unmistakable enough." + icon = 'icons/obj/clothing/voidsuit/dominia.dmi' + icon_state = "prejoroubhelm" + item_state = "prejoroubhelm" + contained_sprite = 1 + + armor = list(melee = 65, bullet = 55, laser = 25,energy = 25, bomb = 15, bio = 100, rad = 15) + siemens_coefficient = 0.35 + species_restricted = list("Human") + brightness_on = 6 + +/obj/item/clothing/suit/space/void/dominia + name = "dominian prejoroub combat suit" + desc = "An offshoot of the Coalition's vulture suit design, painted in Dominian colors with portability and maneuverability in mind over its bulkier counterpart." + icon = 'icons/obj/clothing/voidsuit/dominia.dmi' + icon_state = "prejoroub" + item_state = "prejoroub" + contained_sprite = 1 + + w_class = 3 + armor = list(melee = 65, bullet = 55, laser = 25,energy = 25, bomb = 15, bio = 100, rad = 15) + allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + siemens_coefficient = 0.35 + species_restricted = list("Human") diff --git a/html/changelogs/kyres1-#9367.yml b/html/changelogs/kyres1-#9367.yml new file mode 100644 index 00000000000..802d255c252 --- /dev/null +++ b/html/changelogs/kyres1-#9367.yml @@ -0,0 +1,43 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: kyres1 + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a Dominian gear loadout for mercenaries. One is 25TC for a solo mercenary, 100TC for a kit of four loadouts plus a powerful RIG similar to the bunker suit. Both loadouts come with fancy red e-shields and energy cutlasses." + - rscadd: "Added two Dominian dresses to the Dominian outfit selection." + - bugfix: "Fixed the Himean cap description." diff --git a/icons/clothing/under/uniforms/dominia_noble_dress.dmi b/icons/clothing/under/uniforms/dominia_noble_dress.dmi new file mode 100644 index 00000000000..47d18bd170f Binary files /dev/null and b/icons/clothing/under/uniforms/dominia_noble_dress.dmi differ diff --git a/icons/clothing/under/uniforms/dominia_summer_dress.dmi b/icons/clothing/under/uniforms/dominia_summer_dress.dmi new file mode 100644 index 00000000000..a06143e4979 Binary files /dev/null and b/icons/clothing/under/uniforms/dominia_summer_dress.dmi differ diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index a241fca6971..808b6d3a2bb 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index 19be4caccd6..c0314d93da1 100644 Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 7067340947f..897363537b0 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items/weapons/lefthand_shield.dmi b/icons/mob/items/weapons/lefthand_shield.dmi index 5d589202c75..f83d2c42942 100644 Binary files a/icons/mob/items/weapons/lefthand_shield.dmi and b/icons/mob/items/weapons/lefthand_shield.dmi differ diff --git a/icons/mob/items/weapons/righthand_shield.dmi b/icons/mob/items/weapons/righthand_shield.dmi index 8fde4d469dc..e3043efc8dc 100644 Binary files a/icons/mob/items/weapons/righthand_shield.dmi and b/icons/mob/items/weapons/righthand_shield.dmi differ diff --git a/icons/mob/rig_back.dmi b/icons/mob/rig_back.dmi index 5cc53ab3863..dce7f27f865 100644 Binary files a/icons/mob/rig_back.dmi and b/icons/mob/rig_back.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 5df9e7b2859..438e1aabd2d 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index e8ac2dbc78e..e5be93a3151 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 7751f378b2a..6678c32a25c 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index 0c6218eee3e..c46d3d363a6 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 2f58ff3a556..67095fe733c 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/voidsuit/dominia.dmi b/icons/obj/clothing/voidsuit/dominia.dmi new file mode 100644 index 00000000000..0ddc3805cec Binary files /dev/null and b/icons/obj/clothing/voidsuit/dominia.dmi differ diff --git a/icons/obj/rig_modules.dmi b/icons/obj/rig_modules.dmi index f54bdf70f02..9d4cecbb0cc 100644 Binary files a/icons/obj/rig_modules.dmi and b/icons/obj/rig_modules.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index f1f5f34f971..51f92713f6e 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ