diff --git a/GainStation13/code/modules/vending/mealdor.dm b/GainStation13/code/modules/vending/mealdor.dm index 65865a4d..44987508 100644 --- a/GainStation13/code/modules/vending/mealdor.dm +++ b/GainStation13/code/modules/vending/mealdor.dm @@ -1,36 +1,46 @@ /obj/machinery/vending/mealdor name = "Meal Vendor" - desc = "The vending machine used for starving folks" + desc = "The vending machine used for starving folks this time they changed it's entire shell and it looks cuter." icon = 'icons/obj/vending.dmi' icon_state = "mealdor" - product_slogans = "Are you hungry?;Hope you are ready to eat!;Consume food, please" + product_slogans = "Are you hungry? Eat some of my food!;Be sure to eat one of our tasty treats!;Was that your stomach? Go ahead, get some food!" vend_reply = "Enjoy your meal." products = list( /obj/item/reagent_containers/food/snacks/store/cake/cheese = 10, /obj/item/reagent_containers/food/snacks/store/cake/birthday = 10, /obj/item/reagent_containers/food/snacks/store/cake/pumpkinspice = 10, - /obj/item/reagent_containers/food/snacks/store/cake/pound_cake = 5, + /obj/item/reagent_containers/food/snacks/store/cake/pound_cake = 8, // /obj/item/reagent_containers/food/snacks/donut/purefat = 10, - /obj/item/reagent_containers/food/snacks/fries = 8, - /obj/item/reagent_containers/food/snacks/donut = 5, - /obj/item/reagent_containers/food/snacks/candiedapple = 2, - /obj/item/reagent_containers/food/snacks/burrito = 4, - /obj/item/reagent_containers/food/snacks/enchiladas = 5, - /obj/item/reagent_containers/food/snacks/spaghetti = 3, - /obj/item/reagent_containers/food/snacks/kebab/rat = 5, - /obj/item/reagent_containers/food/snacks/kebab/rat/double = 5, - /obj/item/reagent_containers/food/snacks/meatballspaghetti = 1, - /obj/item/reagent_containers/food/drinks/bottle/orangejuice = 2, - /obj/item/reagent_containers/food/drinks/bottle/pineapplejuice = 5, - /obj/item/reagent_containers/food/drinks/bottle/strawberryjuice = 3, - /obj/item/reagent_containers/food/drinks/beer = 8, - /obj/item/reagent_containers/food/drinks/soda_cans/cola = 10 + /obj/item/reagent_containers/food/snacks/fries = 10, + /obj/item/reagent_containers/food/snacks/donut = 20, + /obj/item/reagent_containers/food/snacks/candiedapple = 7, + /obj/item/reagent_containers/food/snacks/burrito = 8, + /obj/item/reagent_containers/food/snacks/enchiladas = 10, + /obj/item/reagent_containers/food/snacks/spaghetti = 20, + /obj/item/reagent_containers/food/snacks/kebab/rat = 7, + /obj/item/reagent_containers/food/snacks/kebab/rat/double = 6, + /obj/item/reagent_containers/food/snacks/meatballspaghetti = 10, + /obj/item/reagent_containers/food/drinks/bottle/orangejuice = 10, + /obj/item/reagent_containers/food/drinks/bottle/pineapplejuice = 10, + /obj/item/reagent_containers/food/drinks/bottle/strawberryjuice = 10, + /obj/item/reagent_containers/food/drinks/beer = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/cola = 10, + /obj/item/reagent_containers/food/snacks/pizza/margherita = 10, + /obj/item/reagent_containers/food/snacks/butterdog = 12, + /obj/item/reagent_containers/food/snacks/burger/plain = 20, + /obj/item/reagent_containers/food/snacks/burger/bearger = 10, + /obj/item/reagent_containers/food/snacks/pie/plump_pie = 8, + /obj/item/reagent_containers/food/snacks/dough = 20 ) contraband = list( - /obj/item/clothing/mask/fakemoustache = 2, - /obj/item/clothing/head/chefhat = 2, + /obj/item/clothing/mask/fakemoustache = 5, + /obj/item/clothing/head/chefhat = 5, /obj/item/reagent_containers/food/snacks/cookie = 10, + /obj/item/reagent_containers/food/snacks/salad/fruit = 15, + /obj/item/reagent_containers/food/snacks/salad = 20, + /obj/item/reagent_containers/food/snacks/salad/hellcobb =10, + ) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_blueberryarea.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_blueberryarea.dmm index b94a62ff..ec64b6a1 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_blueberryarea.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_blueberryarea.dmm @@ -17,6 +17,7 @@ "G" = (/turf/closed/indestructible/riveted/boss,/area/ruin/powered) "H" = (/obj/structure/stone_tile/block{dir = 8; icon_state = "pristine_block1"},/obj/structure/statue/blueberry,/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered) "I" = (/obj/structure/flora/junglebush/b,/obj/machinery/light{base_state = null; dir = 1; icon = null; icon_state = null; invisibility = 1; overlayicon = null},/turf/open/floor/grass,/area/ruin/powered) +"O" = (/obj/item/reagent_containers/food/snacks/muffin/berry{desc = "A delicious and spongy little cake, with blueberries."; name = "blueberry muffin"},/turf/open/floor/grass,/area/ruin/powered) "U" = (/obj/machinery/light{base_state = null; dir = 1; icon = null; icon_state = null; invisibility = 1; overlayicon = null},/turf/open/floor/grass,/area/ruin/powered) (1,1,1) = {" @@ -28,7 +29,7 @@ meebllGGGGGGGGGGGGllbeemm meellGUccUqqqqUccUGlleemm meelGGcacqqqqqqcccGGleemm mellGGGUqqcccqqcUGGGllemm -melllGcqqcccqqccacGlllemm +melllGcqqccOqqccacGlllemm melllGcqqcccccccccGlllemm mellGIcqqccccccccnUGllemm mellGcccqqqccccccccGllemm diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_centerbuild.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_centerbuild.dmm new file mode 100644 index 00000000..b50d3712 --- /dev/null +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_centerbuild.dmm @@ -0,0 +1,50 @@ +"a" = (/turf/open/lava/smooth,/area/lavaland/surface/outdoors/unexplored) +"g" = (/obj/structure/stone_tile/surrounding,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) +"m" = (/obj/structure/stone_tile/block{dir = 8},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) +"n" = (/turf/closed/indestructible/riveted/boss,/area/lavaland/surface/outdoors/unexplored) +"o" = (/obj/structure/stone_tile/block/burnt{dir = 1},/turf/open/lava/smooth,/area/lavaland/surface/outdoors/unexplored) +"s" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) +"t" = (/obj/structure/stone_tile/slab/burnt,/turf/open/lava/smooth,/area/lavaland/surface/outdoors/unexplored) +"x" = (/obj/structure/stone_tile/slab,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) +"B" = (/obj/structure/spawner/lavaland/legion,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) +"F" = (/obj/structure/stone_tile/surrounding/burnt,/turf/open/lava/smooth,/area/lavaland/surface/outdoors/unexplored) +"G" = (/turf/closed/mineral/random/volcanic,/area/lavaland/surface/outdoors/unexplored) +"I" = (/obj/structure/stone_tile/block/burnt{dir = 4},/turf/open/lava/smooth,/area/lavaland/surface/outdoors/unexplored) +"L" = (/obj/structure/stone_tile/block/burnt,/turf/open/lava/smooth,/area/lavaland/surface/outdoors/unexplored) +"M" = (/obj/structure/stone_tile/block/burnt{dir = 8},/turf/open/lava/smooth,/area/lavaland/surface/outdoors/unexplored) +"W" = (/obj/structure/stone_tile/block{dir = 4},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) + +(1,1,1) = {" +aaaaaaaaaaassssxssssaaaaaaaaaaaa +aaaaaaaaaaaassxxxssaaaaaaaaaaaaa +aaaaaaaaaaaaantttnaaaaaaGaaaaaaa +aaaaaaaGaaaaaMtttIaaaaGGaaaaaaaa +aaGGGGaGaaaaamxFtIaaaaGaaaGaaaaa +aaaGGGaGGaaaamxxxWaaaGGGGaGaaaaa +aaaGGGGGGaaaamxxxWaaGGGGGGGaaaaa +aaaaGGGGaaaaaMtFxWaaaGGGGGGaaaaa +aaaGGGGGGaaaaMtttIaaaaGGGGGaaaaa +aaaGGGGGaaaasnxxxnsaaaaGGGaaaaaa +aaaaaaaaaaasssxxxsssaaaaaaaaaaaa +saaaaaaaaasssssxsssssaaaaaaaaaas +ssaaaaaaasssssssssssssaaaaaaaass +ssnoooooonsssssnsssssnooooooonss +sxttttxxxxxssnsssnssxxttttttttxs +xxxxgxxgxxxxsssBsssxxxtFtttFttxx +sxttttxxxxxssnsssnssxxttttttttxs +ssnLLLLLLnsssssnsssssnLLLLLLLnss +ssaaaaaaasssssssssssssaaaaaaaass +saaaaaaaaasssssxsssssaaaaaaaaass +aaaaaaaaaaasssxxxsssaaaaaaaaaaas +aaaaaaGaaaaasnxxxnsaaaaaaaaaaaaa +aaaaGGGaaaaaaMtttIaaaaaaaaaaaaaa +aaaGGGGaaaaaaMtgxIaaaaaaaGGaaaaa +aaaGGGGGaaaaaMtxxIaaaaaGGGGaaaaa +aaaGGGGGaaaaaMxxxWaaaaaGGGGaaaaa +aaaaGGGaaaaaaMxxxWaaaaaGGGGaaaaa +aaaaaaaaaaaaamxgxIaaaaaaaaaaaaaa +aaaaaaaaaaaaamxxxIaaaaaaaaaaaaaa +aaaaaaaaaaaaanxxxnaaaaaaaaaaaaaa +aaaaaaaaaaaassxxxssaaaaaaaaaaaaa +aaaaaaaaaaassssxssssaaaaaaaaaaaa +"} diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_crashedpod.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_crashedpod.dmm new file mode 100644 index 00000000..6352227c --- /dev/null +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_crashedpod.dmm @@ -0,0 +1,35 @@ +"a" = (/turf/closed/mineral/random/volcanic,/area/lavaland/surface/outdoors/unexplored) +"b" = (/obj/structure/chair/comfy/shuttle{dir = 1},/obj/machinery/status_display/evac{pixel_x = 32},/obj/machinery/computer/shuttle/pod{pixel_x = -32},/obj/effect/mob_spawn/human/corpse/assistant,/obj/item/clothing/mask/breath,/turf/open/floor/mineral/titanium/blue,/area/lavaland/surface/outdoors/unexplored) +"c" = (/obj/structure/chair/comfy/shuttle{dir = 1},/obj/item/radio/intercom{pixel_x = 25},/obj/item/storage/pod{pixel_x = -26},/obj/machinery/light/small{dir = 8},/obj/effect/decal/cleanable/blood,/turf/open/floor/mineral/titanium/blue,/area/lavaland/surface/outdoors/unexplored) +"g" = (/obj/item/paper/crumpled/bloody/docsdeathnote{desc = "We forgot to bring an oxy tank for the both of of us, fuck.."; info = null},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) +"h" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) +"n" = (/obj/structure/shuttle/engine/propulsion/burst,/turf/closed/wall/mineral/titanium,/area/lavaland/surface/outdoors/unexplored) +"w" = (/obj/machinery/door/airlock/titanium{name = "Escape Pod Airlock"},/obj/structure/fans/tiny,/turf/open/floor/mineral/titanium/blue,/area/lavaland/surface/outdoors/unexplored) +"y" = (/obj/item/clothing/mask/breath,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) +"C" = (/obj/effect/decal/cleanable/blood/gibs/human,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) +"F" = (/turf/closed/wall/mineral/titanium,/area/lavaland/surface/outdoors/unexplored) +"J" = (/obj/effect/decal/cleanable/blood,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) +"M" = (/obj/effect/spawner/structure/window/shuttle,/turf/open/floor/plating,/area/lavaland/surface/outdoors/unexplored) +"R" = (/obj/effect/mob_spawn/human/corpse,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) +"Y" = (/mob/living/simple_animal/hostile/asteroid/goliath/beast,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) + +(1,1,1) = {" +aaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaa +aaaaahhhaaaaaaaaaaaa +aaaahhhhhhaaaaaaaaaa +aaaahhFMFhhhaaaaaaaa +aaaahhFbFhhhhaaaaaaa +aaaahhFcFhghhaaaaaaa +aaaahhnwnhyChhaaaaaa +aaaahJhJhCRYhhaaaaaa +aaaaahhCJhhhJhhahhah +aaaaahhhhhhhhhhhhhhh +aaaaaahhhhhhhhhhhahh +aaaaaaahhhhhhhhhhhhh +aaaaaaaahhhhhhhhhhhh +aaaaaaaaahhhhhhahhhh +aaaaaaaaaaahahhhhhhh +aaaaaaaaaaaaaaaaaahh +aaaaaaaaaaaaaaaaaaaa +"} diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_crater.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_crater.dmm new file mode 100644 index 00000000..d6da34f7 --- /dev/null +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_crater.dmm @@ -0,0 +1,22 @@ +"a" = (/turf/template_noop,/area/template_noop) +"j" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) +"C" = (/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random,/turf/open/chasm/lavaland,/area/lavaland/surface/outdoors/unexplored) +"J" = (/turf/open/chasm/lavaland,/area/lavaland/surface/outdoors/unexplored) + +(1,1,1) = {" +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaajjjjjjjaaa +ajjjjjJJJJJjjaa +ajJJJJJJJCJJjaa +ajJCJJJJJJJJjaa +ajJJJJJJJJJJjaa +ajJJJJJJJJJJjja +ajJJJJCJJJJJCja +ajJJJJJJJJJJJja +ajjjjjjjjJJJJja +aaaaaaaajjjjjja +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaa +"} diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_lavalegion.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_lavalegion.dmm new file mode 100644 index 00000000..62f95983 --- /dev/null +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_lavalegion.dmm @@ -0,0 +1,36 @@ +"a" = (/turf/template_noop,/area/template_noop) +"e" = (/obj/structure/stone_tile/center,/turf/closed/indestructible/riveted/boss,/area/lavaland/surface/outdoors/unexplored) +"h" = (/obj/structure/stone_tile/block/burnt{dir = 1},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) +"m" = (/obj/structure/stone_tile/surrounding,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) +"s" = (/turf/open/lava/smooth,/area/lavaland/surface/outdoors/unexplored) +"v" = (/obj/structure/stone_tile/surrounding,/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) +"y" = (/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) +"B" = (/obj/structure/stone_tile/block/burnt,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) +"F" = (/obj/structure/stone_tile/slab/burnt,/turf/open/lava/smooth,/area/lavaland/surface/outdoors/unexplored) +"I" = (/obj/structure/stone_tile/slab/burnt,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) +"M" = (/obj/structure/stone_tile/block/burnt{dir = 1},/turf/open/lava/smooth,/area/lavaland/surface/outdoors/unexplored) +"R" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors/unexplored) +"X" = (/obj/structure/stone_tile/block/burnt,/turf/open/lava/smooth,/area/lavaland/surface/outdoors/unexplored) + +(1,1,1) = {" +aaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaRRRRaaaaaa +aaaaRRRRRRRRRRaaaaaa +aaaRRsssssssRRRaaaaa +aRRRssRRRRssRRRRaaaa +aRReMMMhehMMMeRRaaaa +aRRRFFIIvIFFIRRRRaaa +aRRRIFFFmIIFFRRRRaaa +aRReXXXXeBXXXeRRRaaa +aaRRssssRRsssRRRRaaa +aaRsssssssssRRRRRaaa +aaRsssssssssRRaaaaaa +aaRRsssssssRRaaaRaaa +aaaRRsRssRRRaaaRRaaa +aaaRRRRRRRRaaaRRRaaa +aaaaaRRRRRaaaRRRRaaa +aaaaaaRRRaaaRRRRaaaa +aaaaaaaaaaaRRRyRaaaa +aaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaa +"} diff --git a/code/game/objects/items/lorebooks.dm b/code/game/objects/items/lorebooks.dm index 54a6e298..02d86bbf 100644 --- a/code/game/objects/items/lorebooks.dm +++ b/code/game/objects/items/lorebooks.dm @@ -4,11 +4,11 @@ unique = TRUE // FALSE - Normal book, TRUE - Should not be treated as normal book, unable to be copied, unable to be modified /obj/item/book/lorebooks/welcome_to_kinaris - name = "Welcome to Kinaris!" - icon_state = "bookwelcometokinaris" - desc = "An introductory book given to immigrants of people who changed their Nanotrasen ways, and accepted the light of Kinaris, Radiance, and the Azurean Government." - author = "V. Kinaris" - title = "Welcome to Kinaris!" + name = "Welcome to GATO! (WIP)" + icon_state = "bookwelcometogato" + desc = "A datapad welcoming you to GATO. " + author = "Nyarco Gat" + title = "Welcome to GATO!" dat = {" -

Welcome to Kinaris!

+

Welcome to GATO!

- If you're reading this datapad, you probably have gained an interest in what the daily commodities and rights of a Kinaris worker may be, or you have recently been employed and are looking for further information. Under the latter's case; welcome! It's not an easy transition to working under a larger corporation for any Azurean, and we are here to alleviate that stress. Whether or not you fall under any of these categories, or are clueless at all to who we are, please do take a read! + If you're reading this datapad, we shall welcome you to your new job here at GATO.

Table of Contents...

    -
  1. What is Kinaris? -
  2. How Kinaris Came to be -
  3. How Kinaris Operates Today +
  4. What is GATO? +
  5. How GATO Came to be +
  6. How GATO Operates Today
  7. Workers' Rights
  8. Usage of Radiance

Chapter 1

-

What is Kinaris?

+

What is GATO?

If you are unfamiliar to Azurean space, then you are most definitely unfamiliar with the entirety of Kinaris itself. Kinaris is the primary company under the rule of Azurea, who not only manufactures goods, but is a forefront of Radiant Technology, space exploration, exo-colony development, and asset protection. As such, it is a very expensive operation that almost entirely depends on it's own manufactured goods- and selling of such- towards it's own colonies, which is an extent of colony taxation and revenue collection after they've initially been set up. The sheer stability of it's exponential growth and safety has piqued the interest from other regions and promising even more imports and exports between Kinaris and other affiliates (including but not limited to; Lancaster Industries, CorpraTek, Grinlok Conglomerate, and Nanotrasen). The dependable and and noble nature of the heads at Kinaris had inevitably led to constant backing by the Azurean Government, and increased fortitude in asset protection. This ultimately ended up in Kinaris being the leading, and most-trusted government under Azurea law.

@@ -45,13 +45,13 @@

Chapter 2

How Kinaris Came to be

- Rising up to mega-corporation status and being backed as the most trustable force within several sectors is not a simple task whatsoever. There are mistakes along the road, and there are plenty of issues forthwrought with even considering such a task. Kinaris begun as nothing more than a simple cargo company nearly two centuries from the date of March 5th, 2560. Initially, the company began as nothing more than a delivery service by none other than Centurian Kinaris, within a low-tech sector out of Azurean Gov's grasp. Due to the unfortunate events of resistance against The Phoenix at the time, most sectors like this were outright ravaged and decimated into a smoldering pulp of mud and ash, where individuals kept to themselves and were cut-throat towards one another. This led to imports and exports often being outright mistrusted due to one scandallous event of poisoned rations after another. This was an opportunity for Centurian, who was one of the most trusted individuals within the sector, and opened up his shipping goods company after months of hauling for others. This in time spread word and opened further opportunities for Centurian himself, who saw these as nothing more than help to give towards those who needed it. Kinaris outright spent a good portion of it's early life as another small company with a few workers trickling in every now and then, indifferent to the thousands of others littering the frontier. + Rising up to mega-corporation status and being backed as the most trustable force within several sectors is not a simple task whatsoever. There are mistakes along the road, and there are plenty of issues forthwrought with even considering such a task. Kinaris begun as nothing more than a simple cargo company nearly two centuries from the date of March 5th, 2560. Initially, the company began as nothing more than a delivery service by none other than Centurian Kinaris, within a low-tech sector out of Azurean Gov's grasp. Due to the unfortunate events of resistance against The Phoenix at the time, most sectors like this were outright ravaged and decimated into a smoldering pulp of mud and ash, where individuals kept to themselves and were cut-throat towards one another. This led to imports and exports often being outright mistrusted due to one scandallous event of poisoned rations after another. This was an opportunity for Centurian, who was one of the most trusted individuals within the sector, and opened up his shipping goods company after months of hauling for others. This in time spread word and opened further opportunities for Centurian himself, who saw these as nothing more than help to give towards those who needed it. Kinaris outright spent a good portion of it's early life as another small company with a few workers trickling in every now and then, indifferent to the thousands of others littering the frontier.

What eventually settled Kinaris off from the norm of other companies was nothing more than the surge of artificial interest in becoming Radiant across Azurean space. Unlike most companies who resisted and fought against The Phoenix, Kinaris heeded it's will. It was said that Centurian himself was a vissionare in his early days, led by the golden light, as he called it. In most frontier sectors, this was appalled and shunned by most communties, who aimed to flee as far as they could from Azurea itself, to escape Radiance. This was a short downfall in Kinaris's momentum, as it's trust rapidly decimated into nothing in due time, and prompted anger within it's customers. However, Centurian prevailed, and in a simple matter of days, sectors begun following in Radiance in the bulk, and as a result, formed a bond with the company. It is unclear how exactly Centurian managed to pull off such a dangerous feat, but that is just more evidence towards his Radiance.

As the interest in Radiance surged across Azurean space, so did the success of Kinaris. One sector converted, one sector gained trust. More trust, more revenue. More revenue, more improvements. Rinse and repeat, for a hundred years. For a while, Radiance was nothing more than a melody that went with the chorus of Kinaris; a simple cargo company turned head over heels into a Pristine Zealot of Light, converting those within it's path instead of decimating it to smoldering ash, feeding back into the acceptance of Radiance as a whole for the people of Azurean Space. Centurian was nothing more than the leader of peace and safety, giving to those who needed help the most, branching off far beyond that of simple freight shipments. With trust, he smote down those who did not heed to peace, rather violence. Some did not believe in his ways. This led to his death after a Nanotrasen Assault on his capital freighter.

- Today, his tomb drifts within the gas clouds of Myril Majoris, Azurea's gas giant. In memoriam of the one person who heeded unity with individualism into Azurea's people. He was nothing more than Radiant, nothing less. + Today, his tomb drifts within the gas clouds of Myril Majoris, Azurea's gas giant. In memoriam of the one person who heeded unity with individualism into Azurea's people. He was nothing more than Radiant, nothing less.

Chapter 3

@@ -75,7 +75,7 @@ If you've been blessed by The Phoenix's light, then we commend you for such a noble hierarchy to achieve! As Radiance Protocol is rather straightforward in the eyes of Kinaris and we do not doubt the usage of the beholder, it is permitted to use Radiant Technology within Kinaris-owned space, so as long as it involves a more efficient workflow. Usage of smiting should be used with caution.

- + diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index 3f951b4e..8ca1d062 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -42,6 +42,9 @@ /obj/machinery/vending/cola/black icon_state = "cola_black" + name = "\improper GATO Vending Machine" + desc = "A GATO constructed vending machine, hopefully it can satisfy you." + product_slogans = "Meoow!~ New sodas are now here!!" /obj/machinery/vending/cola/red icon_state = "red_cola" diff --git a/config/lavaRuinBlacklist.txt b/config/lavaRuinBlacklist.txt index 18a83d61..d006b5bf 100644 --- a/config/lavaRuinBlacklist.txt +++ b/config/lavaRuinBlacklist.txt @@ -24,6 +24,10 @@ _maps/RandomRuins/LavaRuins/lavaland_surface_cube.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_lust.dmm ##MISC +#_maps/RandomRuins/LavaRuins/lavaland_surface_blueberryarea.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_crashedpod.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_crater.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_centerbuild.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_automated_trade_outpost.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_ww_vault.dmm diff --git a/icons/emoji.dmi b/icons/emoji.dmi index 3670c0bb..eb4d6944 100644 Binary files a/icons/emoji.dmi and b/icons/emoji.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index 5f9cd3aa..267ef2bf 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index dc683682..09c23f5e 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ diff --git a/sound/music/CInferno.ogg b/sound/music/CInferno.ogg new file mode 100644 index 00000000..a6a579b6 Binary files /dev/null and b/sound/music/CInferno.ogg differ diff --git a/sound/music/TinTinOnMark2.ogg b/sound/music/TinTinOnMark2.ogg new file mode 100644 index 00000000..876b944c Binary files /dev/null and b/sound/music/TinTinOnMark2.ogg differ diff --git a/strings/italian_replacement.json b/strings/italian_replacement.json index 42bef05a..794a9a87 100644 --- a/strings/italian_replacement.json +++ b/strings/italian_replacement.json @@ -62,7 +62,7 @@ "who's": "who's-a", "whose": "whose-a", "why": "for-a what reason", - "wine": "vino" + "wine": "vinoh" } diff --git a/strings/round_start_sounds.txt b/strings/round_start_sounds.txt index 8dcec030..cc7986e6 100644 --- a/strings/round_start_sounds.txt +++ b/strings/round_start_sounds.txt @@ -30,4 +30,6 @@ sound/music/thesettler.ogg sound/music/thelessImichael.ogg sound/music/PigstepSilva.ogg sound/music/Sam.ogg -sound/music/credits.ogg \ No newline at end of file +sound/music/credits.ogg +sound/music/TinTinOnMark2.ogg +sound/music/CInferno.ogg \ No newline at end of file diff --git a/strings/sillytips.txt b/strings/sillytips.txt index bc59a109..8e136800 100644 --- a/strings/sillytips.txt +++ b/strings/sillytips.txt @@ -45,3 +45,4 @@ Help. Maints. BZ stops or slows down Lings chem regeneration drastically, make sure to BZ flood the station when lings are confirmed! Admins always regret meme options in their polls. +Do not let Metha sleep on the couch. diff --git a/strings/station_names.txt b/strings/station_names.txt index 7742ba6a..a5ba564e 100644 --- a/strings/station_names.txt +++ b/strings/station_names.txt @@ -80,3 +80,5 @@ Pub Ship Book Refactor +Croatia +Gassy diff --git a/strings/station_prefixes.txt b/strings/station_prefixes.txt index c304b69f..49e04b9b 100644 --- a/strings/station_prefixes.txt +++ b/strings/station_prefixes.txt @@ -39,3 +39,5 @@ Grey Grim Electric Burning +Bloated +Blob \ No newline at end of file diff --git a/strings/station_suffixes.txt b/strings/station_suffixes.txt index 245a1a67..1a8a7c8d 100644 --- a/strings/station_suffixes.txt +++ b/strings/station_suffixes.txt @@ -63,3 +63,4 @@ Workspace Metro Warehouse Space Junk +Meteor