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 0d12a0c4f41..130a2edea7c 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -586,18 +586,54 @@ new /obj/item/clothing/head/helmet/space/void/lancer(src) new /obj/item/clothing/head/helmet/space/void/lancer(src) new /obj/item/clothing/head/helmet/space/void/lancer(src) + new /obj/item/clothing/head/helmet/riot/lancer(src) + new /obj/item/clothing/head/helmet/riot/lancer(src) + new /obj/item/clothing/head/helmet/riot/lancer(src) + new /obj/item/clothing/head/helmet/riot/lancer(src) new /obj/item/clothing/suit/space/void/lancer(src) new /obj/item/clothing/suit/space/void/lancer(src) new /obj/item/clothing/suit/space/void/lancer(src) new /obj/item/clothing/suit/space/void/lancer(src) - new /obj/item/clothing/under/lance(src) - new /obj/item/clothing/under/lance(src) - new /obj/item/clothing/under/lance(src) - new /obj/item/clothing/under/lance(src) + new /obj/item/clothing/suit/armor/carrier/lance(src) + new /obj/item/clothing/suit/armor/carrier/lance(src) + new /obj/item/clothing/suit/armor/carrier/lance(src) + new /obj/item/clothing/suit/armor/carrier/lance(src) + new /obj/item/clothing/head/beret/lancer(src) + new /obj/item/clothing/head/beret/lancer(src) + new /obj/item/clothing/head/beret/lancer(src) + new /obj/item/clothing/head/beret/lancer(src) + new /obj/item/clothing/under/rank/lance(src) + new /obj/item/clothing/under/rank/lance(src) + new /obj/item/clothing/under/rank/lance(src) + new /obj/item/clothing/under/rank/lance(src) + new /obj/item/clothing/shoes/jackboots(src) + new /obj/item/clothing/shoes/jackboots(src) + new /obj/item/clothing/shoes/jackboots(src) + new /obj/item/clothing/shoes/jackboots(src) + new /obj/item/storage/belt/military(src) + new /obj/item/storage/belt/military(src) + new /obj/item/storage/belt/military(src) + new /obj/item/storage/belt/military(src) + new /obj/item/melee/baton/loaded(src) + new /obj/item/melee/baton/loaded(src) + new /obj/item/melee/baton/loaded(src) + new /obj/item/melee/baton/loaded(src) + new /obj/item/clothing/gloves/force/basic(src) + new /obj/item/clothing/gloves/force/basic(src) + new /obj/item/clothing/gloves/force/basic(src) + new /obj/item/clothing/gloves/force/basic(src) new /obj/item/clothing/accessory/holster/hip(src) new /obj/item/clothing/accessory/holster/hip(src) new /obj/item/clothing/accessory/holster/hip(src) new /obj/item/clothing/accessory/holster/hip(src) + new /obj/item/gun/projectile/automatic/c20r(src) + new /obj/item/gun/projectile/automatic/c20r(src) + new /obj/item/ammo_magazine/a10mm(src) + new /obj/item/ammo_magazine/a10mm(src) + new /obj/item/ammo_magazine/a10mm(src) + new /obj/item/ammo_magazine/a10mm(src) + new /obj/item/ammo_magazine/a10mm(src) + new /obj/item/ammo_magazine/a10mm(src) new /obj/item/gun/energy/rifle/laser(src) new /obj/item/gun/energy/rifle/laser(src) new /obj/item/gun/energy/rifle/laser(src) @@ -620,8 +656,18 @@ /obj/structure/closet/crate/gear_loadout/ceres/single/fill() new /obj/item/clothing/head/helmet/space/void/lancer(src) + new /obj/item/clothing/head/helmet/riot/lancer(src) new /obj/item/clothing/suit/space/void/lancer(src) - new /obj/item/clothing/under/lance(src) + new /obj/item/clothing/suit/armor/carrier/lance(src) + new /obj/item/clothing/head/beret/lancer(src) + new /obj/item/clothing/shoes/jackboots(src) + new /obj/item/storage/belt/military(src) + new /obj/item/melee/baton/loaded(src) + new /obj/item/gun/projectile/automatic/c20r(src) + new /obj/item/ammo_magazine/a10mm(src) + new /obj/item/ammo_magazine/a10mm(src) + new /obj/item/ammo_magazine/a10mm(src) + new /obj/item/clothing/under/rank/lance (src) new /obj/item/clothing/accessory/holster/hip(src) new /obj/item/gun/energy/rifle/laser(src) new /obj/item/gun/energy/repeater/pistol(src) diff --git a/code/modules/clothing/head/berets.dm b/code/modules/clothing/head/berets.dm index 34575fe8881..137ef09fa86 100644 --- a/code/modules/clothing/head/berets.dm +++ b/code/modules/clothing/head/berets.dm @@ -262,3 +262,10 @@ desc = "A grey beret with an attached cap badge bearing the insignia of a Solarian Marine Corps regiment." icon_state = "solgrey" item_state = "solgrey" + +/obj/item/clothing/head/beret/lancer + name = "\improper Ceres Lance beret" + desc = "A white beret with the attached badge of Ceres Lance - the infamous synthetic-hunting mercenary group." + icon_state = "lancer" + item_state = "lancer" + diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index ad47bfa986a..9d5258e5edb 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -185,6 +185,19 @@ update_clothing_icon() +/obj/item/clothing/head/helmet/riot/lancer + name = "ceres lance helmet" + desc = "A state-of-the-art combat helmet used by Ceres Lance. It is made with an additional layer of padding and ballstic visor designed to protect operatives attempting to physically restrain hostile IPCs, but has poor heat dissipation characteristics as a result." + icon_state = "helm_lance" + item_state = "helm_lance" + armor = list( + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_PADDED, + ) + /obj/item/clothing/head/helmet/ablative name = "ablative helmet" desc = "A helmet made from advanced materials which protects against concentrated energy weapons." diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm index d6be8246b8b..6ac1418d12d 100644 --- a/code/modules/clothing/suits/modular_armor.dm +++ b/code/modules/clothing/suits/modular_armor.dm @@ -131,6 +131,14 @@ /obj/item/clothing/accessory/storage/modular_pouch/large ) +/obj/item/clothing/suit/armor/carrier/lance + starting_accessories = list( + /obj/item/clothing/accessory/armor_plate/riot/lancer, + /obj/item/clothing/accessory/leg_guard/riot/lancer, + /obj/item/clothing/accessory/arm_guard/riot/lancer, + /obj/item/clothing/accessory/storage/modular_pouch/large + ) + /obj/item/clothing/accessory/armor_plate name = "corporate armor plate" desc = "A particularly light-weight armor plate in stylish corporate black. Unfortunately, not very good if you hold it with your hands." @@ -303,6 +311,19 @@ ) slowdown = 0 +/obj/item/clothing/accessory/armor_plate/riot/lancer + name = "ceres lance armor plate" + desc = "A state-of-the-art armor plate used by Ceres Lance. It is made with an additional layer of padding and is designed to protect operatives attempting to physically restrain hostile IPCs, but has poor heat dissipation characteristics as a result." + icon_state = "lancer_plate" + item_state = "lancer_plate" + armor = list( + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_PADDED, + ) + /obj/item/clothing/accessory/armor_plate/military/navy name = "konyang navy armor plate" desc = "A military-grade armor plate frequently seen in use by naval landing parties and sailors of the Konyang Navy." diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index 7e376295079..632988e319a 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -370,3 +370,29 @@ BOMB = ARMOR_BOMB_PADDED, ) slowdown = 0.15 + +/obj/item/clothing/accessory/arm_guard/riot/lancer + name = "ceres lance arm guards" + desc = "A pair of the state-of-the-art arm guards used by Ceres Lance on low-intensity missions. They are made with additional layers of padding and are designed to protect operatives attempting to physically restrain hostile IPCs but have poor heat dissipation characteristics as a result." + icon_state = "armguards_lancer" + item_state = "armguards_lancer" + armor = list( + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_PADDED, + ) + +/obj/item/clothing/accessory/leg_guard/riot/lancer + name = "ceres lance leg guards" + desc = "A pair of the state-of-the-art leg guards used by Ceres Lance on low-intensity missions. They are made with additional layers of padding and are designed to protect operatives attempting to physically restrain hostile IPCs but have poor heat dissipation characteristics as a result." + icon_state = "legguards_lancer" + item_state = "legguards_lancer" + armor = list( + MELEE = ARMOR_MELEE_VERY_HIGH, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_RESISTANT, + BOMB = ARMOR_BOMB_PADDED, + ) diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 65dc9a6b0bd..a5a0a77b846 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -573,33 +573,6 @@ ) siemens_coefficient = 0.7 -/obj/item/clothing/under/lance - name = "ceres lance fatigues" - desc = "A set of drab fatigues meant to be worn by the Ceres' Lance Regiment, with their emblem found on the shoulder." - icon_state = "lance_fatigues" - item_state = "lance_fatigues" - worn_state = "lance_fatigues" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - armor = list( - MELEE = ARMOR_MELEE_MINOR - ) - siemens_coefficient = 0.7 - -/obj/item/clothing/under/dress/lance_dress - name = "lance dress uniform" - desc = "A dark black uniform indicative of a Ceres' Lance official with a badge atop the chest. This one seems tailored to take on a more feminine look, with a long skirt." - icon_state = "lance_dress_f" - item_state = "lance_dress_f" - worn_state = "lance_dress_f" - -/obj/item/clothing/under/dress/lance_dress/male - name = "lance dress uniform" - desc = "A dark black uniform indicative of a Ceres' Lance official with a badge atop the chest." - icon_state = "lance_dress_m" - item_state = "lance_dress_m" - worn_state = "lance_dress_m" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - /obj/item/clothing/under/qipao name = "qipao" desc = "A traditional Solarian women's garment, typically made of (synthetic) silk." @@ -830,6 +803,48 @@ MELEE = ARMOR_MELEE_MINOR ) +//Ceres Lance + +/obj/item/clothing/under/lance + name = "ceres lance fatigues" + desc = "A set of drab fatigues meant to be worn by the Ceres' Lance Regiment, with their emblem found on the shoulder." + icon_state = "lance_fatigues" + item_state = "lance_fatigues" + worn_state = "lance_fatigues" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + armor = list( + MELEE = ARMOR_MELEE_MINOR + ) + siemens_coefficient = 0.7 + +/obj/item/clothing/under/dress/lance_dress + name = "lance dress uniform" + desc = "A dark black uniform indicative of a Ceres' Lance official with a badge atop the chest. This one seems tailored to take on a more feminine look, with a long skirt." + icon_state = "lance_dress_f" + item_state = "lance_dress_f" + worn_state = "lance_dress_f" + +/obj/item/clothing/under/dress/lance_dress/male + name = "lance dress uniform" + desc = "A dark black uniform indicative of a Ceres' Lance official with a badge atop the chest." + icon_state = "lance_dress_m" + item_state = "lance_dress_m" + worn_state = "lance_dress_m" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + +/obj/item/clothing/under/rank/lance + name = "\improper Ceres Lance tactical uniform" + desc = "A newly-issued dark grey uniform worn by Ceres Lance operatives during combat situations." + icon = 'icons/obj/item/clothing/under/human/corporation/lancer_uniform.dmi' + icon_state = "lancer_uniform" + item_state = "lancer_uniform" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + armor = list( + MELEE = ARMOR_MELEE_SMALL + ) + siemens_coefficient = 0.7 + contained_sprite = TRUE + //Himean Army /obj/item/clothing/under/himeo name = "himean planetary guard fatigues" diff --git a/html/changelogs/stryker-cereslance.yml b/html/changelogs/stryker-cereslance.yml new file mode 100644 index 00000000000..d7913276f61 --- /dev/null +++ b/html/changelogs/stryker-cereslance.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: The Stryker + +# 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: "Adds a Ceres Lance, uniform, beret, and plate carrier to the Ceres Lance gear crate." diff --git a/icons/obj/clothing/hats/berets.dmi b/icons/obj/clothing/hats/berets.dmi index 2b3fd43c3d0..3d07155448c 100644 Binary files a/icons/obj/clothing/hats/berets.dmi and b/icons/obj/clothing/hats/berets.dmi differ diff --git a/icons/obj/item/clothing/head/modular_armor_helmets.dmi b/icons/obj/item/clothing/head/modular_armor_helmets.dmi index 4b4e5c401b6..59d6be6a38a 100644 Binary files a/icons/obj/item/clothing/head/modular_armor_helmets.dmi and b/icons/obj/item/clothing/head/modular_armor_helmets.dmi differ diff --git a/icons/obj/item/clothing/suit/armor/modular_armor/modular_armor.dmi b/icons/obj/item/clothing/suit/armor/modular_armor/modular_armor.dmi index 894fb6470be..57286396ff2 100644 Binary files a/icons/obj/item/clothing/suit/armor/modular_armor/modular_armor.dmi and b/icons/obj/item/clothing/suit/armor/modular_armor/modular_armor.dmi differ diff --git a/icons/obj/item/clothing/under/human/corporation/lancer_uniform.dmi b/icons/obj/item/clothing/under/human/corporation/lancer_uniform.dmi new file mode 100644 index 00000000000..fa76997c9ec Binary files /dev/null and b/icons/obj/item/clothing/under/human/corporation/lancer_uniform.dmi differ