cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 13:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds non-voidsuit Ceres Lance armor. (#22642)

Browse Source 
Adds a Ceres Lance beret, armor, and new uniform in preparation for
future CL events.

Also modifies the Ceres Lance crate to contain these items and carry a
more diverse weapon mix for merc rounds and ease of spawning during
event rounds..

---------

Signed-off-by: TheStryker <thestryker289@gmail.com>
Co-authored-by: Kano <89972582+kano-dot@users.noreply.github.com>
This commit is contained in:
TheStryker
2026-06-09 10:55:48 +00:00
committed by GitHub
co-authored by Kano
parent d055bc63e5
commit 2a4bd89042
11 changed files with 218 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/berets.dm
+7
View File
@@ -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"
code/modules/clothing/head/helmet.dm
+13
View File
@@ -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."
code/modules/clothing/suits/modular_armor.dm
+21
View File
@@ -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."
code/modules/clothing/under/accessories/armor.dm
+26
View File
@@ -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,
)
code/modules/clothing/under/miscellaneous.dm
+42 -27
View File
@@ -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"