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

Replaces generic HOS spacesuit with nerfed Mjolnir #2636

Merged
merged 10 commits into from
Aug 24, 2024
Merged

Replaces generic HOS spacesuit with nerfed Mjolnir #2636

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f2089d7
initial
BlueHNT May 3, 2024
1bffe3c
requested fixes, colour palette switch, added to maps
BlueHNT May 5, 2024
9ab88bf
legacy mjolnir sprites
BlueHNT May 5, 2024
6b66519
changes galactica peacekeeper back to blue
BlueHNT May 5, 2024
d640238
removes hos_old and adds peacekeeper to maps
BlueHNT May 6, 2024
9671311
Fixes requested by @DeltaFire15
BlueHNT May 6, 2024
72b3326
Changes null to NONE
BlueHNT May 6, 2024
f41a3b7
ditigrade clear
BlueHNT May 6, 2024
58b1ac2
Merge branch 'BeeStation:master' into Mjolnir-Return-to-HOS
BlueHNT Jun 14, 2024
82ed1a6
Merge branch 'BeeStation:master' into Mjolnir-Return-to-HOS
BlueHNT Jul 12, 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
6 changes: 3 additions & 3 deletions _maps/map_files/Galactica/Galactica1.dmm
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion code/game/machinery/suit_storage_unit.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
suit_type = /obj/item/clothing/suit/space/hardsuit/security
mask_type = /obj/item/clothing/mask/gas/sechailer

/obj/machinery/suit_storage_unit/hos
/obj/machinery/suit_storage_unit/hos_old
BlueHNT marked this conversation as resolved.
Show resolved Hide resolved
suit_type = /obj/item/clothing/suit/space/hardsuit/security/head_of_security
mask_type = /obj/item/clothing/mask/gas/sechailer
storage_type = /obj/item/tank/internals/oxygen
Expand Down
19 changes: 8 additions & 11 deletions nsv13/code/modules/clothing/custom_clothes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,30 +275,26 @@
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"
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

BlueHNT marked this conversation as resolved.
Show resolved Hide resolved
/obj/item/clothing/suit/space/hardsuit/syndi/peacekeeper/on_mob_move()
Expand Down Expand Up @@ -332,9 +328,10 @@
listeningTo = null
return ..()

/obj/machinery/suit_storage_unit/peacekeeper
/obj/machinery/suit_storage_unit/hos
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
View file
Open in desktop
Binary file not shown.
Binary file modified nsv13/icons/mob/suit.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified nsv13/icons/obj/clothing/hats.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified nsv13/icons/obj/clothing/suits.dmi
View file
Open in desktop
Binary file not shown.
Loading