diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm index c908baba326..caec5fa8ea6 100644 --- a/code/datums/ruins/lavaland.dm +++ b/code/datums/ruins/lavaland.dm @@ -12,13 +12,14 @@ Comes with a rustic wooden bar and suicidal bartender." suffix = "lavaland_biodome_beach.dmm" -/datum/map_template/ruin/lavaland/hierophant - name = "Hierophant's Arena" - id = "hierophant" - description = "A strange, square chunk of metal of massive size. Inside awaits only death and many, many squares." - suffix = "lavaland_surface_hierophant.dmm" +/datum/map_template/ruin/lavaland/seed_vault + name = "Seed Vault" + id = "seed-vault" + description = "The creators of these vaults were a highly advanced and benevolent race, and launched many into the stars, hoping to aid fledgling civilizations. \ + However, all the inhabitants seem to do is grow drugs and guns." + suffix = "lavaland_surface_seed_vault.dmm" + cost = 10 allow_duplicates = FALSE - always_place = TRUE datum/map_template/ruin/lavaland/ash_walker name = "Ash Walker Nest" @@ -45,30 +46,13 @@ datum/map_template/ruin/lavaland/ash_walker suffix = "lavaland_surface_animal_hospital.dmm" allow_duplicates = FALSE -/datum/map_template/ruin/lavaland/seed_vault - name = "Seed Vault" - id = "seed-vault" - description = "The creators of these vaults were a highly advanced and benevolent race, and launched many into the stars, hoping to aid fledgling civilizations. \ - However, all the inhabitants seem to do is grow drugs and guns." - suffix = "lavaland_surface_seed_vault.dmm" - cost = 10 +/datum/map_template/ruin/lavaland/hierophant + name = "Hierophant's Arena" + id = "hierophant" + description = "A strange, square chunk of metal of massive size. Inside awaits only death and many, many squares." + suffix = "lavaland_surface_hierophant.dmm" allow_duplicates = FALSE - -/datum/map_template/ruin/lavaland/hermit - name = "Makeshift Shelter" - id = "hermitcave" - description = "A place of shelter for a lone hermit, scraping by to live another day." - suffix = "lavaland_surface_hermit.dmm" - allow_duplicates = FALSE - cost = 10 - -/datum/map_template/ruin/lavaland/swarmer_boss - name = "Crashed Shuttle" - id = "swarmerboss" - description = "A Syndicate shuttle had an unfortunate stowaway..." - suffix = "lavaland_surface_swarmer_crash.dmm" - allow_duplicates = FALSE - cost = 20 + always_place = TRUE /datum/map_template/ruin/lavaland/blood_drunk_miner name = "Blood-Drunk Miner" @@ -84,4 +68,20 @@ datum/map_template/ruin/lavaland/ash_walker /datum/map_template/ruin/lavaland/blood_drunk_miner/hunter name = "Blood-Drunk Miner (Hunter)" - suffix = "lavaland_surface_blooddrunk3.dmm" \ No newline at end of file + suffix = "lavaland_surface_blooddrunk3.dmm" + +/datum/map_template/ruin/lavaland/hermit + name = "Makeshift Shelter" + id = "hermitcave" + description = "A place of shelter for a lone hermit, scraping by to live another day." + suffix = "lavaland_surface_hermit.dmm" + allow_duplicates = FALSE + cost = 10 + +/datum/map_template/ruin/lavaland/swarmer_boss + name = "Crashed Shuttle" + id = "swarmerboss" + description = "A Syndicate shuttle had an unfortunate stowaway..." + suffix = "lavaland_surface_swarmer_crash.dmm" + allow_duplicates = FALSE + cost = 20 \ No newline at end of file diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index dd2e326b6cd..387cc70f992 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -44,3 +44,12 @@ id = "Exercised" duration = 1200 alert_type = null + +/datum/status_effect/exercised/on_creation(mob/living/new_owner, ...) + . = ..() + STOP_PROCESSING(SSfastprocess, src) + START_PROCESSING(SSprocessing, src) //this lasts 20 minutes, so SSfastprocess isn't needed. + +/datum/status_effect/exercised/Destroy() + . = ..() + STOP_PROCESSING(SSprocessing, src) diff --git a/code/game/area/areas/mining.dm b/code/game/area/areas/mining.dm index e5b2e1e2c95..4a2317889fa 100644 --- a/code/game/area/areas/mining.dm +++ b/code/game/area/areas/mining.dm @@ -2,19 +2,19 @@ /area/mine icon_state = "mining" - has_gravity = 1 + has_gravity = TRUE /area/mine/explored name = "Mine" icon_state = "explored" music = null - always_unpowered = 1 - requires_power = 1 - poweralm = 0 - power_environ = 0 - power_equip = 0 - power_light = 0 - outdoors = 1 + always_unpowered = TRUE + requires_power = TRUE + poweralm = FALSE + power_environ = FALSE + power_equip = FALSE + power_light = FALSE + outdoors = TRUE ambientsounds = list('sound/ambience/ambimine.ogg') flags = NONE @@ -25,13 +25,13 @@ name = "Mine" icon_state = "unexplored" music = null - always_unpowered = 1 - requires_power = 1 - poweralm = 0 - power_environ = 0 - power_equip = 0 - power_light = 0 - outdoors = 1 + always_unpowered = TRUE + requires_power = TRUE + poweralm = FALSE + power_environ = FALSE + power_equip = FALSE + power_light = FALSE + outdoors = TRUE ambientsounds = list('sound/ambience/ambimine.ogg') flags = NONE @@ -90,35 +90,35 @@ /area/lavaland icon_state = "mining" - has_gravity = 1 + has_gravity = TRUE /area/lavaland/surface name = "Lavaland" icon_state = "explored" music = null - always_unpowered = 1 - poweralm = 0 - power_environ = 0 - power_equip = 0 - power_light = 0 - requires_power = 1 + always_unpowered = TRUE + poweralm = FALSE + power_environ = FALSE + power_equip = FALSE + power_light = FALSE + requires_power = TRUE ambientsounds = list('sound/ambience/ambilava.ogg') /area/lavaland/underground name = "Lavaland Caves" icon_state = "unexplored" music = null - always_unpowered = 1 - requires_power = 1 - poweralm = 0 - power_environ = 0 - power_equip = 0 - power_light = 0 + always_unpowered = TRUE + requires_power = TRUE + poweralm = FALSE + power_environ = FALSE + power_equip = FALSE + power_light = FALSE ambientsounds = list('sound/ambience/ambilava.ogg') /area/lavaland/surface/outdoors name = "Lavaland Wastes" - outdoors = 1 + outdoors = TRUE /area/lavaland/surface/outdoors/unexplored //monsters and ruins spawn here icon_state = "unexplored" diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm index e2e53533110..fcf43f23ad1 100644 --- a/code/game/area/areas/ruins/lavaland.dm +++ b/code/game/area/areas/ruins/lavaland.dm @@ -1,8 +1,5 @@ //Lavaland Ruins -/area/ruin - ambientsounds = list('sound/ambience/ambimine.ogg') - /area/ruin/powered/beach icon_state = "dk_yellow" diff --git a/code/modules/ruins/ruin_areas.dm b/code/modules/ruins/ruin_areas.dm index 4fbbbe82845..1175b4cb5f7 100644 --- a/code/modules/ruins/ruin_areas.dm +++ b/code/modules/ruins/ruin_areas.dm @@ -3,17 +3,18 @@ /area/ruin name = "\improper Unexplored Location" icon_state = "away" - has_gravity = 1 - there_can_be_many = 1 + has_gravity = TRUE + there_can_be_many = TRUE + ambientsounds = list('sound/ambience/ambimine.ogg') /area/ruin/unpowered - always_unpowered = 0 + always_unpowered = FALSE /area/ruin/unpowered/no_grav - has_gravity = 0 + has_gravity = FALSE /area/ruin/powered - requires_power = 0 + requires_power = FALSE //Areas