diff --git a/code/modules/food_and_drinks/food/snacks_salad.dm b/code/modules/food_and_drinks/food/snacks_salad.dm index 318d1edc..055999f7 100644 --- a/code/modules/food_and_drinks/food/snacks_salad.dm +++ b/code/modules/food_and_drinks/food/snacks_salad.dm @@ -124,4 +124,4 @@ trash = /obj/item/reagent_containers/glass/bowl/mushroom_bowl bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4) tastes = list("fruity cactus" = 5, "ash" = 1, "tough meat" = 3, "your eternal damnation" = 1) - foodtype = FRUIT | MEAT | VEGETABLES //MUSHROOM = VEGETABLE -VladinXXV 2021 + foodtype = FRUIT | MEAT | VEGETABLES //MUSHROOM = VEGETABLE -VivI Fanteriso: 2021. Totally didnt steal this comment form vladin. diff --git a/hyperstation/code/obj/plushes.dm b/hyperstation/code/obj/plushes.dm index d744793d..58de2e35 100644 --- a/hyperstation/code/obj/plushes.dm +++ b/hyperstation/code/obj/plushes.dm @@ -64,19 +64,6 @@ light_range = 1.4 attack_verb = list("bapped", "slapped", "bonked") -//Vladplush containment starts here -/obj/item/toy/plush/nukeplushie/vladin - name = "elite operative plushie" - desc = "A stuffed toy that resembles an elite syndicate nuclear operative. He has a little wedding band!" - gender = MALE //he's a boy, there is no doubt here - young = TRUE //he's not actually young, but i refuse to have a plush that is not loyal to his partner. this is the only way i could figure out. - icon = 'hyperstation/icons/obj/plushes.dmi' - icon_state = "vladin" - item_state = "vladin" - attack_verb = list("nuked", "detonated", "CQC'd", "robusted") - squeak_override = list('sound/effects/hit_punch.ogg' = 1, 'sound/effects/hit_kick.ogg' = 1, 'sound/weapons/cqchit1.ogg' = 1, 'sound/weapons/cqchit2.ogg' = 1) -//I can't figure out how to make him loyal to a specific type of plush. If anyone figures that out, there will be more. Until then, this is the end of the vladplush. - //Enzo_Leon patron stuff /obj/item/toy/plush/mammal/enzo_leon name = "rat plushie" @@ -87,4 +74,4 @@ item_state = "enzor" attack_verb = list("tail bapped", "whomped", "squeaked") squeak_override = list('sound/effects/mousesqueek.ogg'= 1) -//End \ No newline at end of file +//End diff --git a/hyperstation/icons/obj/plushes.dmi b/hyperstation/icons/obj/plushes.dmi index e0496bfb..0438ab7d 100644 Binary files a/hyperstation/icons/obj/plushes.dmi and b/hyperstation/icons/obj/plushes.dmi differ