From e26b48d335cd49179d4dd0ccbbf8e2ec90bb81bb Mon Sep 17 00:00:00 2001 From: RadiantFlash7 Date: Sun, 5 Jan 2020 01:09:08 -0500 Subject: [PATCH] Map fixes. Reduces RCD cost per use of mattercartridges. Readds Fancy coffeeshop sign. Re-adds Bluespace coffee. Fixes bluespace coffee sprite and code. Fixes access to rad shelter on sublevel 2, Fixes space tiles in main level window of sec outpost, Fixes SMES names and RCON names to be the same now. Fixes Skydiving teleporter (Updated refractored code) Removed extra APCs, and security cameras facing the wrong way. Tries to fix Debris field teleporters (still don't understand why theres a second destination in the shuttle console. Halp.) Increases explorer job slots. 2 is not 'nough. Reduces efficiency of cooling loop for TEG. (Waiting on Izac's weakened TEGS for further update) Buffs health of freezable airlocks, so spiders won't constantly destroy them so quick. Fixes borked up wire connecting solars to main. Fixes incorrect facing security camera in security. Adds status displays to escape, changes explorer limit from 5 to 3. (what was I thinking?) Still an improvement over 2. --- code/__defines/misc.dm | 6 +- code/game/objects/structures/signs.dm | 8 +- .../loadout/loadout_fluffitems_yw.dm | 6 + code/modules/mining/mine_turfs.dm | 1 + .../food/drinks/bluespacecoffee.dm | 2 +- icons/obj/coffee.dmi | Bin 2904 -> 3239 bytes maps/yw/cryogaia-02-mining.dmm | 22 +- maps/yw/cryogaia-04-maintenance.dmm | 73 ++-- maps/yw/cryogaia-05-main.dmm | 186 ++++---- maps/yw/cryogaia_jobs.dm | 4 +- maps/yw/cryogaia_things.dm | 18 +- maps/yw/submaps/beach/beach.dmm | 35 +- maps/yw/submaps/cryogaia_ships.dmm | 88 ++-- maps/yw/submaps/space/_debrisfield.dm | 12 +- maps/yw/submaps/space/debrisfield.dmm | 407 +++++++++++------- maps/yw/submaps/space/debrisfield_old.dmm | 151 +++++++ 16 files changed, 636 insertions(+), 383 deletions(-) create mode 100644 maps/yw/submaps/space/debrisfield_old.dmm diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index e8242af113..ad8ebec488 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -344,7 +344,7 @@ var/global/list/##LIST_NAME = list();\ #define RCD_VALUE_DELAY "delay" #define RCD_VALUE_COST "cost" -#define RCD_SHEETS_PER_MATTER_UNIT 4 // Each physical material sheet is worth four matter units. +#define RCD_SHEETS_PER_MATTER_UNIT 3 // Each physical material sheet is worth four matter units. ///YW EDIT 4->3 *Buffing RCDs Hopefully.* #define RCD_MAX_CAPACITY 30 * RCD_SHEETS_PER_MATTER_UNIT // Radiation 'levels'. Used for the geiger counter, for visuals and sound. They are in different files so this goes here. @@ -353,9 +353,7 @@ var/global/list/##LIST_NAME = list();\ #define RAD_LEVEL_HIGH 25 #define RAD_LEVEL_VERY_HIGH 75 -// Calculation modes for effective radiation -#define RAD_RESIST_CALC_DIV 0 // Each turf absorbs some fraction of the working radiation level -#define RAD_RESIST_CALC_SUB 1 // Each turf absorbs a fixed amount of radiation +#define RADIATION_THRESHOLD_CUTOFF 0.1 // Radiation will not affect a tile when below this value. //https://secure.byond.com/docs/ref/info.html#/atom/var/mouse_opacity #define MOUSE_OPACITY_TRANSPARENT 0 diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index f93ceaf0a1..730b6af0cb 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -815,4 +815,10 @@ /obj/structure/sign/poi/engineright name = "I.C.V." desc = "The charred name of a cargo ship of some description." - icon_state = "poi_engine2" \ No newline at end of file + icon_state = "poi_engine2" + +/obj/structure/sign/coffee + name = "\improper Cafe-Library" + desc = "A sign advertising the library cafe hybrid." + icon = 'icons/obj/coffee.dmi' + icon_state = "coffee_sign" \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm index d6a095562f..11dbbb06eb 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm @@ -795,6 +795,12 @@ description = "A golden necklace, the symbol for the Zahirn clan can be found on it's pendant." ckeywhitelist = list("radiantflash") character_name = list("Vasharr Zahirn") +/datum/gear/fluff/vasharr_coffee + path = /obj/item/weapon/reagent_containers/food/drinks/bluespace_coffee + display_name = "Bluespace Coffee" + description = "Dreamt up in a strange feverish dream, this coffee cup seems to have been heavily modified with a variety of unlikely parts and wires, and never seems to run out of coffee. Truly the differance between madmen and genius is success." + ckeywhitelist = list("radiantflash") + character_name = list("Vasharr Zahirn") /datum/gear/fluff/vasharr_under path = /obj/item/clothing/under/explorer/utility/command/engineering/fluff/vasharr diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 1e122d0a51..e23fa406e7 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -6,6 +6,7 @@ var/list/mining_overlay_cache = list() icon = 'icons/turf/walls.dmi' icon_state = "rock-dark" density = 1 + opacity = 1 /turf/unsimulated/mineral/ice name = "Ice wall" diff --git a/code/modules/reagents/reagent_containers/food/drinks/bluespacecoffee.dm b/code/modules/reagents/reagent_containers/food/drinks/bluespacecoffee.dm index edcd80b76b..ff28ebb9f5 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bluespacecoffee.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bluespacecoffee.dm @@ -1,6 +1,6 @@ /obj/item/weapon/reagent_containers/food/drinks/bluespace_coffee name = "bluespace coffee" - desc = "This revolutionary device is always full of hot 'coffee'; no one knows where it comes from..." + desc = "Dreamt up in a strange feverish dream, this coffee cup seems to have been heavily modified with a variety of unlikely parts and wires, and never seems to run out of coffee. Truly the differance between madmen and genius is success." icon = 'icons/obj/coffee.dmi' icon_state = "bluespace_coffee" center_of_mass = list("x"=15, "y"=10) diff --git a/icons/obj/coffee.dmi b/icons/obj/coffee.dmi index 85fc2d0a32b05e14faf41bc79fe74461b1647afa..dfcbadd5b30fac0e8e5fb6408b3cb6b3447ec6d8 100644 GIT binary patch literal 3239 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