Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Buff Marine Armour During HvH #6937

Merged
merged 15 commits into from
Aug 30, 2024
Merged

Buff Marine Armour During HvH #6937

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5a68a79
InitalCommit
Aug 12, 2024
7ce8e2b
ReturnArmour
Aug 13, 2024
eaf4e7d
Smartgunner
Aug 13, 2024
0d80c11
SGTwo
Aug 13, 2024
9d57b7e
SpecArmors
Aug 13, 2024
473083b
Clearup
Aug 13, 2024
21df82b
ReqChanges
Aug 15, 2024
f8af9f6
Merge branch 'master' into armourvalue
Aug 23, 2024
af4ccb6
Merge branch 'master' into armourvalue
Aug 26, 2024
994b118
update
Aug 26, 2024
08ce825
more
Aug 26, 2024
366d192
moremore
Aug 26, 2024
8b326a8
fixfix
Aug 26, 2024
e86cdbe
missedarmor
Aug 26, 2024
337c1eb
Update _marine_armor.dm
Steelpoint Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/__DEFINES/mode.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
#define MODE_BASIC_RT (1<<11)
#define MODE_RANDOM_HIVE (1<<12)// Makes Join-as-Xeno choose a hive to join as burrowed larva at random rather than at user's input..
#define MODE_THUNDERSTORM (1<<13)// Enables thunderstorm effects on maps that are compatible with it. (Lit exterior tiles, rain effects)
#define MODE_FACTION_CLASH (1<<14)// Disables scopes, sniper sentries, OBs, shooting corpses, dragging enemy corpses, stripping enemy corpses
#define MODE_FACTION_CLASH (1<<14)// Disables scopes, sniper sentries, OBs, shooting corpses, dragging enemy corpses, stripping enemy corpses, increase armor bullet/bomb/internal damage protection

// Gamemode Toggleable Flags
#define MODE_NO_SNIPER_SENTRY (1<<0) /// Upgrade kits will no longer allow you to select long-range upgrades
Expand Down
89 changes: 89 additions & 0 deletions code/modules/clothing/suits/marine_armor/_marine_armor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,17 @@
item_state_slots = list(WEAR_JACKET = "mp_armor")
black_market_value = 20

/obj/item/clothing/suit/storage/marine/MP/Initialize(mapload)
. = ..()
if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH))
armor_bullet = CLOTHING_ARMOR_HIGH
armor_bomb = CLOTHING_ARMOR_MEDIUMHIGH
armor_internaldamage = CLOTHING_ARMOR_HIGH
else
Steelpoint marked this conversation as resolved.
Show resolved Hide resolved
armor_bullet = CLOTHING_ARMOR_MEDIUM
armor_bomb = CLOTHING_ARMOR_MEDIUM
armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW

/obj/item/clothing/suit/storage/marine/MP/warden
name = "\improper M3 pattern warden MP armor"
desc = "A well-crafted suit of M3 Pattern Armor typically distributed to Wardens. Useful for letting your men know who is in charge."
Expand Down Expand Up @@ -415,6 +426,17 @@
armor_variation = 0
specialty = "M3 pattern smooth marine"

/obj/item/clothing/suit/storage/marine/medium/Initialize(mapload)
. = ..()
if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH))
armor_bullet = CLOTHING_ARMOR_HIGH
armor_bomb = CLOTHING_ARMOR_MEDIUM
armor_internaldamage = CLOTHING_ARMOR_HIGH
else
Steelpoint marked this conversation as resolved.
Show resolved Hide resolved
armor_bullet = CLOTHING_ARMOR_MEDIUM
armor_bomb = CLOTHING_ARMOR_MEDIUMLOW
armor_internaldamage = CLOTHING_ARMOR_MEDIUM

// M3-L pattern light armor
/obj/item/clothing/suit/storage/marine/light
name = "\improper M3-L pattern light armor"
Expand Down Expand Up @@ -455,6 +477,17 @@
icon_state = "L6"
armor_variation = 0

/obj/item/clothing/suit/storage/marine/light/Initialize(mapload)
. = ..()
if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH))
armor_bullet = CLOTHING_ARMOR_MEDIUM
armor_bomb = CLOTHING_ARMOR_MEDIUMLOW
armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH
else
armor_bullet = CLOTHING_ARMOR_MEDIUMLOW
armor_bomb = CLOTHING_ARMOR_MEDIUM
armor_internaldamage = CLOTHING_ARMOR_LOW
Steelpoint marked this conversation as resolved.
Show resolved Hide resolved

/obj/item/clothing/suit/storage/marine/light/vest
name = "\improper M3-VL pattern ballistics vest"
desc = "Up until 2182 USCM non-combat personnel were issued non-standardized ballistics vests, though the lack of IMP compatibility and suit lamps proved time and time again inefficient. This modified M3-L shell is the result of a 6-year R&D program; It provides utility, protection, AND comfort to all USCM non-combat personnel."
Expand Down Expand Up @@ -500,6 +533,17 @@
time_to_equip = 1 SECONDS
uniform_restricted = null

