diff --git a/_maps/templates/new_pod_1.dmm b/_maps/templates/new_pod_1.dmm new file mode 100644 index 00000000..89d66fdd --- /dev/null +++ b/_maps/templates/new_pod_1.dmm @@ -0,0 +1,56 @@ +"a" = (/turf/open/space/basic,/area/space) +"b" = (/turf/closed/wall/mineral/titanium/survival/pod,/area/survivalpod) +"c" = (/obj/structure/sign/mining/survival{dir = 1},/turf/closed/wall/mineral/titanium/survival/pod,/area/survivalpod) +"d" = (/obj/structure/fans,/turf/open/floor/pod,/area/survivalpod) +"e" = (/obj/machinery/smartfridge/survival_pod,/turf/open/floor/pod,/area/survivalpod) +"f" = (/obj/item/gps/computer,/turf/open/floor/pod,/area/survivalpod) +"g" = (/obj/structure/sign/mining/survival{dir = 8},/turf/closed/wall/mineral/titanium/survival/pod,/area/survivalpod) +"h" = (/obj/machinery/sleeper/survival_pod,/turf/open/floor/pod,/area/survivalpod) +"i" = (/turf/open/floor/pod,/area/survivalpod) +"j" = (/obj/structure/bed/pod,/obj/item/bedsheet/black,/turf/open/floor/pod,/area/survivalpod) +"k" = (/obj/structure/sign/mining/survival{dir = 4},/turf/closed/wall/mineral/titanium/survival/pod,/area/survivalpod) +"l" = (/obj/structure/table/survival_pod,/turf/open/floor/pod,/area/survivalpod) +"m" = (/obj/structure/tubes,/obj/structure/chair/comfy/black{dir = 8},/turf/open/floor/pod,/area/survivalpod) +"n" = (/obj/structure/sign/mining/survival,/turf/closed/wall/mineral/titanium/survival/pod,/area/survivalpod) +"o" = (/obj/structure/fans/tiny,/obj/machinery/door/airlock/survival_pod/glass,/turf/open/floor/pod,/area/survivalpod) +"p" = (/obj/structure/sign/mining,/turf/closed/wall/mineral/titanium/survival/pod,/area/survivalpod) + +(1,1,1) = {" +bbcbb +bdefb +ghijk +blimb +bnopb +"} + +(1,1,2) = {" +aaaaa +aaaaa +aaaaa +aaaaa +aaaaa +"} + +(1,1,3) = {" +aaaaa +aaaaa +aaaaa +aaaaa +aaaaa +"} + +(1,1,4) = {" +aaaaa +aaaaa +aaaaa +aaaaa +aaaaa +"} + +(1,1,5) = {" +aaaaa +aaaaa +aaaaa +aaaaa +aaaaa +"} diff --git a/_maps/templates/new_pod_2.dmm b/_maps/templates/new_pod_2.dmm new file mode 100644 index 00000000..ab593ee8 --- /dev/null +++ b/_maps/templates/new_pod_2.dmm @@ -0,0 +1,39 @@ +"a" = (/turf/closed/wall/mineral/titanium/survival/pod,/area/survivalpod) +"b" = (/obj/structure/sign/mining/survival{dir = 1},/turf/closed/wall/mineral/titanium/survival/pod,/area/survivalpod) +"c" = (/obj/structure/sign/mining/survival{dir = 8},/turf/closed/wall/mineral/titanium/survival/pod,/area/survivalpod) +"d" = (/obj/structure/fans,/turf/open/floor/pod,/area/survivalpod) +"e" = (/obj/machinery/smartfridge/survival_pod,/turf/open/floor/pod,/area/survivalpod) +"f" = (/obj/item/gps/computer,/turf/open/floor/pod,/area/survivalpod) +"g" = (/obj/structure/ore_box,/obj/structure/window/reinforced/survival_pod{dir = 8; layer = 3},/turf/open/floor/pod,/area/survivalpod) +"h" = (/obj/effect/spawner/lootdrop/mre,/obj/effect/spawner/lootdrop/mre,/obj/effect/spawner/lootdrop/mre,/obj/effect/spawner/lootdrop/mre,/obj/effect/spawner/lootdrop/mre,/obj/effect/spawner/lootdrop/mre,/obj/structure/rack,/turf/open/floor/pod,/area/survivalpod) +"i" = (/obj/structure/sign/mining/survival{dir = 4},/turf/closed/wall/mineral/titanium/survival/pod,/area/survivalpod) +"j" = (/obj/machinery/sleeper/survival_pod,/turf/open/floor/pod,/area/survivalpod) +"k" = (/turf/open/floor/pod,/area/survivalpod) +"l" = (/obj/structure/bed/pod,/obj/item/bedsheet/black,/turf/open/floor/pod,/area/survivalpod) +"m" = (/obj/structure/window/reinforced/survival_pod{dir = 8; layer = 3},/turf/open/floor/pod,/area/survivalpod) +"n" = (/obj/structure/table/survival_pod,/obj/item/storage/firstaid/regular,/turf/open/floor/pod,/area/survivalpod) +"o" = (/obj/structure/tubes,/turf/open/floor/pod,/area/survivalpod) +"p" = (/obj/structure/window/reinforced/survival_pod{dir = 8},/turf/open/floor/pod,/area/survivalpod) +"q" = (/obj/machinery/light{dir = 4; light_color = "#DDFFD3"},/turf/open/floor/pod,/area/survivalpod) +"r" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/machinery/shower{layer = 2},/obj/structure/curtain{alpha = 240; color = "#454545"; icon_state = "closed"; layer = 5.1; open = 0},/turf/open/floor/pod,/area/survivalpod) +"s" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/window/reinforced/survival_pod{icon_state = "pwindow"; dir = 4},/obj/structure/toilet{layer = 2},/obj/structure/curtain{alpha = 240; color = "#454545"; icon_state = "closed"; layer = 5.1; open = 0},/turf/open/floor/pod,/area/survivalpod) +"t" = (/obj/machinery/door/window/survival_pod{icon_state = "windoor"; dir = 1},/turf/open/floor/pod,/area/survivalpod) +"u" = (/obj/structure/window/reinforced/survival_pod{density = 0; dir = 9},/turf/open/floor/pod,/area/survivalpod) +"v" = (/obj/structure/chair,/turf/open/floor/pod,/area/survivalpod) +"w" = (/obj/structure/sink/kitchen{icon_state = "sink_alt"; dir = 4; pixel_x = -13},/turf/open/floor/pod,/area/survivalpod) +"x" = (/obj/machinery/light,/obj/machinery/door/window/survival_pod{icon_state = "windoor"; dir = 4},/turf/open/floor/pod,/area/survivalpod) +"y" = (/obj/structure/table/reinforced,/turf/open/floor/pod,/area/survivalpod) +"z" = (/obj/structure/sign/mining/survival,/turf/closed/wall/mineral/titanium/survival/pod,/area/survivalpod) +"A" = (/obj/machinery/door/airlock/survival_pod/glass,/obj/structure/fans/tiny,/turf/open/floor/pod,/area/survivalpod) +"B" = (/obj/structure/sign/mining,/turf/closed/wall/mineral/titanium/survival/pod,/area/survivalpod) +"C" = (/obj/structure/fans/tiny,/obj/machinery/door/airlock/survival_pod/glass,/obj/structure/fans/tiny,/turf/open/floor/pod,/area/survivalpod) + +(1,1,1) = {" +abababa +cdefghi +ajklmqa +cnkopkA +arstuva +cwxkkyi +azaCaBa +"} diff --git a/_maps/templates/new_pod_3.dmm b/_maps/templates/new_pod_3.dmm new file mode 100644 index 00000000..b50c95cf --- /dev/null +++ b/_maps/templates/new_pod_3.dmm @@ -0,0 +1,42 @@ +"a" = (/turf/closed/wall/mineral/titanium/survival,/area/survivalpod) +"b" = (/obj/machinery/door/airlock/survival_pod,/obj/structure/fans/tiny,/turf/closed/wall/mineral/titanium/survival,/area/survivalpod) +"c" = (/obj/machinery/sleeper/survival_pod,/turf/open/floor/pod/dark,/area/survivalpod) +"d" = (/obj/machinery/vending/wallmed{pixel_y = 24},/obj/machinery/light{dir = 4; light_color = "#DDFFD3"},/turf/open/floor/pod/dark,/area/survivalpod) +"e" = (/turf/open/floor/pod,/area/survivalpod) +"f" = (/obj/structure/fans,/obj/structure/window/reinforced/survival_pod{dir = 8},/turf/closed/wall/mineral/titanium/survival,/area/survivalpod) +"g" = (/obj/machinery/smartfridge/survival_pod,/turf/open/floor/pod,/area/survivalpod) +"h" = (/obj/item/gps/computer,/turf/open/floor/pod,/area/survivalpod) +"i" = (/obj/structure/table/survival_pod,/obj/item/storage/firstaid/regular{pixel_y = 9},/obj/item/storage/firstaid/brute,/turf/open/floor/pod/dark,/area/survivalpod) +"j" = (/turf/open/floor/pod/dark,/area/survivalpod) +"k" = (/obj/structure/window/reinforced/survival_pod{dir = 8},/turf/open/floor/pod,/area/survivalpod) +"l" = (/obj/machinery/door/airlock/survival_pod/glass,/turf/open/floor/pod/dark,/area/survivalpod) +"m" = (/obj/structure/table/survival_pod,/turf/open/floor/pod/light,/area/survivalpod) +"n" = (/obj/machinery/mineral/equipment_vendor,/turf/open/floor/pod,/area/survivalpod) +"o" = (/obj/structure/bed,/obj/effect/spawner/lootdrop/bedsheet,/obj/machinery/light{icon_state = "tube"; dir = 1},/turf/open/floor/pod/light,/area/survivalpod) +"p" = (/obj/structure/window/reinforced/survival_pod{icon_state = "pwindow"; dir = 6},/turf/open/floor/pod,/area/survivalpod) +"q" = (/obj/structure/window/reinforced/survival_pod,/turf/open/floor/pod,/area/survivalpod) +"r" = (/obj/structure/window/reinforced/survival_pod,/obj/structure/ore_box,/turf/open/floor/pod,/area/survivalpod) +"s" = (/obj/machinery/light{icon_state = "tube"; dir = 8},/turf/open/floor/pod,/area/survivalpod) +"t" = (/obj/structure/chair{icon_state = "chair"; dir = 1},/turf/open/floor/pod/light,/area/survivalpod) +"u" = (/obj/machinery/door/window/survival_pod{icon_state = "windoor"; dir = 4},/turf/open/floor/pod,/area/survivalpod) +"v" = (/turf/open/floor/pod/light,/area/survivalpod) +"w" = (/obj/structure/sink/kitchen{icon_state = "sink_alt"; dir = 4; pixel_x = -13},/turf/open/floor/pod/light,/area/survivalpod) +"x" = (/obj/structure/window/reinforced/survival_pod{icon_state = "pwindow"; dir = 4},/turf/open/floor/pod,/area/survivalpod) +"y" = (/obj/effect/spawner/lootdrop/mre,/obj/effect/spawner/lootdrop/mre,/obj/effect/spawner/lootdrop/mre,/obj/effect/spawner/lootdrop/mre,/obj/effect/spawner/lootdrop/mre,/obj/effect/spawner/lootdrop/mre,/obj/structure/rack,/turf/open/floor/pod,/area/survivalpod) +"z" = (/obj/structure/closet/secure_closet/miner,/turf/open/floor/pod,/area/survivalpod) +"A" = (/obj/machinery/door/airlock/survival_pod,/obj/structure/fans/tiny,/turf/open/floor/pod,/area/survivalpod) +"B" = (/obj/machinery/door/airlock/survival_pod/glass,/turf/open/floor/pod/light,/area/survivalpod) +"C" = (/obj/structure/toilet{icon_state = "toilet00"; dir = 1},/obj/structure/curtain{alpha = 240; color = "#454545"; icon_state = "closed"; open = 0},/turf/open/floor/pod/light,/area/survivalpod) +"D" = (/obj/machinery/shower{icon_state = "shower"; dir = 1},/obj/structure/curtain{alpha = 240; color = "#454545"; icon_state = "closed"; open = 0},/turf/open/floor/pod/light,/area/survivalpod) + +(1,1,1) = {" +aaaabaaaa +acdaefgha +aijlekeea +aaaaeeeea +amoaseena +atvaepqra +awvBeueea +aCDaexyza +aaaaAaaaa +"} diff --git a/_maps/templates/new_pod_luxury.dmm b/_maps/templates/new_pod_luxury.dmm new file mode 100644 index 00000000..f995b21c --- /dev/null +++ b/_maps/templates/new_pod_luxury.dmm @@ -0,0 +1,56 @@ +"a" = (/turf/closed/wall/mineral/titanium/survival/pod,/area/survivalpod) +"b" = (/obj/structure/toilet{icon_state = "toilet00"; dir = 4},/obj/structure/curtain{alpha = 240; color = "#454545"; icon_state = "closed"; open = 0},/turf/open/floor/carpet/black,/area/survivalpod) +"c" = (/turf/open/floor/carpet/black,/area/survivalpod) +"d" = (/obj/structure/table/wood/fancy/black,/turf/open/floor/carpet/black,/area/survivalpod) +"e" = (/obj/machinery/door/window/survival_pod{icon_state = "windoor"; dir = 8},/turf/open/floor/carpet/black,/area/survivalpod) +"f" = (/obj/machinery/chem_dispenser/drinks/beer{pixel_y = 24},/turf/open/floor/carpet/black,/area/survivalpod) +"g" = (/obj/machinery/chem_dispenser/drinks{pixel_y = 24},/turf/open/floor/carpet/black,/area/survivalpod) +"h" = (/obj/machinery/vending/boozeomat/all_access{pixel_y = 32},/turf/open/floor/carpet/black,/area/survivalpod) +"i" = (/obj/machinery/shower{icon_state = "shower"; dir = 4},/obj/structure/curtain{alpha = 240; color = "#454545"; icon_state = "closed"; open = 0},/turf/open/floor/carpet/black,/area/survivalpod) +"j" = (/obj/structure/bed,/obj/effect/spawner/lootdrop/bedsheet,/turf/open/floor/carpet/black,/area/survivalpod) +"k" = (/obj/structure/window/reinforced/survival_pod{dir = 8},/obj/structure/table/wood/fancy/black,/turf/open/floor/carpet/black,/area/survivalpod) +"l" = (/obj/structure/table/wood/fancy/black,/obj/effect/spawner/lootdrop/three_course_meal,/turf/open/floor/carpet/black,/area/survivalpod) +"m" = (/obj/structure/table/wood/fancy/black,/obj/item/reagent_containers/food/drinks/shaker,/turf/open/floor/carpet/black,/area/survivalpod) +"n" = (/obj/structure/table/wood/fancy/black,/obj/machinery/light{icon_state = "tube"; dir = 1},/obj/effect/spawner/lootdrop/three_course_meal,/turf/open/floor/carpet/black,/area/survivalpod) +"o" = (/obj/machinery/door/airlock/survival_pod,/turf/open/floor/pod,/area/survivalpod) +"p" = (/obj/structure/chair/stool/bar,/turf/open/floor/carpet/black,/area/survivalpod) +"q" = (/turf/open/floor/pod,/area/survivalpod) +"r" = (/obj/structure/piano,/turf/open/floor/pod,/area/survivalpod) +"s" = (/obj/structure/chair/stool,/turf/open/floor/pod,/area/survivalpod) +"t" = (/obj/machinery/door/airlock/survival_pod/glass,/obj/structure/fans/tiny,/turf/open/floor/carpet/black,/area/survivalpod) +"u" = (/obj/machinery/light{icon_state = "tube"; dir = 8},/turf/open/floor/carpet/black,/area/survivalpod) +"v" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/chair/sofa/right,/obj/machinery/door/firedoor/border_only{icon_state = "door_open"; dir = 1},/turf/open/floor/pod,/area/survivalpod) +"w" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/chair/sofa,/obj/machinery/door/firedoor/border_only{icon_state = "door_open"; dir = 1},/turf/open/floor/pod,/area/survivalpod) +"x" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/window/reinforced/survival_pod{icon_state = "pwindow"; dir = 4},/obj/structure/chair/sofa/corner,/obj/machinery/door/firedoor/border_only{icon_state = "door_open"; dir = 4},/obj/machinery/door/firedoor/border_only{icon_state = "door_open"; dir = 1},/turf/open/floor/pod,/area/survivalpod) +"y" = (/obj/structure/window/reinforced/survival_pod{dir = 8},/obj/structure/window/reinforced/survival_pod{icon_state = "pwindow"; dir = 4},/obj/structure/grille,/turf/open/floor/pod,/area/survivalpod) +"z" = (/obj/structure/window/reinforced/survival_pod{icon_state = "pwindow"; dir = 4},/obj/structure/chair/sofa{icon_state = "sofamiddle"; dir = 8},/obj/machinery/door/firedoor/border_only{icon_state = "door_open"; dir = 4},/turf/open/floor/pod,/area/survivalpod) +"A" = (/obj/structure/window/reinforced/survival_pod{dir = 8},/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/fans,/turf/open/floor/pod,/area/survivalpod) +"B" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/machinery/smartfridge/survival_pod,/turf/open/floor/pod,/area/survivalpod) +"C" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/item/gps/computer,/turf/open/floor/pod,/area/survivalpod) +"D" = (/obj/structure/window/reinforced/survival_pod{icon_state = "pwindow"; dir = 4},/obj/structure/chair/sofa/left{icon_state = "sofaend_left"; dir = 8},/obj/machinery/door/firedoor/border_only{icon_state = "door_open"; dir = 4},/turf/open/floor/pod,/area/survivalpod) +"E" = (/obj/structure/window/reinforced/survival_pod{dir = 8},/obj/machinery/sleeper/survival_pod,/turf/open/floor/pod,/area/survivalpod) +"F" = (/obj/structure/ore_box{layer = 3.1},/turf/open/floor/pod,/area/survivalpod) +"G" = (/obj/structure/table/wood/fancy/black,/obj/item/storage/box/drinkingglasses,/obj/machinery/light{icon_state = "tube"; dir = 4},/turf/open/floor/carpet/black,/area/survivalpod) +"H" = (/obj/machinery/door/window/survival_pod{icon_state = "windoor"; dir = 8},/turf/open/floor/pod,/area/survivalpod) +"I" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/regular{pixel_y = 8},/obj/item/storage/firstaid/brute,/obj/item/storage/hypospraykit/regular{pixel_y = -4},/obj/item/crowbar,/turf/open/floor/pod,/area/survivalpod) +"J" = (/obj/structure/window/reinforced/survival_pod{dir = 8},/obj/structure/window/reinforced/survival_pod,/obj/structure/window/reinforced/survival_pod{icon_state = "pwindow"; dir = 5},/obj/structure/grille,/turf/open/floor/pod,/area/survivalpod) +"K" = (/obj/structure/window/reinforced/survival_pod,/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/grille,/turf/open/floor/pod,/area/survivalpod) +"L" = (/obj/machinery/light{icon_state = "tube"; dir = 8},/turf/open/floor/pod,/area/survivalpod) +"M" = (/obj/machinery/light{icon_state = "tube"; dir = 4},/turf/open/floor/pod,/area/survivalpod) +"N" = (/obj/machinery/door/window/survival_pod{icon_state = "windoor"; dir = 1},/obj/machinery/door/firedoor/border_only{icon_state = "door_open"; dir = 1},/obj/machinery/light{icon_state = "tube"; dir = 8},/turf/open/floor/carpet/black,/area/survivalpod) +"O" = (/obj/machinery/door/window/survival_pod{icon_state = "windoor"; dir = 4},/obj/machinery/door/firedoor/border_only{icon_state = "door_open"; dir = 4},/obj/machinery/light,/turf/open/floor/carpet/black,/area/survivalpod) +"P" = (/obj/machinery/light,/turf/open/floor/carpet/black,/area/survivalpod) + +(1,1,1) = {" +aaaaaaaaaaa +abcnacefgha +aicjauklmGa +aaoaacppppa +aLcrscqqqMa +accccccccct +aNvwxcqqqMa +ycllzcqABCa +ycdlDcqEqFa +ycccOcPHqIa +JKKKataaaaa +"} diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 40380dfe..7807c026 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -629,7 +629,7 @@ /obj/item/toy/plush/mothplushie name = "insect plushie" - desc = "An adorable stuffed toy that resembles some kind of insect" + desc = "An adorable stuffed toy that resembles some kind of insect." icon_state = "bumble" item_state = "bumble" squeak_override = list('modular_citadel/sound/voice/mothsqueak.ogg' = 1) @@ -773,8 +773,10 @@ item_state = "blep" /obj/item/toy/plush/mammal/circe + desc = "A luxuriously soft toy that resembles a nine-tailed kitsune." icon_state = "circe" item_state = "circe" + attack_verb = list("medicated", "tailhugged", "kissed") /obj/item/toy/plush/mammal/robin icon_state = "robin" @@ -838,9 +840,17 @@ icon_state = "rae" item_state = "rae" +/obj/item/toy/plush/mammal/winfre + desc = "An adorable stuffed toy of a pissed hyena. She looks unamused." + icon_state = "winfre" + item_state = "winfre" + attack_verb = list("cackled", "swirlie'd", "stepped on") + /obj/item/toy/plush/mammal/zed + desc = "A masked stuffed toy that resembles a fierce miner. He even comes with his own little crusher!" icon_state = "zed" item_state = "zed" + attack_verb = list("ENDED", "CRUSHED", "GNOMED") /obj/item/toy/plush/mammal/justin icon_state = "justin" @@ -852,6 +862,12 @@ item_state = "reece" attack_verb = list("healed", "cured", "demoted") +/obj/item/toy/plush/mammal/redwood + desc = "An adorable stuffed toy resembling a Nanotrasen Captain. That just happens to be a bunny." + icon_state = "redwood" + item_state = "redwood" + attack_verb = list("ordered", "bapped", "reprimanded") + /obj/item/toy/plush/mammal/dog desc = "An adorable stuffed toy that resembles a canine." icon_state = "katlin" @@ -898,6 +914,18 @@ obj_flags = UNIQUE_RENAME unique_reskin = list("Goodboye" = "fritz", "Badboye" = "fritz_bad") +/obj/item/toy/plush/mammal/dog/jesse + desc = "An adorable wolf toy that resembles a cream-colored wolf. He has a little pride flag!" + icon_state = "jesse" + item_state = "jesse" + attack_verb = list("greeted", "merc'd", "howdy'd") + +/obj/item/toy/plush/mammal/dog/marie + desc = "An adorable wolfgirl toy! She smells like strawberries." + icon_state = "marie" + item_state = "marie" + attack_verb = list("awoo'd", "shoved", "bonked") + /obj/item/toy/plush/catgirl name = "feline plushie" desc = "An adorable stuffed toy that resembles a feline." @@ -935,3 +963,15 @@ item_state = "fermis" attack_verb = list("cuddled", "petpatted", "wigglepurred") squeak_override = list('modular_citadel/sound/voice/merowr.ogg' = 1) + +/obj/item/toy/plush/catgirl/mariaf + desc = "An adorable stuffed toy that resembles a very tall cat girl." + icon_state = "mariaf" + item_state = "mariaf" + attack_verb = list("hugged", "stabbed", "licked") + +/obj/item/toy/plush/catgirl/maya + desc = "An adorable stuffed toy that resembles an angry cat girl. She has her own tiny nuke disk!" + icon_state = "maya" + item_state = "maya" + attack_verb = list("nuked", "arrested", "harmbatonned") diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 715ecc90..9b055519 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -67,10 +67,20 @@ new /obj/effect/particle_effect/smoke(get_turf(src)) qdel(src) +/obj/item/survivalcapsule/advanced + name = "advanced bluespace shelter capsule" + desc = "A medium sized and slightly more advanced shelter capsule stored within a pocket of bluespace." + template_id = "shelter_beta" + +/obj/item/survivalcapsule/deluxe + name = "deluxe bluespace shelter capsule" + desc = "A large shelter capsule stored within a pocket of bluespace." + template_id = "shelter_charlie" + /obj/item/survivalcapsule/luxury name = "luxury bluespace shelter capsule" - desc = "An exorbitantly expensive luxury suite stored within a pocket of bluespace." - template_id = "shelter_beta" + desc = "A nice luxury bluespace capsule for miners with spare time. Comes with a bar, bedroom, basic pod equipment and an observation deck." + template_id = "shelter_delta" //Pod objects diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index aed90ceb..e871d9eb 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -20,19 +20,19 @@ new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 200), new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 300), new /datum/data/mining_equipment("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 300), + new /datum/data/mining_equipment("Stabilizing Serum", /obj/item/hivelordstabilizer, 400), new /datum/data/mining_equipment("Fulton Beacon", /obj/item/fulton_core, 400), - new /datum/data/mining_equipment("Shelter Capsule", /obj/item/survivalcapsule, 400), + new /datum/data/mining_equipment("Basic Shelter Capsule", /obj/item/survivalcapsule, 400), new /datum/data/mining_equipment("Survival Knife", /obj/item/kitchen/knife/combat/survival, 450), new /datum/data/mining_equipment("GAR Meson Scanners", /obj/item/clothing/glasses/meson/gar, 500), new /datum/data/mining_equipment("Explorer's Webbing", /obj/item/storage/belt/mining, 500), new /datum/data/mining_equipment("Larger Ore Bag", /obj/item/storage/bag/ore/large, 500), new /datum/data/mining_equipment("500 Point Transfer Card", /obj/item/card/mining_point_card/mp500, 500), new /datum/data/mining_equipment("Tracking Implant Kit", /obj/item/storage/box/minertracker, 600), - new /datum/data/mining_equipment("Survival Medipen", /obj/item/reagent_containers/hypospray/medipen/survival, 750), - new /datum/data/mining_equipment("Stabilizing Serum", /obj/item/hivelordstabilizer, 750), new /datum/data/mining_equipment("Jaunter", /obj/item/wormhole_jaunter, 750), new /datum/data/mining_equipment("Kinetic Crusher", /obj/item/twohanded/required/kinetic_crusher, 750), new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 750), + new /datum/data/mining_equipment("Survival Medipen", /obj/item/reagent_containers/hypospray/medipen/survival, 750), new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/storage/firstaid/brute, 800), new /datum/data/mining_equipment("Burn First-Aid Kit", /obj/item/storage/firstaid/fire, 800), new /datum/data/mining_equipment("First-Aid Kit", /obj/item/storage/firstaid/regular, 800), @@ -45,6 +45,7 @@ new /datum/data/mining_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining_conscript, 1000), new /datum/data/mining_equipment("1000 Point Transfer Card", /obj/item/card/mining_point_card/mp1000, 1000), new /datum/data/mining_equipment("1500 Point Transfer Card", /obj/item/card/mining_point_card/mp1500, 1500), + new /datum/data/mining_equipment("Advanced Shelter Capsule", /obj/item/survivalcapsule/advanced, 1500), new /datum/data/mining_equipment("2000 Point Transfer Card", /obj/item/card/mining_point_card/mp2000, 2000), new /datum/data/mining_equipment("Jetpack Upgrade", /obj/item/tank/jetpack/suit, 2000), new /datum/data/mining_equipment("Space Cash", /obj/item/stack/spacecash/c1000, 2000), @@ -53,8 +54,8 @@ new /datum/data/mining_equipment("Spare Suit Voucher", /obj/item/suit_voucher, 2000), new /datum/data/mining_equipment("Super Resonator", /obj/item/resonator/upgraded, 2500), new /datum/data/mining_equipment("Jump Boots", /obj/item/clothing/shoes/bhop, 2500), - new /datum/data/mining_equipment("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3000), - new /datum/data/mining_equipment("Miner Full Replacement", /obj/item/storage/backpack/duffelbag/mining_cloned, 3000), + new /datum/data/mining_equipment("Deluxe Shelter Capsule", /obj/item/survivalcapsule/deluxe, 2500), + new /datum/data/mining_equipment("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 6000), new /datum/data/mining_equipment("Nanotrasen Minebot", /mob/living/simple_animal/hostile/mining_drone, 800), new /datum/data/mining_equipment("Minebot Melee Upgrade", /obj/item/mine_bot_upgrade, 400), new /datum/data/mining_equipment("Minebot Armor Upgrade", /obj/item/mine_bot_upgrade/health, 400), @@ -69,8 +70,8 @@ new /datum/data/mining_equipment("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000), new /datum/data/mining_equipment("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000), new /datum/data/mining_equipment("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000), + new /datum/data/mining_equipment("Miner Full Replacement", /obj/item/storage/backpack/duffelbag/mining_cloned, 3000), new /datum/data/mining_equipment("Premium Accelerator", /obj/item/gun/energy/kinetic_accelerator/premiumka, 8000) - ) /datum/data/mining_equipment diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters.dm index a8b4eab8..0e6f8019 100644 --- a/code/modules/mining/shelters.dm +++ b/code/modules/mining/shelters.dm @@ -37,7 +37,7 @@ built-in navigation, entertainment, medical facilities and a \ sleeping area! Order now, and we'll throw in a TINY FAN, \ absolutely free!" - mappath = "_maps/templates/shelter_1.dmm" + mappath = "_maps/templates/new_pod_1.dmm" /datum/map_template/shelter/alpha/New() . = ..() @@ -47,14 +47,39 @@ /datum/map_template/shelter/beta name = "Shelter Beta" shelter_id = "shelter_beta" - description = "An extremely luxurious shelter, containing all \ - the amenities of home, including carpeted floors, hot and cold \ - running water, a gourmet three course meal, cooking facilities, \ - and a deluxe companion to keep you from getting lonely during \ - an ash storm." - mappath = "_maps/templates/shelter_2.dmm" + description = "A medium sized pod containing a slight bit \ + more than the standard pod provided to miners. Order now, \ + and we'll throw in TWO tiny fans, absolutely free!" + mappath = "_maps/templates/new_pod_2.dmm" /datum/map_template/shelter/beta/New() . = ..() whitelisted_turfs = typecacheof(/turf/closed/mineral) banned_objects = typecacheof(/obj/structure/stone_tile) + +/datum/map_template/shelter/charlie + name = "Shelter Charlie" + shelter_id = "shelter_charlie" + description = "A large pod fitted with a closed off sleeping \ + quarters, medbay and all the amenities the medium pod provides \ + and more! Comes with TWO tiny fans and a mining vendor 100% free!" + mappath = "_maps/templates/new_pod_3.dmm" + +/datum/map_template/shelter/charlie/New() + . = ..() + whitelisted_turfs = typecacheof(/turf/closed/mineral) + banned_objects = typecacheof(/obj/structure/stone_tile) + +/datum/map_template/shelter/delta + name = "Shelter Delta" + shelter_id = "shelter_delta" + description = "A nice, luxury pod fit for some significant individual.\ + Either that or a miner with a bit of time on their hands and a lot of \ + points saved up. Comes with a bar, bedroom and observation deck for \ + staring at the pits of lava and the poor souls banging on your door." + mappath = "_maps/templates/new_pod_luxury.dmm" + +/datum/map_template/shelter/delta/New() + . = ..() + whitelisted_turfs = typecacheof(/turf/closed/mineral) + banned_objects = typecacheof(/obj/structure/stone_tile) \ No newline at end of file diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 9c3a1a4f..8ccb7fd5 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -11,7 +11,7 @@ design_ids = list("basic_matter_bin", "basic_cell", "basic_scanning", "basic_capacitor", "basic_micro_laser", "micro_mani", "destructive_analyzer", "circuit_imprinter", "experimentor", "rdconsole", "design_disk", "tech_disk", "rdserver", "rdservercontrol", "mechfab", "space_heater", "xlarge_beaker", "sec_rshot", "sec_bshot", "sec_slug", "sec_Islug", "sec_dart", "sec_38", "sec_38lethal", - "rglass","plasteel","plastitanium","plasmaglass","plasmareinforcedglass","titaniumglass","plastitaniumglass") + "rglass","plasteel","plastitanium","plasmaglass","plasmareinforcedglass","titaniumglass","plastitaniumglass","chem_pack") /datum/techweb_node/mmi id = "mmi" diff --git a/icons/obj/plushes.dmi b/icons/obj/plushes.dmi index b6ca8c17..a8e6b20e 100644 Binary files a/icons/obj/plushes.dmi and b/icons/obj/plushes.dmi differ