Skip to content

Commit

Permalink
Сгущёнка, фумо и 2 ствола (#310)
Browse files Browse the repository at this point in the history
* сгущёнка и варёное молоко

вкусно

* сгущёнка и фумо, лучший ПР форевор

* атомизация или хз, я не понял что она имеет в виду
  • Loading branch information
polerno authored Jun 23, 2023
1 parent 4aad921 commit 1a66f5a
Show file tree
Hide file tree
Showing 10 changed files with 160 additions and 0 deletions.
1 change: 1 addition & 0 deletions baystation12.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3299,6 +3299,7 @@
#include "proxima\code\modules\poraz_corgi.dm"
#include "proxima\code\modules\species.dm"
#include "proxima\code\modules\admin\xeno_whitelist.dm"
#include "proxima\code\modules\chem\terran_milk.dm"
#include "proxima\code\modules\clothing\_clothing.dm"
#include "proxima\code\modules\clothing\accessories\cloak.dm"
#include "proxima\code\modules\clothing\accessories\sweater.dm"
Expand Down
2 changes: 2 additions & 0 deletions code/game/machinery/vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1360,6 +1360,8 @@
/obj/item/reagent_containers/food/snacks/salo = 7,
/obj/item/reagent_containers/food/snacks/driedfish = 7,
/obj/item/reagent_containers/food/snacks/pistachios = 7,
/obj/item/reagent_containers/food/snacks/canned/varenka = 1,
/obj/item/reagent_containers/food/snacks/canned/sgushenka = 3
)

contraband = list(/obj/item/reagent_containers/food/snacks/canned/caviar/true = 1)
Expand Down
10 changes: 10 additions & 0 deletions code/game/objects/items/trash.dm
Original file line number Diff line number Diff line change
Expand Up @@ -221,3 +221,13 @@
name = "stick"
desc = "a stick from some snack food item or a lollipop, not even useful as crafting material."
icon_state = "stick"

/obj/item/trash/sgushenka
name = "empty can"
icon = 'proxima/icons/obj/trash.dmi'
icon_state = "sgushenka"

/obj/item/trash/varenka
name = "empty can"
icon = 'proxima/icons/obj/trash.dmi'
icon_state = "varenka"
2 changes: 2 additions & 0 deletions code/modules/client/preference_setup/loadout/lists/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@
plushes["plush red fox"] = /obj/item/toy/figure/plush/fox
plushes["plush black fox"] = /obj/item/toy/figure/plush/fox/blackfox
plushes["plush orange fox"] = /obj/item/toy/figure/plush/fox/orange
plushes["plush winter fairy"] = /obj/item/toy/plush/fumo/cirno
plushes["plush black witch"] = /obj/item/toy/plush/fumo
gear_tweaks += new /datum/gear_tweak/path(plushes)

/datum/gear/workvisa
Expand Down
24 changes: 24 additions & 0 deletions proxima/code/game/items/toys.dm
Original file line number Diff line number Diff line change
Expand Up @@ -390,3 +390,27 @@
name = "Multi Point - Angela"
id = "Angela"
item_path = /obj/item/toy/plush/angela

/obj/item/toy/plush/fumo
icon = 'proxima/icons/obj/fumo.dmi'
name = "Plushie black witch"
desc = "The black witch from the popular Yangui cartoon, well, one is pretty cute."
icon_state = "fumoplushie_marisa"
gender = FEMALE

/obj/item/toy/plush/fumo/cirno
icon = 'proxima/icons/obj/fumo.dmi'
name = "Plushie winter fairy"
desc = "Silly winter fairy from the popular Yangui cartoon . You have to squeeze her cheeks."
icon_state = "fumoplushie_cirno"
gender = FEMALE

/obj/random_multi/single_item/witch
name = "Multi Point - witch"
id = "witch"
item_path = /obj/item/toy/plush/fumo

/obj/random_multi/single_item/cirno
name = "Multi Point - fairy"
id = "fairy"
item_path = /obj/item/toy/plush/fumo/cirno
121 changes: 121 additions & 0 deletions proxima/code/modules/chem/terran_milk.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
/datum/reagent/nutriment/condensedmilk
name = "condensed milk"
description = "The miracle of Terra's food industry — super-saturated compressed milk."
taste_description = "extraordinary sweetness"
nutriment_factor = 5
taste_mult = 2
reagent_state = LIQUID
color = "#F4CBA8"

/datum/reagent/nutriment/condensedmilkboiled
name = "boiled condensed milk"
description = "The miracle of Terra's food industry — super-saturated compressed milk that's been boiled."
taste_description = "extraordinary thicc sweetness"
nutriment_factor = 6
taste_mult = 2
reagent_state = LIQUID
color = "#AC6527"



