mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
-Replaces all metroid sprites with rorobeast sprites.
-Removes jars which were redundant and used nowhere else but metroid jelly stuff. Rorojelly now comes in a beaker. I've replaced most of the important names and messages where applicable. Going through and replacing all instances of the word 'metroid' with 'roro' in the code is a project in itself. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4714 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -756,12 +756,12 @@
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/stew
|
||||
|
||||
/datum/recipe/metroidtoast
|
||||
reagents = list("metroid" = 5)
|
||||
/datum/recipe/rorotoast
|
||||
reagents = list("rorojelly" = 5)
|
||||
items = list(
|
||||
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/metroidtoast
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/rorotoast
|
||||
|
||||
/datum/recipe/milosoup
|
||||
reagents = list("water" = 10)
|
||||
@@ -876,12 +876,12 @@
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake
|
||||
|
||||
/datum/recipe/metroidburger
|
||||
reagents = list("metroid" = 5, "flour" = 15)
|
||||
/datum/recipe/roroburger
|
||||
reagents = list("rorojelly" = 5, "flour" = 15)
|
||||
items = list(
|
||||
// /obj/item/weapon/reagent_containers/food/snacks/flour,
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/metroidburger
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/roroburger
|
||||
|
||||
/datum/recipe/twobread
|
||||
reagents = list("wine" = 5)
|
||||
@@ -891,13 +891,13 @@
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/twobread
|
||||
|
||||
/datum/recipe/metroidsandwich
|
||||
reagents = list("metroid" = 5)
|
||||
/datum/recipe/rorosandwich
|
||||
reagents = list("rorojelly" = 5)
|
||||
items = list(
|
||||
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/metroidsandwich
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/rorosandwich
|
||||
|
||||
/datum/recipe/orangecake
|
||||
reagents = list("milk" = 5, "flour" = 15)
|
||||
@@ -952,11 +952,11 @@
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/bloodsoup
|
||||
|
||||
|
||||
/datum/recipe/metroidsoup
|
||||
reagents = list("water" = 10, "metroid" = 5)
|
||||
/datum/recipe/rorosoup
|
||||
reagents = list("water" = 10, "rorojelly" = 5)
|
||||
items = list(
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/metroidsoup
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/rorosoup
|
||||
|
||||
/datum/recipe/clownstears
|
||||
reagents = list("water" = 10)
|
||||
@@ -966,12 +966,12 @@
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/clownstears
|
||||
|
||||
/datum/recipe/boiledmetroidcore
|
||||
/datum/recipe/boiledrorocore
|
||||
reagents = list("water" = 5)
|
||||
items = list(
|
||||
/obj/item/metroid_core,
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/boiledmetroidcore
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/boiledrorocore
|
||||
|
||||
/datum/recipe/braincake
|
||||
reagents = list("milk" = 5, "flour" = 15)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/mob/living/carbon/metroid/death(gibbed)
|
||||
if(stat == DEAD) return
|
||||
stat = DEAD
|
||||
icon_state = "baby metroid dead"
|
||||
icon_state = "baby roro dead"
|
||||
|
||||
if(!gibbed)
|
||||
if(istype(src, /mob/living/carbon/metroid/adult))
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/mob/living/carbon/metroid
|
||||
name = "baby metroid"
|
||||
name = "baby roro"
|
||||
icon = 'icons/mob/mob.dmi'
|
||||
icon_state = "baby metroid"
|
||||
icon_state = "baby roro"
|
||||
pass_flags = PASSTABLE
|
||||
voice_message = "skree!"
|
||||
say_message = "hums"
|
||||
@@ -41,9 +41,9 @@
|
||||
// Metroids pass on genetic data, so all their offspring have the same "Friends",
|
||||
|
||||
/mob/living/carbon/metroid/adult
|
||||
name = "adult metroid"
|
||||
name = "adult roro"
|
||||
icon = 'icons/mob/mob.dmi'
|
||||
icon_state = "adult metroid"
|
||||
icon_state = "adult roro"
|
||||
|
||||
health = 200
|
||||
gender = NEUTER
|
||||
@@ -56,10 +56,10 @@
|
||||
var/datum/reagents/R = new/datum/reagents(100)
|
||||
reagents = R
|
||||
R.my_atom = src
|
||||
if(name == "baby metroid")
|
||||
name = text("baby metroid ([rand(1, 1000)])")
|
||||
if(name == "baby roro")
|
||||
name = text("baby roro ([rand(1, 1000)])")
|
||||
else
|
||||
name = text("adult metroid ([rand(1,1000)])")
|
||||
name = text("adult roro ([rand(1,1000)])")
|
||||
real_name = name
|
||||
spawn (1)
|
||||
regenerate_icons()
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/mob/living/carbon/metroid/verb/Feed()
|
||||
set category = "Metroid"
|
||||
set category = "Roro"
|
||||
set desc = "This will let you feed on any valid creature in the surrounding area. This should also be used to halt the feeding process."
|
||||
if(Victim)
|
||||
Feedstop()
|
||||
@@ -50,9 +50,9 @@
|
||||
var/lastnut = nutrition
|
||||
//if(M.client) M << "\red You legs become paralyzed!"
|
||||
if(istype(src, /mob/living/carbon/metroid/adult))
|
||||
icon_state = "adult metroid eat"
|
||||
icon_state = "adult roro eat"
|
||||
else
|
||||
icon_state = "baby metroid eat"
|
||||
icon_state = "baby roro eat"
|
||||
|
||||
while(Victim && M.health > -70 && stat != 2)
|
||||
// M.canmove = 0
|
||||
@@ -120,13 +120,13 @@
|
||||
|
||||
if(stat == 2)
|
||||
if(!istype(src, /mob/living/carbon/metroid/adult))
|
||||
icon_state = "baby metroid dead"
|
||||
icon_state = "baby roro dead"
|
||||
|
||||
else
|
||||
if(istype(src, /mob/living/carbon/metroid/adult))
|
||||
icon_state = "adult metroid"
|
||||
icon_state = "adult roro"
|
||||
else
|
||||
icon_state = "baby metroid"
|
||||
icon_state = "baby roro"
|
||||
|
||||
canmove = 1
|
||||
anchored = 0
|
||||
@@ -164,7 +164,7 @@
|
||||
|
||||
|
||||
/mob/living/carbon/metroid/verb/Evolve()
|
||||
set category = "Metroid"
|
||||
set category = "Roro"
|
||||
set desc = "This will let you evolve from baby to adult metroid."
|
||||
|
||||
if(stat)
|
||||
@@ -186,7 +186,7 @@
|
||||
src << "<i>I have already evolved...</i>"
|
||||
|
||||
/mob/living/carbon/metroid/verb/Reproduce()
|
||||
set category = "Metroid"
|
||||
set category = "Roro"
|
||||
set desc = "This will make you split into a random number of Metroids (usually 2). NOTE: this will KILL you, but you will be transferred into one of the babies."
|
||||
|
||||
if(stat)
|
||||
@@ -195,7 +195,7 @@
|
||||
|
||||
if(istype(src, /mob/living/carbon/metroid/adult))
|
||||
if(amount_grown >= 10)
|
||||
if(input("Are you absolutely sure you want to reproduce? Your current body will cease to be, but your consciousness will be transferred into a produced metroid.") in list("Yes","No")=="Yes")
|
||||
if(input("Are you absolutely sure you want to reproduce? Your current body will cease to be, but your consciousness will be transferred into a produced rorobeast.") in list("Yes","No")=="Yes")
|
||||
if(stat)
|
||||
src << "<i>I must be conscious to do this...</i>"
|
||||
return
|
||||
@@ -215,7 +215,7 @@
|
||||
new_metroid.a_intent = "hurt"
|
||||
new_metroid.key = key
|
||||
|
||||
new_metroid << "<B>You are now a Metroid. Skree!</B>"
|
||||
new_metroid << "<B>You are now a Rorobeast. Skree!</B>"
|
||||
del(src)
|
||||
else
|
||||
src << "<i>I am not ready to reproduce yet...</i>"
|
||||
@@ -227,6 +227,6 @@
|
||||
/mob/living/carbon/metroid/verb/ventcrawl()
|
||||
set name = "Crawl through Vent"
|
||||
set desc = "Enter an air vent and crawl through the pipe system."
|
||||
set category = "Metroid"
|
||||
set category = "Roro"
|
||||
if(Victim) return
|
||||
handle_ventcrawl()
|
||||
|
||||
@@ -73,12 +73,12 @@ datum
|
||||
on_update(var/atom/A)
|
||||
return
|
||||
|
||||
metroid
|
||||
name = "Metroid Jam"
|
||||
id = "metroid"
|
||||
description = "A green semi-liquid produced from one of the deadliest lifeforms in existence."
|
||||
rorojelly
|
||||
name = "Roro Jelly"
|
||||
id = "rorojelly"
|
||||
description = "A gooey semi-liquid produced from one of the deadliest lifeforms in existence. SO REAL."
|
||||
reagent_state = LIQUID
|
||||
color = "#005020" // rgb: 0, 50, 20
|
||||
color = "#801E28" // rgb: 128, 30, 40
|
||||
on_mob_life(var/mob/living/M as mob)
|
||||
if(prob(10))
|
||||
M << "\red Your insides are burning!"
|
||||
|
||||
@@ -353,7 +353,7 @@
|
||||
if(6)
|
||||
reagents.add_reagent("coco", 3)
|
||||
if(7)
|
||||
reagents.add_reagent("metroid", 3)
|
||||
reagents.add_reagent("rorojelly", 3)
|
||||
if(8)
|
||||
reagents.add_reagent("banana", 3)
|
||||
if(9)
|
||||
@@ -1117,13 +1117,13 @@
|
||||
reagents.add_reagent("water", 5)
|
||||
bitesize = 5
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/metroidsoup
|
||||
name = "Metroid soup"
|
||||
desc = "Tasty"
|
||||
icon_state = "metroidsoup"
|
||||
/obj/item/weapon/reagent_containers/food/snacks/rorosoup
|
||||
name = "Roro soup"
|
||||
desc = "If no water is available, you may substitute tears."
|
||||
icon_state = "rorosoup"
|
||||
New()
|
||||
..()
|
||||
reagents.add_reagent("metroid", 5)
|
||||
reagents.add_reagent("rorojelly", 5)
|
||||
reagents.add_reagent("water", 10)
|
||||
bitesize = 5
|
||||
|
||||
@@ -1203,7 +1203,7 @@
|
||||
reagents.add_reagent("nutriment", 6)
|
||||
reagents.add_reagent("blood", 10)
|
||||
if(7)
|
||||
reagents.add_reagent("metroid", 10)
|
||||
reagents.add_reagent("rorojelly", 10)
|
||||
reagents.add_reagent("water", 10)
|
||||
if(8)
|
||||
reagents.add_reagent("carbon", 10)
|
||||
@@ -1440,25 +1440,25 @@
|
||||
reagents.add_reagent("water", 5)
|
||||
bitesize = 10
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/metroidtoast
|
||||
name = "Metroid Toast"
|
||||
/obj/item/weapon/reagent_containers/food/snacks/rorotoast
|
||||
name = "Roro Toast"
|
||||
desc = "A slice of bread covered with delicious jam."
|
||||
icon_state = "metroidtoast"
|
||||
icon_state = "rorotoast"
|
||||
trash = /obj/item/trash/plate
|
||||
New()
|
||||
..()
|
||||
reagents.add_reagent("nutriment", 1)
|
||||
reagents.add_reagent("metroid", 5)
|
||||
reagents.add_reagent("rorojelly", 5)
|
||||
bitesize = 3
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/metroidburger
|
||||
name = "Metroid Burger"
|
||||
/obj/item/weapon/reagent_containers/food/snacks/roroburger
|
||||
name = "Roro Burger"
|
||||
desc = "A very toxic and tasty burger."
|
||||
icon_state = "metroidburger"
|
||||
icon_state = "roroburger"
|
||||
New()
|
||||
..()
|
||||
reagents.add_reagent("nutriment", 1)
|
||||
reagents.add_reagent("metroid", 5)
|
||||
reagents.add_reagent("rorojelly", 5)
|
||||
bitesize = 2
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/milosoup
|
||||
@@ -1578,24 +1578,24 @@
|
||||
reagents.add_reagent("nutriment", 2)
|
||||
bitesize = 3
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/metroidsandwich
|
||||
name = "Metroid Sandwich"
|
||||
desc = "A sandwich is green stuff."
|
||||
icon_state = "metroidsandwich"
|
||||
/obj/item/weapon/reagent_containers/food/snacks/rorosandwich
|
||||
name = "Roro Sandwich"
|
||||
desc = "You think you can see someone's face in the toast!"
|
||||
icon_state = "rorosandwich"
|
||||
trash = /obj/item/trash/plate
|
||||
New()
|
||||
..()
|
||||
reagents.add_reagent("nutriment", 2)
|
||||
reagents.add_reagent("metroid", 5)
|
||||
reagents.add_reagent("rorojelly", 5)
|
||||
bitesize = 3
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/boiledmetroidcore
|
||||
name = "Boiled Metroid Core"
|
||||
/obj/item/weapon/reagent_containers/food/snacks/boiledrorocore
|
||||
name = "Boiled Roro Core"
|
||||
desc = "A boiled red thing."
|
||||
icon_state = "boiledmetroidcore"
|
||||
icon_state = "boiledrorocore"
|
||||
New()
|
||||
..()
|
||||
reagents.add_reagent("metroid", 5)
|
||||
reagents.add_reagent("rorojelly", 5)
|
||||
bitesize = 3
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/mint
|
||||
|
||||
@@ -146,6 +146,12 @@
|
||||
reagents.add_reagent("cryoxadone", 30)
|
||||
update_icon()
|
||||
|
||||
/obj/item/weapon/reagent_containers/glass/beaker/roro
|
||||
New()
|
||||
..()
|
||||
reagents.add_reagent("rorojelly", 50)
|
||||
update_icon()
|
||||
|
||||
/obj/item/weapon/reagent_containers/glass/bucket
|
||||
desc = "It's a bucket."
|
||||
name = "bucket"
|
||||
|
||||
Reference in New Issue
Block a user