From f6683fbcd3fd1c4bb2f42079759211b9131441c8 Mon Sep 17 00:00:00 2001 From: Chloe Carver-Brown Date: Thu, 15 Apr 2021 15:12:13 +0100 Subject: [PATCH 1/4] we're off to see the wizard --- _maps/RandomRuins/SpaceRuins/wizardden.dmm | 277 +++++++++++++++++++++ code/game/area/areas/ruins/space.dm | 10 +- code/modules/vending/magivend.dm | 19 ++ 3 files changed, 299 insertions(+), 7 deletions(-) create mode 100644 _maps/RandomRuins/SpaceRuins/wizardden.dmm diff --git a/_maps/RandomRuins/SpaceRuins/wizardden.dmm b/_maps/RandomRuins/SpaceRuins/wizardden.dmm new file mode 100644 index 000000000..59de2fcce --- /dev/null +++ b/_maps/RandomRuins/SpaceRuins/wizardden.dmm @@ -0,0 +1,277 @@ +"a" = (/turf/open/space/basic,/area/space) +"f" = (/obj/structure/fans/tiny/invisible,/turf/open/floor/fakepit,/area/ruin/space/has_grav/powered/wiz_home) +"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) +"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) +"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) +"U" = (/obj/machinery/light{dir = 4},/turf/open/floor/wood,/area/ruin/space/has_grav/powered/wiz_home) +"V" = (/turf/open/floor/wood,/area/ruin/space/has_grav/powered/wiz_home) +"W" = (/obj/structure/destructible/cult/talisman{desc = "An altar dedicated to the Wizards' Federation"},/obj/item/kitchen/knife/ritual,/turf/open/floor/wood,/area/ruin/space/has_grav/powered/wiz_home) +"X" = (/obj/structure/table/wood,/obj/item/spellbook{name = "Magical Grimoire"; owner = "Chloe Zadovsky"; uses = 0},/turf/open/floor/wood,/area/ruin/space/has_grav/powered/wiz_home) +"Y" = (/obj/machinery/door/airlock/external,/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/turf/open/floor/plating,/area/ruin/space/has_grav/powered/wiz_home) + +(1,1,1) = {" +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aawwwwwwwwwwaaa +aawztPvWVVIwaaa +aawXKyByyyVwaaa +aawjyyyyyyUwaaa +aawVVVhGSVVwaaa +aawwwwwwwpwwaaa +aaaaaaaawfwaaaa +aaaaaaaawYwaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +"} +(1,1,2) = {" +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +"} +(1,1,3) = {" +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +"} +(1,1,4) = {" +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +"} +(1,1,5) = {" +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +"} +(1,1,6) = {" +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +"} +(1,1,7) = {" +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +"} +(1,1,8) = {" +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +"} +(1,1,9) = {" +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +"} +(1,1,10) = {" +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +"} +(1,1,11) = {" +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +"} +(1,1,12) = {" +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +"} +(1,1,13) = {" +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +"} +(1,1,14) = {" +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +"} +(1,1,15) = {" +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +"} diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index 74b9e3a13..fbcc8abba 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -58,6 +58,9 @@ /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/authorship name = "Authorship" @@ -178,13 +181,6 @@ name = "Mech Transport" icon_state = "green" - -//Ruin of gas the lizard - -/area/ruin/space/has_grav/gasthelizard - name = "Gas the lizard" - - //Ruin of Deep Storage /area/ruin/space/has_grav/deepstorage diff --git a/code/modules/vending/magivend.dm b/code/modules/vending/magivend.dm index 30c6ae616..a8ec83409 100644 --- a/code/modules/vending/magivend.dm +++ b/code/modules/vending/magivend.dm @@ -16,3 +16,22 @@ contraband = list(/obj/item/reagent_containers/glass/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50, "magic" = 100) resistance_flags = FIRE_PROOF + +/obj/machinery/vending/magivend_novirus + name = "\improper MagiVend" + desc = "A magic vending machine." + icon_state = "MagiVend" + product_slogans = "Sling spells the proper way with MagiVend!;Be your own Houdini! Use MagiVend!" + vend_reply = "Have an enchanted evening!" + product_ads = "EI NATH;Destroy the station!;Admin conspiracies since forever!;Space-time bending hardware!;Now-magic proofing venders!" + products = list(/obj/item/clothing/head/wizard = 1, + /obj/item/clothing/suit/wizrobe = 1, + /obj/item/clothing/head/wizard/red = 1, + /obj/item/clothing/suit/wizrobe/red = 1, + /obj/item/clothing/head/wizard/yellow = 1, + /obj/item/clothing/suit/wizrobe/yellow = 1, + /obj/item/clothing/shoes/sandal/magic = 1, + /obj/item/staff = 2) + contraband = list(/obj/item/coin/antagtoken = 1) + armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50, "magic" = 100) + resistance_flags = FIRE_PROOF \ No newline at end of file From b2fde2c0c039658613924574828203c20dad44e6 Mon Sep 17 00:00:00 2001 From: Archie Date: Sat, 17 Apr 2021 23:17:05 -0300 Subject: [PATCH 2/4] Makes it so the arcane tome and clockwork slab cannot be discounted --- code/modules/uplink/uplink_items.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index f7a618fe5..3abbadb3a 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1792,6 +1792,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes item = /obj/item/clockwork/slab/traitor cost = 20 refundable = TRUE + cant_discount = TRUE //restricted_roles = list("Chaplain","Curator") ///datum/uplink_item/role_restricted/arcane_tome @@ -1801,6 +1802,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes item = /obj/item/tome/traitor cost = 20 refundable = TRUE + cant_discount = TRUE //restricted_roles = list("Chaplain","Curator") /datum/uplink_item/role_restricted/explosive_hot_potato From c55452bdb8023ec17b00823501f33999dce93698 Mon Sep 17 00:00:00 2001 From: Dahlular Date: Sat, 17 Apr 2021 21:20:40 -0600 Subject: [PATCH 3/4] Disables His Grace, restricts cult items --- code/modules/uplink/uplink_items.dm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index f7a618fe5..16d50b23c 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1773,7 +1773,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes cost = 2 restricted_roles = list("Curator") limited_stock = 1 //please don't spam deadchat - +/* Disabled because this is waaaay too chaotic for hyper /datum/uplink_item/role_restricted/his_grace name = "His Grace" desc = "An incredibly dangerous weapon recovered from a station overcome by the grey tide. Once activated, He will thirst for blood and must be used to kill to sate that thirst. \ @@ -1784,24 +1784,22 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes cost = 20 restricted_roles = list("Chaplain") surplus = 5 //Very low chance to get it in a surplus crate even without being the chaplain - -///datum/uplink_item/role_restricted/clockwork_slab -/datum/uplink_item/dangerous/clockwork_slab +*/ +/datum/uplink_item/role_restricted/clockwork_slab name = "Clockwork Slab" desc = "A reverse engineered clockwork slab. Is this really a good idea?" item = /obj/item/clockwork/slab/traitor cost = 20 refundable = TRUE - //restricted_roles = list("Chaplain","Curator") + restricted_roles = list("Chaplain","Curator") -///datum/uplink_item/role_restricted/arcane_tome -/datum/uplink_item/dangerous/arcane_tome +/datum/uplink_item/role_restricted/arcane_tome name = "Arcane Tome" desc = "A 'replica' of a Nar'sian tome. This is probably a bad idea..." item = /obj/item/tome/traitor cost = 20 refundable = TRUE - //restricted_roles = list("Chaplain","Curator") + restricted_roles = list("Chaplain","Curator") /datum/uplink_item/role_restricted/explosive_hot_potato name = "Exploding Hot Potato" From fce68d94bfba321412a36b595749db3b422027fd Mon Sep 17 00:00:00 2001 From: Archie Date: Sun, 18 Apr 2021 01:45:22 -0300 Subject: [PATCH 4/4] drone gaming --- _maps/map_files/generic/CentCom.dmm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index ff2a77865..1a5e715e3 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -12900,6 +12900,23 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/ferry) +"Cl" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/ausbushes/fernybush, +/obj/item/storage/backpack/duffelbag/drone{ + pixel_y = 2 + }, +/obj/effect/decal/cleanable/ash{ + name = "ashes of drone (760)" + }, +/obj/item/clothing/head/hardhat/weldhat, +/turf/open/floor/plasteel{ + dir = 6; + icon_state = "asteroid8"; + name = "sand" + }, +/area/centcom/control) "Cn" = ( /obj/structure/table/reinforced, /obj/machinery/chem_dispenser/drinks/beer/fullupgrade, @@ -18945,6 +18962,9 @@ /obj/structure/table/wood, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/west, +/obj/item/rupee{ + desc = "A gift, right?" + }, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "RD" = ( @@ -62724,7 +62744,7 @@ io io io qw -WI +Cl Wk WI lN