Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

The syndicate has devised new anti-explosive armor for their hardsuits! #15567

Merged
JamieD1 merged 15 commits into from
Sep 4, 2022
Merged

The syndicate has devised new anti-explosive armor for their hardsuits! #15567

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
27f5fc5
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Oct 6, 2020
dd26ed1
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Oct 9, 2020
edc0df1
Merge branch 'yogstation13:master' into master
Mqiib Jan 29, 2022
7a20bc0
Merge branch 'yogstation13:master' into master
Mqiib Feb 7, 2022
88b109e
Merge branch 'yogstation13:master' into master
Mqiib Feb 24, 2022
6dd33d0
Merge branch 'yogstation13:master' into master
Mqiib Jul 29, 2022
5c2e288
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Aug 2, 2022
b9aadc8
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Aug 15, 2022
7761c93
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Aug 15, 2022
4ddc713
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Aug 16, 2022
eea26c8
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Aug 26, 2022
a73cf7a
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Aug 29, 2022
5e0ab40
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Aug 30, 2022
4aba646
Merge remote-tracking branch 'MqiibUpstream/master'
Mqiib Sep 1, 2022
fa27263
Moar
Mqiib Sep 2, 2022
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
12 changes: 6 additions & 6 deletions code/modules/clothing/spacesuits/hardsuit.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
icon_state = "hardsuit1-syndi"
item_state = "syndie_helm"
hardsuit_type = "syndi"
armor = list(MELEE = 40, BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 35, BIO = 100, RAD = 50, FIRE = 50, ACID = 90, WOUND = 25)
armor = list(MELEE = 40, BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 50, BIO = 100, RAD = 50, FIRE = 50, ACID = 90, WOUND = 25)
on = TRUE
var/obj/item/clothing/suit/space/hardsuit/syndi/linkedsuit = null
actions_types = list(/datum/action/item_action/toggle_helmet_mode)
Expand Down Expand Up @@ -371,7 +371,7 @@
item_state = "syndie_hardsuit"
hardsuit_type = "syndi"
w_class = WEIGHT_CLASS_NORMAL
armor = list(MELEE = 40, BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 35, BIO = 100, RAD = 50, FIRE = 50, ACID = 90, WOUND = 25)
armor = list(MELEE = 40, BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 50, BIO = 100, RAD = 50, FIRE = 50, ACID = 90, WOUND = 25)
allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi
jetpack = /obj/item/tank/jetpack/suit
Expand All @@ -383,7 +383,7 @@
alt_desc = "An elite version of the syndicate helmet, with improved armour and fireproofing. It is in combat mode. Property of Gorlex Marauders."
icon_state = "hardsuit0-syndielite"
hardsuit_type = "syndielite"
armor = list(MELEE = 60, BULLET = 60, LASER = 50, ENERGY = 25, BOMB = 55, BIO = 100, RAD = 70, FIRE = 100, ACID = 100, WOUND = 25)
armor = list(MELEE = 60, BULLET = 60, LASER = 50, ENERGY = 25, BOMB = 90, BIO = 100, RAD = 70, FIRE = 100, ACID = 100, WOUND = 25)
heat_protection = HEAD
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF | ACID_PROOF
Expand All @@ -395,7 +395,7 @@
icon_state = "hardsuit0-syndielite"
hardsuit_type = "syndielite"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite
armor = list(MELEE = 60, BULLET = 60, LASER = 50, ENERGY = 25, BOMB = 55, BIO = 100, RAD = 70, FIRE = 100, ACID = 100, WOUND = 25)
armor = list(MELEE = 60, BULLET = 60, LASER = 50, ENERGY = 25, BOMB = 90, BIO = 100, RAD = 70, FIRE = 100, ACID = 100, WOUND = 25)
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF | ACID_PROOF
Expand Down Expand Up @@ -1020,7 +1020,7 @@
icon_state = "hardsuit1-syndi"
item_state = "syndie_hardsuit"
hardsuit_type = "syndi"
armor = list(MELEE = 40, BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 35, BIO = 100, RAD = 50, FIRE = 100, ACID = 100, WOUND = 30)
armor = list(MELEE = 40, BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 80, BIO = 100, RAD = 50, FIRE = 100, ACID = 100, WOUND = 30)
allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/syndi
slowdown = 0
Expand All @@ -1036,7 +1036,7 @@
icon_state = "hardsuit1-syndi"
item_state = "syndie_helm"
hardsuit_type = "syndi"
armor = list(MELEE = 40, BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 35, BIO = 100, RAD = 50, FIRE = 100, ACID = 100, WOUND = 30)
armor = list(MELEE = 40, BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 80, BIO = 100, RAD = 50, FIRE = 100, ACID = 100, WOUND = 30)

///Deathsquad version

Expand Down