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.

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

Replaces generic HOS spacesuit with nerfed Mjolnir #2636

Merged
merged 10 commits into from
Aug 24, 2024
2 changes: 1 addition & 1 deletion _maps/map_files/Aetherwhisp/Aetherwhisp1.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion _maps/map_files/Atlas/atlas2.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions _maps/map_files/Galactica/Galactica1.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion _maps/map_files/Galactica/old/Galactica_old.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion _maps/map_files/Gladius/Gladius1.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion _maps/map_files/Hammerhead/Hammerhead.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion _maps/map_files/Serendipity/Serendipity1.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion _maps/map_files/Shrike/Shrike1.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion _maps/map_files/Snake/snake_upper.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion _maps/map_files/Tycoon/Tycoon2.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion _maps/map_files/Vago/vagodeck1.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 8 additions & 4 deletions code/modules/clothing/spacesuits/hardsuit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -447,15 +447,19 @@
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi
jetpack = /obj/item/tank/jetpack/suit
item_flags = ILLEGAL //Syndicate only and difficult to obtain outside of uplink anyway. Nukie hardsuits on the ship are illegal.
var/cm_slowdown = 0 //NSV13
actions_types = list(
/datum/action/item_action/toggle_helmet,
/datum/action/item_action/toggle_beacon,
/datum/action/item_action/toggle_beacon_frequency
)

/obj/item/clothing/suit/space/hardsuit/syndi/ComponentInitialize()
. = ..()
AddComponent(/datum/component/anti_artifact, INFINITY, FALSE, 100)
/obj/item/clothing/suit/space/hardsuit/syndi/ComponentInitialize() //NSV13
. = ..()
artifact_immunity()

/obj/item/clothing/suit/space/hardsuit/syndi/proc/artifact_immunity() //NSV13
AddComponent(/datum/component/anti_artifact, INFINITY, FALSE, 100)

/obj/item/clothing/suit/space/hardsuit/syndi/ui_action_click(mob/user, datum/actiontype)
switch(actiontype.type)
Expand Down Expand Up @@ -516,7 +520,7 @@
/obj/item/clothing/suit/space/hardsuit/syndi/proc/activate_combat_mode()
name = "[initial(name)] (combat)"
desc = alt_desc
slowdown = 0
slowdown = cm_slowdown //NSV13
clothing_flags &= ~STOPSPRESSUREDAMAGE
cold_protection &= ~(CHEST | GROIN | LEGS | FEET | ARMS | HANDS)
if(ishuman(loc))
Expand Down
25 changes: 15 additions & 10 deletions nsv13/code/modules/clothing/custom_clothes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -279,31 +279,35 @@
worn_icon = 'nsv13/icons/mob/head.dmi'
icon_state = "hardsuit1-peacekeeper_space"
item_state = "peacekeeper_space"
worn_icon_state = "peacekeeper_space"
hardsuit_type = "peacekeeper_space"
desc = "A hardsuit helmet fitted with highly experimental magnetic interlocks, allowing it to create a vacuum seal around the user, permitting usage in a hard vacuum. It is currently in EVA mode."
alt_desc = "A hardsuit helmet fitted with highly experimental magnetic interlocks, allowing it to create a vacuum seal around the user, permitting usage in a hard vacuum. It is currently in IVA mode."
armor = list("melee" = 20, "bullet" = 30, "laser" = 10, "energy" = 10, "bomb" = 70, "bio" = 100, "rad" = 50, "fire" = 100, "acid" = 100)
armor = list("melee" = 40, "bullet" = 50, "laser" = 15,"energy" = 30, "bomb" = 25, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75, "stamina" = 50)
resistance_flags = FIRE_PROOF | ACID_PROOF
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT //we want to see the mask
heat_protection = HEAD
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT

/obj/item/clothing/suit/space/hardsuit/syndi/peacekeeper
name = "SG-1 Mjolnir Armour"
desc = "An extremely bulky suit of armour fitted with highly experimental magnetic interlocks, allowing it to create a vacuum seal around the user, permitting usage in a hard vacuum. It is currently in EVA mode."
alt_desc = "An extremely bulky suit of armour fitted with highly experimental magnetic interlocks, allowing it to create a vacuum seal around the user, permitting usage in a hard vacuum. It is currently in IVA mode."
icon = 'nsv13/icons/obj/clothing/suits.dmi'
worn_icon = 'nsv13/icons/mob/suit.dmi'
icon_state = "peacekeeper_space"
icon_state = "hardsuit1-peacekeeper_space"
item_state = "peacekeeper_space"
worn_icon_state = "peacekeeper_space"
hardsuit_type = "peacekeeper_space"
allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/stock_parts/cell)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/peacekeeper
armor = list("melee" = 40, "bullet" = 60, "laser" = 50, "energy" = 25, "bomb" = 50, "bio" = 100, "rad" = 40, "fire" = 100, "acid" = 100)
armor = list("melee" = 40, "bullet" = 50, "laser" = 15, "energy" = 30, "bomb" = 25, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75, "stamina" = 50)
resistance_flags = FIRE_PROOF | ACID_PROOF
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
var/stomp_cooldown_time = 0.3 SECONDS
var/stomp_cooldown_time = 0.5 SECONDS
var/current_cooldown = 0
w_class = WEIGHT_CLASS_BULKY
supports_variations = NO_VARIATION
item_flags = NONE
cm_slowdown = 0.2 //up for debate

/obj/item/clothing/suit/space/hardsuit/syndi/peacekeeper/artifact_immunity()
return

/obj/item/clothing/suit/space/hardsuit/syndi/peacekeeper/on_mob_move()
var/mob/living/carbon/human/H = loc
Expand Down Expand Up @@ -339,6 +343,7 @@
/obj/machinery/suit_storage_unit/peacekeeper
suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/peacekeeper
mask_type = /obj/item/clothing/mask/gas/sechailer
storage_type = /obj/item/tank/internals/oxygen

/obj/item/clothing/suit/space/syndicate/odst
name = "drop trooper space suit"
Expand Down
Binary file modified nsv13/icons/mob/head.dmi
Binary file not shown.
Binary file modified nsv13/icons/mob/suit.dmi
Binary file not shown.
Binary file modified nsv13/icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file modified nsv13/icons/obj/clothing/suits.dmi
Binary file not shown.
Loading