// Recipes
/datum/chemical_reaction/condensedmilk
name = "condensedmilk"
result = /datum/reagent/nutriment/condensedmilk
required_reagents = list(/datum/reagent/drink/milk = 5, /datum/reagent/sugar = 5)
result_amount = 5
minimum_temperature = 90 CELSIUS
maximum_temperature = 120 CELSIUS
mix_message = "The solution thickens."

/datum/chemical_reaction/varenka
name = "Varenka"
result = /datum/reagent/nutriment/condensedmilkboiled
required_reagents = list(/datum/reagent/nutriment/condensedmilk = 1)
result_amount = 1
minimum_temperature = 90 CELSIUS
maximum_temperature = 120 CELSIUS
mix_message = "The solution thickens."

// reagent_containers/food/snacks

/obj/item/reagent_containers/food/snacks/canned/sgushenka
name = "sgushenka"
icon_state = "sgushenka"
desc = "A can of condensed milk originating from the ICCG."
trash = /obj/item/trash/sgushenka
filling_color = "#F4CBA8"
volume = 40
center_of_mass = "x=15;y=9"
eat_sound = 'sound/items/drink.ogg'
bitesize = 8

/obj/item/reagent_containers/food/snacks/canned/sgushenka/Initialize()
. = ..()
reagents.add_reagent(/datum/reagent/nutriment/condensedmilk, 28)
reagents.add_reagent(/datum/reagent/sugar, 8)
reagents.add_reagent(/datum/reagent/iron, 4)

/obj/item/reagent_containers/food/snacks/canned/sgushenka/attack_self(var/mob/user)
if(sealed)
to_chat(user, "<span class='notice'>You can't open \the [src] with a bare hands.</span>")
return

/obj/item/reagent_containers/food/snacks/canned/sgushenka/attackby(obj/item/W, mob/user)
if(!is_sharp(W) || !sealed)
return
playsound(loc,'sound/effects/sound_effects_canopenlong.ogg', 32)
if(do_after(user, 3 SECONDS, src))
to_chat(user, "<span class='notice'>You unseal \the [src] with a crack of metal.</span>")
unseal()
else
var/mob/living/carbon/H = user
var/obj/item/organ/external/temp = H.organs_by_name[BP_L_HAND]
if (H.hand)
temp = H.organs_by_name[BP_R_HAND]

temp.take_general_damage(rand(8,24))
H.visible_message(
"<span class='danger'>\The [user] cuts himself with \the [W]!</span>",
"<span class='notice'>You cut yourself with \the [W]!</span>"
)

/obj/item/reagent_containers/food/snacks/canned/varenka
name = "varenka"
icon_state = "varenka"
desc = "A can of boiled condensed milk originating from the ICCG."
trash = /obj/item/trash/varenka
filling_color = "#AC6527"
volume = 40
center_of_mass = "x=15;y=9"
bitesize = 8

/obj/item/reagent_containers/food/snacks/canned/varenka/Initialize()
. = ..()
reagents.add_reagent(/datum/reagent/nutriment/condensedmilkboiled, 28)
reagents.add_reagent(/datum/reagent/sugar, 8)
reagents.add_reagent(/datum/reagent/iron, 4)

/obj/item/reagent_containers/food/snacks/canned/varenka/attack_self(var/mob/user)
if(sealed)
to_chat(user, "<span class='notice'>You can't open \the [src] with a bare hands.</span>")
return

/obj/item/reagent_containers/food/snacks/canned/varenka/attackby(obj/item/W, mob/user)
if(!is_sharp(W) || !sealed)
return
playsound(loc,'sound/effects/sound_effects_canopenlong.ogg', 32)
if(do_after(user, 3 SECONDS, src))
to_chat(user, "<span class='notice'>You unseal \the [src] with a crack of metal.</span>")
unseal()
else
var/mob/living/carbon/H = user
var/obj/item/organ/external/temp = H.organs_by_name[BP_L_HAND]
if (H.hand)
temp = H.organs_by_name[BP_R_HAND]

temp.take_general_damage(rand(8,24))
H.visible_message(
"<span class='danger'>\The [user] cuts off himself with \the [W]!</span>",
"<span class='notice'>You cut yourself with \the [W]!</span>"
)
Binary file added proxima/icons/obj/food_canned.dmi
Binary file not shown.
Binary file added proxima/icons/obj/fumo.dmi
Binary file not shown.
Binary file added proxima/icons/obj/trash.dmi
Binary file not shown.
Binary file added sound/effects/sound_effects_canopenlong.ogg
Binary file not shown.

0 comments on commit 1a66f5a

Please sign in to comment.