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

Minor QoL and bug fixes for mining #3847

Merged
merged 2 commits into from
Oct 22, 2024
Merged

Minor QoL and bug fixes for mining #3847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a25b3bd
minorchanges
Shoddd Oct 17, 2024
77564c4
use that var
Shoddd Oct 21, 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
2 changes: 1 addition & 1 deletion code/datums/mind/antag.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
enslaved_to = WEAKREF(creator)

current.faction |= creator.faction
creator.faction |= current.faction
creator.faction |= "[REF(current)]"

if(creator.mind?.special_role)
message_admins("[ADMIN_LOOKUPFLW(current)] has been created by [ADMIN_LOOKUPFLW(creator)], an antagonist.")
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/shoes/boots.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
icon_state = "iceboots"
inhand_icon_state = null
clothing_traits = list(TRAIT_NO_SLIP_ICE, TRAIT_NO_SLIP_SLIDE)
resistance_flags = FIRE_PROOF // Monkestation addition

// A pair of ice boots intended for general crew EVA use - see EVA winter coat for comparison.
/obj/item/clothing/shoes/winterboots/ice_boots/eva
Expand Down
10 changes: 10 additions & 0 deletions code/modules/mob/living/basic/basic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@
///This damage is taken when atmos doesn't fit all the requirements above. Set to 0 to avoid adding the atmos_requirements element.
var/unsuitable_atmos_damage = 1

//MONKESTATION EDIT START
/// List of weather immunity traits that are then added on Initialize(), see traits.dm.
var/list/weather_immunities
Shoddd marked this conversation as resolved.
Show resolved Hide resolved
//MONKESTATION EDIT END

bodytemp_cold_damage_limit = NPC_DEFAULT_MIN_TEMP
bodytemp_heat_damage_limit = NPC_DEFAULT_MAX_TEMP
///This damage is taken when the body temp is too cold. Set both this and unsuitable_heat_damage to 0 to avoid adding the basic_body_temp_sensitive element.
Expand All @@ -107,6 +112,11 @@
if(!real_name)
real_name = name

// MONKESTATION ADDITION START
if(length(weather_immunities))
add_traits(weather_immunities, ROUNDSTART_TRAIT)
//MONKESTATION ADDITION END

/* MONKESTATION REMOVAL - This is totally valid to create a mob in nullspace, its not valid to move a client onto it, this seems weird.
if(!loc)
stack_trace("Basic mob being instantiated in nullspace")
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/basic/guardian/guardian.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
basic_mob_flags = DEL_ON_DEATH
sentience_type = SENTIENCE_HUMANOID
hud_type = /datum/hud/guardian
weather_immunities = list(TRAIT_ASHSTORM_IMMUNE) // Monkestation addition
faction = list()
speed = 0
maxHealth = INFINITY // The spirit itself is invincible and passes damage to its host
Expand Down
Loading