From b34f23b281f6e8f29607a6e63897bf1ca9403c8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Apr 2021 02:40:30 +0000 Subject: [PATCH 1/2] Bump ssri from 6.0.1 to 6.0.2 in /tgui-next Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/npm/ssri/releases) - [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md) - [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2) Signed-off-by: dependabot[bot] --- tgui-next/yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tgui-next/yarn.lock b/tgui-next/yarn.lock index e9dc9f0f..d5247f66 100644 --- a/tgui-next/yarn.lock +++ b/tgui-next/yarn.lock @@ -2499,9 +2499,9 @@ fg-loadcss@^2.1.0: integrity sha512-HpvR2uRoKvrYAEwimw+k4Fr2NVHYPfld5Lc/f9uy3mKeUTXhS5urL24XA2rqyq5b2i410EXCLir4Uhsb8J1QaQ== figgy-pudding@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790" - integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w== + version "3.5.2" + resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" + integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== figures@^3.0.0: version "3.1.0" @@ -5438,9 +5438,9 @@ sprintf-js@~1.0.2: integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= ssri@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8" - integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA== + version "6.0.2" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" + integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q== dependencies: figgy-pudding "^3.5.1" From 310a58f27a575a0d47cf52d14857b678d569a616 Mon Sep 17 00:00:00 2001 From: Chloe Carver-Brown Date: Tue, 20 Apr 2021 15:29:01 +0100 Subject: [PATCH 2/2] ogh --- _maps/RandomRuins/SpaceRuins/wizardden.dmm | 4 ++-- code/datums/ruins/space.dm | 6 ++++++ code/game/area/areas/ruins/space.dm | 4 ++-- code/game/objects/items/storage/backpack.dm | 3 +++ config/spaceRuinBlacklist.txt | 1 + 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/wizardden.dmm b/_maps/RandomRuins/SpaceRuins/wizardden.dmm index 59de2fcc..535140a3 100644 --- a/_maps/RandomRuins/SpaceRuins/wizardden.dmm +++ b/_maps/RandomRuins/SpaceRuins/wizardden.dmm @@ -3,14 +3,14 @@ "h" = (/obj/structure/bed,/obj/item/bedsheet/wiz,/obj/machinery/light_switch{pixel_y = -24},/turf/open/floor/wood,/area/ruin/space/has_grav/powered/wiz_home) "j" = (/obj/structure/table/wood,/obj/item/book/codex_gigas,/obj/machinery/light{dir = 8},/turf/open/floor/wood,/area/ruin/space/has_grav/powered/wiz_home) "p" = (/obj/machinery/door/airlock/external,/obj/effect/mapping_helpers/airlock/cyclelink_helper,/turf/open/floor/plating,/area/ruin/space/has_grav/powered/wiz_home) -"t" = (/obj/structure/table/wood,/obj/item/gun/magic/staff,/turf/open/floor/wood,/area/ruin/space/has_grav/powered/wiz_home) +"t" = (/obj/structure/table/wood,/obj/item/gun/magic/staff/healing{attack_verb = list("struck","hit","bashed", "bonked"); can_charge = 0; desc = "The famous Staff of Revival toted by wizards. Supposedly able to heal all ailments, and even revive the dead. This one has the name 'Chloe' etched on the side. It feels cold."; max_charges = 0; name = "Chloe's staff of healing"; recharge_rate = 0},/turf/open/floor/wood,/area/ruin/space/has_grav/powered/wiz_home) "v" = (/obj/structure/destructible/cult/tome,/turf/open/floor/wood,/area/ruin/space/has_grav/powered/wiz_home) "w" = (/turf/closed/indestructible/wood,/area/ruin/space/has_grav/powered/wiz_home) "y" = (/turf/open/floor/carpet,/area/ruin/space/has_grav/powered/wiz_home) "z" = (/obj/structure/table/wood,/obj/item/storage/pill_bottle/dice{icon_state = "magicdicebag"},/turf/open/floor/wood,/area/ruin/space/has_grav/powered/wiz_home) "B" = (/obj/structure/chair/wood/wings{dir = 1},/turf/open/floor/carpet,/area/ruin/space/has_grav/powered/wiz_home) "G" = (/obj/structure/showcase{desc = "A historical figure of great importance to the wizard federation. He spent his long life learning magic, stealing artifacts, and harassing idiots with swords. May he rest forever, Rodney."; icon = 'icons/mob/mob.dmi'; icon_state = "nim"; name = "wizard of yendor showcase"},/turf/open/floor/wood,/area/ruin/space/has_grav/powered/wiz_home) -"I" = (/obj/machinery/vending/magivend_novirus,/turf/open/floor/wood,/area/ruin/space/has_grav/powered/wiz_home) +"I" = (/obj/machinery/vending/magivend_novirus,/obj/item/storage/backpack/satchel/flat/secret/chloe_ruin,/turf/open/floor/wood,/area/ruin/space/has_grav/powered/wiz_home) "K" = (/obj/item/clothing/shoes/sandal/marisa,/obj/item/clothing/suit/wizrobe/marisa,/obj/item/clothing/head/wizard/marisa,/obj/effect/decal/remains/human,/turf/open/floor/carpet,/area/ruin/space/has_grav/powered/wiz_home) "P" = (/obj/structure/table/wood,/obj/item/book/granter/spell/smoke,/turf/open/floor/wood,/area/ruin/space/has_grav/powered/wiz_home) "S" = (/obj/machinery/light,/turf/open/floor/wood,/area/ruin/space/has_grav/powered/wiz_home) diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index 995bae81..bba7ed58 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -312,3 +312,9 @@ suffix = "advancedlab.dmm" name = "Abductor Replication Lab" description = "Some scientists tried and almost succeeded to recreate abductor tools. Somewhat slower and a bit less modern than their originals, these tools are the best you can get if you aren't an alien." + +/datum/map_template/ruin/space/wiz_home + id = "wizhome" + suffix = "wizardden.dmm" + name = "Wizards Cabin" + description = "The wooden cabin of a wizard in space, it smells like mana in there." diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index fbcc8abb..fab04533 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -58,8 +58,8 @@ /area/ruin/space/has_grav/powered/cat_man name = "Kitty Den" -/area/ruin/space/has_grav/powered/wiz_home/area/ruin/space/has_grav/powered/wiz_home - name = "Wizard's Cabin" +/area/ruin/space/has_grav/powered/wiz_home + name = "Wizards Cabin" /area/ruin/space/has_grav/powered/authorship name = "Authorship" diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 279ec8d3..ddf70642 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -319,6 +319,9 @@ new R(src) revealed = TRUE +/obj/item/storage/backpack/satchel/flat/secret/chloe_ruin + reward_one_of_these = list(/obj/item/book/granter/spell/summonitem, /obj/item/book_of_babel) + /obj/item/storage/backpack/duffelbag name = "duffel bag" desc = "A large duffel bag for holding extra things." diff --git a/config/spaceRuinBlacklist.txt b/config/spaceRuinBlacklist.txt index 6243a44d..aea87f97 100644 --- a/config/spaceRuinBlacklist.txt +++ b/config/spaceRuinBlacklist.txt @@ -12,6 +12,7 @@ #_maps/RandomRuins/SpaceRuins/asteroid5.dmm #_maps/RandomRuins/SpaceRuins/bigderelict1.dmm #_maps/RandomRuins/SpaceRuins/bus.dmm +#_maps/RandomRuins/SpaceRuins/wizardden.dmm #_maps/RandomRuins/SpaceRuins/caravanambush.dmm #_maps/RandomRuins/SpaceRuins/cloning_facility.dmm #_maps/RandomRuins/SpaceRuins/crashedclownship.dmm