cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 21:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Armor defines (#20563)

Browse Source 
Added armor defines
Converted raw strings use to defines
Added UT test to ensure people set the armor var correctly (to a list)

No player facing changes
This commit is contained in:
Fluffy
2025-03-09 21:37:46 +00:00
committed by GitHub
parent 660f3e90a1
commit c5dabb9cda
109 changed files with 1666 additions and 1578 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/material/material_armor.dm
+2 -2
View File
@@ -32,7 +32,7 @@ Protectiveness | Armor %
item_state = "material_armor"
contained_sprite = 1
armor = list(
melee = ARMOR_MELEE_MINOR
MELEE = ARMOR_MELEE_MINOR
)
pocket_slots = 1
@@ -98,7 +98,7 @@ Protectiveness | Armor %
icon_state = "bucket"
item_state = "bucket"
armor = list(
melee = ARMOR_MELEE_MINOR
MELEE = ARMOR_MELEE_MINOR
)
contained_sprite = 1
code/game/objects/items/weapons/vaurca_items.dm
+27 -27
View File
@@ -303,11 +303,11 @@
species_restricted = list(BODYTYPE_VAURCA)
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_SMALL,
laser = ARMOR_LASER_SMALL,
bomb = ARMOR_BOMB_PADDED,
bio = ARMOR_BIO_SHIELDED
MELEE = ARMOR_MELEE_RESISTANT,
BULLET = ARMOR_BALLISTIC_SMALL,
LASER = ARMOR_LASER_SMALL,
BOMB = ARMOR_BOMB_PADDED,
BIO = ARMOR_BIO_SHIELDED
)
/obj/item/clothing/head/helmet/space/void/scout
name = "scout helmet"
@@ -319,11 +319,11 @@
species_restricted = list(BODYTYPE_VAURCA)
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_SMALL,
laser = ARMOR_LASER_SMALL,
bomb = ARMOR_BOMB_PADDED,
bio = ARMOR_BIO_SHIELDED
MELEE = ARMOR_MELEE_RESISTANT,
BULLET = ARMOR_BALLISTIC_SMALL,
LASER = ARMOR_LASER_SMALL,
BOMB = ARMOR_BOMB_PADDED,
BIO = ARMOR_BIO_SHIELDED
)
light_overlay = "helmet_light_dual_green"
light_color = "#3e7c3e"
@@ -338,12 +338,12 @@
species_restricted = list(BODYTYPE_VAURCA)
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MEDIUM,
laser = ARMOR_LASER_MAJOR,
bomb = ARMOR_BOMB_PADDED,
bio = ARMOR_BIO_SHIELDED,
rad = ARMOR_RAD_MINOR
MELEE = ARMOR_MELEE_RESISTANT,
BULLET = ARMOR_BALLISTIC_MEDIUM,
LASER = ARMOR_LASER_MAJOR,
BOMB = ARMOR_BOMB_PADDED,
BIO = ARMOR_BIO_SHIELDED,
RAD = ARMOR_RAD_MINOR
)
/obj/item/clothing/head/helmet/space/void/commando
name = "commando helmet"
@@ -355,12 +355,12 @@
species_restricted = list(BODYTYPE_VAURCA)
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MEDIUM,
laser = ARMOR_LASER_MAJOR,
bomb = ARMOR_BOMB_PADDED,
bio = ARMOR_BIO_SHIELDED,
rad = ARMOR_RAD_MINOR
MELEE = ARMOR_MELEE_RESISTANT,
BULLET = ARMOR_BALLISTIC_MEDIUM,
LASER = ARMOR_LASER_MAJOR,
BOMB = ARMOR_BOMB_PADDED,
BIO = ARMOR_BIO_SHIELDED,
RAD = ARMOR_RAD_MINOR
)
light_overlay = "helmet_light_dual_green"
@@ -376,11 +376,11 @@
w_class = WEIGHT_CLASS_SMALL
filtered_gases = list(GAS_NITROGEN, GAS_N2O)
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MINOR,
laser = ARMOR_LASER_SMALL,
bio = ARMOR_BIO_STRONG,
rad = ARMOR_RAD_MINOR
MELEE = ARMOR_MELEE_RESISTANT,
BULLET = ARMOR_BALLISTIC_MINOR,
LASER = ARMOR_LASER_SMALL,
BIO = ARMOR_BIO_STRONG,
RAD = ARMOR_RAD_MINOR
)
icon = 'icons/obj/vaurca_items.dmi'
icon_state = "m_metalg"