Merge branch 'KabKebab:master' into master

This commit is contained in:
SomeGuyEatingPie
2022-05-06 12:42:49 +01:00
committed by GitHub
33 changed files with 412 additions and 424 deletions
+7 -7
View File
@@ -3,18 +3,18 @@
icon_state = "pamphlet"
/obj/item/paper/pamphlet/gateway
info = "<b>Welcome to the Kinaris Gateway project...</b><br>\
info = "<b>Welcome to the GATO Gateway project...</b><br>\
Congratulations! If you're reading this, you and your superiors have decided that you're \
ready to commit to a life spent colonising the rolling hills of far away worlds. You \
must be ready for a lifetime of adventure, a little bit of hard work, and an award \
winning dental plan- but that's not all the Kinaris Gateway project has to offer.<br>\
winning dental plan- but that's not all the GATO Gateway project has to offer.<br>\
<br>Because we care about you, we feel it is only fair to make sure you know the risks \
before you commit to joining the Kinaris Gateway project. All away destinations have \
been fully scanned by a Kinaris expeditionary team, and are certified to be 100% safe. \
before you commit to joining the GATO Gateway project. All away destinations have \
been fully scanned by a GATO expeditionary team, and are certified to be 100% safe. \
We've even left a case of space beer along with the basic materials you'll need to expand \
Kinaris's operational area and start your new life.<br><br>\
GATO's operational area and start your new life.<br><br>\
<b>Gateway Operation Basics</b><br>\
All Kinaris approved Gateways operate on the same basic principals. They operate off \
All GATO approved Gateways operate on the same basic principals. They operate off \
area equipment power as you would expect, and without this supply, it cannot safely function, \
causinng it to reject all attempts at operation.<br><br>\
Once it is correctly setup, and once it has enough power to operate, the Gateway will begin \
@@ -30,7 +30,7 @@
number of cases, the Gateway they have established may not be immediately obvious. \
Do not panic if you cannot locate the return Gateway. Begin colonisation of the destination. \
<br><br><b>A New World</b><br>\
As a participant in the Kinaris Gateway Project, you will be on the frontiers of space. \
As a participant in the GATO Gateway Project, you will be on the frontiers of space. \
Though complete safety is assured, participants are advised to prepare for inhospitable \
environs."
@@ -144,17 +144,17 @@
required_reagents = list(/datum/reagent/slime_toxin = 1, /datum/reagent/toxin/mutagen = 1)
/datum/chemical_reaction/fermis_plush
/*/datum/chemical_reaction/fermis_plush
name = "Fermis plush"
id = "fermis_plush"
required_reagents = list(/datum/reagent/consumable/caramel = 10, /datum/reagent/blood = 10, /datum/reagent/stable_plasma = 10)
mob_react = FALSE
required_temp = 400
required_temp = 400*/ //Removed Fermis Plush recipe
/datum/chemical_reaction/fermis_plush/on_reaction(datum/reagents/holder, created_volume)
/*/datum/chemical_reaction/fermis_plush/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i+=10)
new /obj/item/toy/plush/catgirl/fermis(location)
new /obj/item/toy/plush/catgirl/fermis(location)*/ //Fursona recipe
////////////////////////////////// VIROLOGY //////////////////////////////////////////