From 0d874df208ca8f43d7706a16ce419bc2bb00cfbf Mon Sep 17 00:00:00 2001 From: Dip Date: Thu, 5 Nov 2020 03:54:04 -0300 Subject: [PATCH 1/3] Hypernoblium Bounty --- code/modules/cargo/bounties/engineering.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/cargo/bounties/engineering.dm b/code/modules/cargo/bounties/engineering.dm index 27ac4887..25ad9a7d 100644 --- a/code/modules/cargo/bounties/engineering.dm +++ b/code/modules/cargo/bounties/engineering.dm @@ -23,7 +23,13 @@ name = "Full Tank of Tritium" description = "Station 42 is looking to kickstart their research program. Ship them a tank full of Tritium." gas_type = /datum/gas/tritium - +//Hyperstation edit +/datum/bounty/item/engineering/gas/hypernoblium_tank + name = "Full Tank of Hyper-Noblium" + description = "The 7th Echelon is looking to research the effects of this rare gas in organics. They ask for a full tank of it. Are you up to the task?" + gas_type = /datum/gas/hypernoblium + reward = 75000 //Very, very difficult to make, requires a fuckton of structural re-design around engineering and can actually royally fuck up the entirety of the station if not done correctly. +//Hypersation edit end /datum/bounty/item/engineering/pacman name = "P.A.C.M.A.N.-type portable generator" description = "A neighboring station had a problem with their SMES, and now need something to power their communications console. Can you send them a P.AC.M.A.N.?" From c3bb44788bbc10643a9e97887eb2c88b7563500a Mon Sep 17 00:00:00 2001 From: Dip Date: Thu, 5 Nov 2020 04:00:03 -0300 Subject: [PATCH 2/3] Revert "Hypernoblium Bounty" This reverts commit 0d874df208ca8f43d7706a16ce419bc2bb00cfbf. --- code/modules/cargo/bounties/engineering.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/modules/cargo/bounties/engineering.dm b/code/modules/cargo/bounties/engineering.dm index 25ad9a7d..27ac4887 100644 --- a/code/modules/cargo/bounties/engineering.dm +++ b/code/modules/cargo/bounties/engineering.dm @@ -23,13 +23,7 @@ name = "Full Tank of Tritium" description = "Station 42 is looking to kickstart their research program. Ship them a tank full of Tritium." gas_type = /datum/gas/tritium -//Hyperstation edit -/datum/bounty/item/engineering/gas/hypernoblium_tank - name = "Full Tank of Hyper-Noblium" - description = "The 7th Echelon is looking to research the effects of this rare gas in organics. They ask for a full tank of it. Are you up to the task?" - gas_type = /datum/gas/hypernoblium - reward = 75000 //Very, very difficult to make, requires a fuckton of structural re-design around engineering and can actually royally fuck up the entirety of the station if not done correctly. -//Hypersation edit end + /datum/bounty/item/engineering/pacman name = "P.A.C.M.A.N.-type portable generator" description = "A neighboring station had a problem with their SMES, and now need something to power their communications console. Can you send them a P.AC.M.A.N.?" From b1c214959079bc50767df4372084fa14fb68a29f Mon Sep 17 00:00:00 2001 From: Dip Date: Sat, 7 Nov 2020 22:37:00 -0300 Subject: [PATCH 3/3] Remove mapload reebe --- code/controllers/subsystem/mapping.dm | 4 ++-- config/config.txt | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 2a359465..7f9c104b 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -91,7 +91,7 @@ SUBSYSTEM_DEF(mapping) seedRuins(space_ruins, CONFIG_GET(number/space_budget), /area/space, space_ruins_templates) SSmapping.seedStation() loading_ruins = FALSE - + /* //Hyper change - preload Reebe for midround purposes. I'll change this when I find a decent way to load maps midround. var/list/errorList = list() var/list/reebes = SSmapping.LoadGroup(errorList, "Reebe", "map_files/generic", "City_of_Cogs.dmm", default_traits = ZTRAITS_REEBE, silent = TRUE) @@ -101,7 +101,7 @@ SUBSYSTEM_DEF(mapping) return FALSE for(var/datum/parsed_map/PM in reebes) PM.initTemplateBounds() - + */ #endif repopulate_sorted_areas() // Set up Z-level transitions. diff --git a/config/config.txt b/config/config.txt index d6a6f18f..1d7b9ce1 100644 --- a/config/config.txt +++ b/config/config.txt @@ -475,3 +475,6 @@ DISABLE_HIGH_POP_MC_MODE_AMOUNT 60 ## For reference, Goonstation uses a resolution of 21x15 for it's widescreen mode. ## Do note that changing this value will affect the title screen. The title screen will have to be updated manually if this is changed. DEFAULT_VIEW 21x15 + +## Enable Dynamic mode +DYNAMIC_MODE \ No newline at end of file