diff --git a/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm b/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm index 94eeb5b48c0..5ba89260bd2 100644 --- a/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm +++ b/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm @@ -31015,7 +31015,7 @@ /turf/open/floor/carpet/ship, /area/crew_quarters/cafeteria) "ujB" = ( -/obj/machinery/suit_storage_unit/hos, +/obj/machinery/suit_storage_unit/peacekeeper, /obj/machinery/camera/autoname{ dir = 1 }, diff --git a/_maps/map_files/Atlas/atlas2.dmm b/_maps/map_files/Atlas/atlas2.dmm index 23922a9c5e6..79632ecce31 100644 --- a/_maps/map_files/Atlas/atlas2.dmm +++ b/_maps/map_files/Atlas/atlas2.dmm @@ -8682,7 +8682,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/suit_storage_unit/hos, +/obj/machinery/suit_storage_unit/peacekeeper, /obj/machinery/requests_console{ announcementConsole = 1; department = "Head of Security's Desk"; diff --git a/_maps/map_files/Galactica/Galactica1.dmm b/_maps/map_files/Galactica/Galactica1.dmm index 3564a708c46..4a71aadd233 100644 --- a/_maps/map_files/Galactica/Galactica1.dmm +++ b/_maps/map_files/Galactica/Galactica1.dmm @@ -14459,7 +14459,7 @@ name = "Head of Security RC"; pixel_y = 26 }, -/obj/machinery/suit_storage_unit/hos, +/obj/machinery/suit_storage_unit/peacekeeper, /turf/open/floor/monotile/dark, /area/crew_quarters/heads/hos) "KX" = ( @@ -14681,20 +14681,20 @@ /obj/item/trash{ desc = "A relic of a more soulful security department"; icon = 'nsv13/icons/obj/clothing/suits.dmi'; - icon_state = "peacekeeper_space"; + icon_state = "mjolnir_legacy"; name = "SG-1 Mjolnir Armour" }, /obj/item/trash{ desc = "A relic of a more soulful security department"; icon = 'nsv13/icons/obj/clothing/suits.dmi'; - icon_state = "peacekeeper_space"; + icon_state = "mjolnir_legacy"; name = "SG-1 Mjolnir Armour"; pixel_y = -4 }, /obj/item/trash{ desc = "A relic of a more soulful security department"; icon = 'nsv13/icons/obj/clothing/suits.dmi'; - icon_state = "peacekeeper_space"; + icon_state = "mjolnir_legacy"; name = "SG-1 Mjolnir Armour"; pixel_y = 4 }, diff --git a/_maps/map_files/Galactica/old/Galactica_old.dmm b/_maps/map_files/Galactica/old/Galactica_old.dmm index 448590381cf..d9f11278f5a 100644 --- a/_maps/map_files/Galactica/old/Galactica_old.dmm +++ b/_maps/map_files/Galactica/old/Galactica_old.dmm @@ -952,7 +952,7 @@ /turf/open/floor/monotile, /area/crew_quarters/heads/hos) "dd" = ( -/obj/machinery/suit_storage_unit/hos, +/obj/machinery/suit_storage_unit/peacekeeper, /obj/machinery/airalarm{ dir = 4; pixel_x = -22 diff --git a/_maps/map_files/Gladius/Gladius1.dmm b/_maps/map_files/Gladius/Gladius1.dmm index f0bf535471c..18c223e1c6c 100644 --- a/_maps/map_files/Gladius/Gladius1.dmm +++ b/_maps/map_files/Gladius/Gladius1.dmm @@ -47071,7 +47071,7 @@ /turf/open/floor/monotile/light, /area/medical/medbay/aft) "wkn" = ( -/obj/machinery/suit_storage_unit/hos, +/obj/machinery/suit_storage_unit/peacekeeper, /obj/machinery/status_display/evac/south, /turf/open/floor/monotile/steel, /area/crew_quarters/heads/hos) diff --git a/_maps/map_files/Hammerhead/Hammerhead.dmm b/_maps/map_files/Hammerhead/Hammerhead.dmm index 28830c9cdc4..1153e2520a7 100644 --- a/_maps/map_files/Hammerhead/Hammerhead.dmm +++ b/_maps/map_files/Hammerhead/Hammerhead.dmm @@ -30850,7 +30850,7 @@ /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) "iyP" = ( -/obj/machinery/suit_storage_unit/hos, +/obj/machinery/suit_storage_unit/peacekeeper, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hos) "iyY" = ( diff --git a/_maps/map_files/Serendipity/Serendipity1.dmm b/_maps/map_files/Serendipity/Serendipity1.dmm index 139581a81b4..bed5e7dbc05 100644 --- a/_maps/map_files/Serendipity/Serendipity1.dmm +++ b/_maps/map_files/Serendipity/Serendipity1.dmm @@ -15472,7 +15472,7 @@ /turf/open/floor/plasteel/tiled/light, /area/bridge/cic) "YZ" = ( -/obj/machinery/suit_storage_unit/hos, +/obj/machinery/suit_storage_unit/peacekeeper, /obj/machinery/camera/autoname{ dir = 4 }, diff --git a/_maps/map_files/Shrike/Shrike1.dmm b/_maps/map_files/Shrike/Shrike1.dmm index b7fc83f845e..5d11d193318 100644 --- a/_maps/map_files/Shrike/Shrike1.dmm +++ b/_maps/map_files/Shrike/Shrike1.dmm @@ -10830,7 +10830,7 @@ lighting_colour_tube = "#c1e1ff" }) "Wd" = ( -/obj/machinery/suit_storage_unit/hos, +/obj/machinery/suit_storage_unit/peacekeeper, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west, /obj/machinery/door/window{ diff --git a/_maps/map_files/Snake/snake_upper.dmm b/_maps/map_files/Snake/snake_upper.dmm index 526d1ec8dfc..30174efa977 100644 --- a/_maps/map_files/Snake/snake_upper.dmm +++ b/_maps/map_files/Snake/snake_upper.dmm @@ -6409,7 +6409,7 @@ pixel_x = 8; pixel_y = 24 }, -/obj/machinery/suit_storage_unit/hos, +/obj/machinery/suit_storage_unit/peacekeeper, /obj/structure/extinguisher_cabinet/east, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index 5ce62ce8fba..5511dae02d0 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -11320,7 +11320,7 @@ /turf/open/floor/monotile/steel, /area/crew_quarters/heads/hos) "aFG" = ( -/obj/machinery/suit_storage_unit/hos, +/obj/machinery/suit_storage_unit/peacekeeper, /obj/machinery/power/apc/auto_name/north{ pixel_y = 24 }, diff --git a/_maps/map_files/Vago/vagodeck1.dmm b/_maps/map_files/Vago/vagodeck1.dmm index e3d3b1ce0ef..8416589f6cb 100644 --- a/_maps/map_files/Vago/vagodeck1.dmm +++ b/_maps/map_files/Vago/vagodeck1.dmm @@ -7226,7 +7226,7 @@ /turf/open/openspace, /area/hallway/nsv/deck1/frame4/central) "qP" = ( -/obj/machinery/suit_storage_unit/hos, +/obj/machinery/suit_storage_unit/peacekeeper, /obj/structure/reagent_dispensers/peppertank{ pixel_y = 27 }, diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index e1bdee8c52c..7a2ae886d47 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -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) @@ -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)) diff --git a/nsv13/code/modules/clothing/custom_clothes.dm b/nsv13/code/modules/clothing/custom_clothes.dm index 283191e1580..8d5bd877b4c 100644 --- a/nsv13/code/modules/clothing/custom_clothes.dm +++ b/nsv13/code/modules/clothing/custom_clothes.dm @@ -279,14 +279,12 @@ 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" @@ -294,16 +292,22 @@ 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 @@ -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" diff --git a/nsv13/icons/mob/head.dmi b/nsv13/icons/mob/head.dmi index 6e2d2ecaf9f..9db6b16434c 100644 Binary files a/nsv13/icons/mob/head.dmi and b/nsv13/icons/mob/head.dmi differ diff --git a/nsv13/icons/mob/suit.dmi b/nsv13/icons/mob/suit.dmi index cea84ef18c2..11e86cd757f 100644 Binary files a/nsv13/icons/mob/suit.dmi and b/nsv13/icons/mob/suit.dmi differ diff --git a/nsv13/icons/obj/clothing/hats.dmi b/nsv13/icons/obj/clothing/hats.dmi index 95ac354857a..62366b0b4e3 100644 Binary files a/nsv13/icons/obj/clothing/hats.dmi and b/nsv13/icons/obj/clothing/hats.dmi differ diff --git a/nsv13/icons/obj/clothing/suits.dmi b/nsv13/icons/obj/clothing/suits.dmi index 7de9dbe3f13..a84613439d6 100644 Binary files a/nsv13/icons/obj/clothing/suits.dmi and b/nsv13/icons/obj/clothing/suits.dmi differ