/obj/item/clothing/suit/storage/marine/light/synvest/Initialize(mapload)
. = ..()
if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH))
armor_bullet = CLOTHING_ARMOR_NONE
armor_bomb = CLOTHING_ARMOR_NONE
armor_internaldamage = CLOTHING_ARMOR_NONE
else
armor_bullet = CLOTHING_ARMOR_NONE
armor_bomb = CLOTHING_ARMOR_NONE
armor_internaldamage = CLOTHING_ARMOR_NONE

/obj/item/clothing/suit/storage/marine/light/synvest/grey
icon_state = "VL_syn"
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
Expand Down Expand Up @@ -578,6 +622,13 @@
icon_state = "H6"
armor_variation = 0

/obj/item/clothing/suit/storage/marine/heavy/Initialize(mapload)
. = ..()
if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH))
armor_internaldamage = CLOTHING_ARMOR_HIGH
else
armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH

//===========================//SPECIALIST\\================================\\
//=======================================================================\\

Expand Down Expand Up @@ -625,6 +676,15 @@
playsound(src,'sound/machines/click.ogg', 15, 1)
return

/obj/item/clothing/suit/storage/marine/specialist/Initialize(mapload)
. = ..()
if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH))
armor_bullet = CLOTHING_ARMOR_HIGHPLUS
armor_internaldamage = CLOTHING_ARMOR_HIGHPLUS
else
armor_bullet = CLOTHING_ARMOR_HIGH
armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH

/obj/item/clothing/suit/storage/marine/M3G
name = "\improper M3-G4 grenadier armor"
desc = "A custom set of M3 armor packed to the brim with padding, plating, and every form of ballistic protection under the sun. Used exclusively by USCM Grenadiers."
Expand All @@ -645,6 +705,15 @@
unacidable = TRUE
light_range = 5

/obj/item/clothing/suit/storage/marine/M3G/Initialize(mapload)
. = ..()
if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH))
armor_bullet = CLOTHING_ARMOR_HIGH
armor_internaldamage = CLOTHING_ARMOR_HIGH
else
armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH

/obj/item/clothing/suit/storage/marine/M3T
name = "\improper M3-T light armor"
desc = "A custom set of M3 armor designed for users of long-ranged explosive weaponry."
Expand All @@ -655,6 +724,15 @@
flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE
unacidable = TRUE

/obj/item/clothing/suit/storage/marine/M3T/Initialize(mapload)
. = ..()
if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH))
armor_bullet = CLOTHING_ARMOR_HIGH
armor_internaldamage = CLOTHING_ARMOR_HIGH
else
armor_bullet = CLOTHING_ARMOR_MEDIUM
armor_internaldamage = CLOTHING_ARMOR_MEDIUM

/obj/item/clothing/suit/storage/marine/M3S
name = "\improper M3-S light armor"
desc = "A custom set of M3 armor designed for USCM Scouts."
Expand All @@ -665,6 +743,17 @@
flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE
unacidable = TRUE

/obj/item/clothing/suit/storage/marine/M3S/Initialize(mapload)
. = ..()
if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH))
armor_bullet = CLOTHING_ARMOR_HIGH
armor_bomb = CLOTHING_ARMOR_MEDIUM
armor_internaldamage = CLOTHING_ARMOR_HIGH
else
armor_bullet = CLOTHING_ARMOR_MEDIUM
armor_bomb = CLOTHING_ARMOR_MEDIUMLOW
armor_internaldamage = CLOTHING_ARMOR_MEDIUM

/obj/item/clothing/suit/storage/RO
name = "quartermaster jacket"
desc = "A green jacket worn by USCM personnel. The back has the flag of the United Americas on it."
Expand Down
11 changes: 11 additions & 0 deletions code/modules/clothing/suits/marine_armor/ghillie.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,17 @@

actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/specialist/prepare_position)

/obj/item/clothing/suit/storage/marine/ghillie/Initialize(mapload)
. = ..()
if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH))
armor_bullet = CLOTHING_ARMOR_HIGH
armor_bomb = CLOTHING_ARMOR_MEDIUM
armor_internaldamage = CLOTHING_ARMOR_HIGH
else
armor_bullet = CLOTHING_ARMOR_MEDIUM
armor_bomb = CLOTHING_ARMOR_MEDIUMLOW
armor_internaldamage = CLOTHING_ARMOR_MEDIUM

/obj/item/clothing/suit/storage/marine/ghillie/dropped(mob/user)
if(ishuman(user) && !issynth(user))
deactivate_camouflage(user, FALSE)
Expand Down
9 changes: 9 additions & 0 deletions code/modules/clothing/suits/marine_armor/smartgunner.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,12 @@
. = ..()

UnregisterSignal(user, COMSIG_HUMAN_ATTEMPTING_EQUIP)

/obj/item/clothing/suit/storage/marine/smartgunner/Initialize(mapload)
. = ..()
if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH))
armor_bullet = CLOTHING_ARMOR_HIGH
armor_internaldamage = CLOTHING_ARMOR_HIGH
else
armor_bullet = CLOTHING_ARMOR_MEDIUM
armor_internaldamage = CLOTHING_ARMOR_MEDIUM
Loading