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

Hardsuit Thermoregulator fix #2322

Merged
merged 2 commits into from
Jun 22, 2024
Merged

Hardsuit Thermoregulator fix #2322

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88adbac
Added Button for Thermoregulator to hardsuits
ThePooba Jun 18, 2024
37b5b6b
Merge branch 'Monkestation:master' into Hardsuit-bugfixes
ThePooba Jun 18, 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
11 changes: 8 additions & 3 deletions monkestation/code/modules/clothing/spacesuits/hardsuits/_hardsuit.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/// How much damage you take from an emp when wearing a hardsuit
#define HARDSUIT_EMP_BURN 2 // a very orange number
#define THERMAL_REGULATOR_COST 6 // this runs out fast if 18

/obj/item/clothing/suit/space/hardsuit
name = "hardsuit"
Expand All @@ -12,7 +13,7 @@
armor_type = /datum/armor/hardsuit
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/t_scanner, /obj/item/construction/rcd, /obj/item/pipe_dispenser)
siemens_coefficient = 0
actions_types = list(/datum/action/item_action/toggle_helmet)
actions_types = list(/datum/action/item_action/toggle_helmet, /datum/action/item_action/toggle_spacesuit)

var/obj/item/clothing/head/helmet/space/hardsuit/helmet
var/helmettype = /obj/item/clothing/head/helmet/space/hardsuit
Expand Down Expand Up @@ -80,8 +81,12 @@
else
RemoveHelmet()

/obj/item/clothing/suit/space/hardsuit/ui_action_click()
ToggleHelmet()
/// implements button for thermoregulamators, checks if helmet or regulator is being toggled
/obj/item/clothing/suit/space/hardsuit/ui_action_click(mob/user, actiontype)
if(istype(actiontype, /datum/action/item_action/toggle_spacesuit))
toggle_spacesuit(user)
else if(istype(actiontype, /datum/action/item_action/toggle_helmet))
ToggleHelmet()

/obj/item/clothing/suit/space/hardsuit/attack_self(mob/user)
user.changeNext_move(CLICK_CD_MELEE)
Expand Down
Loading