cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Various upports (#10293)

Browse Source 
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-03-04 06:04:25 -07:00
committed by GitHub
parent 73ccdbb648
commit aa0da49558
53 changed files with 633 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/reagents/machinery/dispenser/cartridge_presets.dm
View File

@@ -251,3 +251,7 @@
spawn_reagent = REAGENT_ID_CRYOXADONE
/obj/item/reagent_containers/chem_disp_cartridge/clonexadone
spawn_reagent = REAGENT_ID_CLONEXADONE
/obj/item/reagent_containers/chem_disp_cartridge/gelatin
spawn_reagent = REAGENT_ID_GELATIN
/obj/item/reagent_containers/chem_disp_cartridge/nothing
spawn_reagent = REAGENT_ID_NOTHING

6
code/modules/reagents/machinery/dispenser/cartridge_presets_ch.dm
View File

@@ -9,9 +9,6 @@
/obj/item/reagent_containers/chem_disp_cartridge/doctorsdelight
spawn_reagent = REAGENT_ID_DOCTORSDELIGHT
/obj/item/reagent_containers/chem_disp_cartridge/nothing
spawn_reagent = REAGENT_ID_NOTHING
/obj/item/reagent_containers/chem_disp_cartridge/banana
spawn_reagent = REAGENT_ID_BANANA
@@ -57,9 +54,6 @@
/obj/item/reagent_containers/chem_disp_cartridge/goldschlager
spawn_reagent = REAGENT_ID_GOLDSCHLAGER
/obj/item/reagent_containers/chem_disp_cartridge/gelatin
spawn_reagent = REAGENT_GELATIN
/obj/item/reagent_containers/chem_disp_cartridge/melonliquor
spawn_reagent = REAGENT_ID_MELONLIQUOR

4
code/modules/reagents/reagent_containers/food/drinks/bluespacecoffee.dm → code/modules/reagents/reagent_containers/bluespacecoffee.dm
View File

@@ -3,8 +3,8 @@
desc = "Dreamt up in a strange feverish dream, this coffee cup seems to have been heavily modified with a variety of unlikely parts and wires, and never seems to run out of coffee. Truly the differance between madmen and genius is success."
icon = 'icons/obj/coffee.dmi'
icon_state = "bluespace_coffee"
center_of_mass_x = 15 //CHOMPEdit
center_of_mass_y= 10 //CHOMPEdit
center_of_mass_x = 15
center_of_mass_y = 10
volume = 50
/obj/item/reagent_containers/food/drinks/bluespace_coffee/Initialize()

20
code/modules/reagents/reagents/food_drinks.dm
View File

@@ -5029,3 +5029,23 @@
nutriment_factor = 2
glass_name = REAGENT_ID_KVASS
glass_desc = "A hearty glass of Slavic brew."
/datum/reagent/cinnamonpowder
name = REAGENT_CINNAMONPOWDER
id = REAGENT_ID_CINNAMONPOWDER
description = "Cinnamon, a spice made from tree bark, ground into a fine powder. Probably not a good idea to eat on its own!"
taste_description= "sweet spice with a hint of wood"
color = "#a96622"
glass_name = REAGENT_ID_CINNAMONPOWDER
glass_desc = "A glass of ground cinnamon. Dare you take the challenge?"
/datum/reagent/gelatin
name = REAGENT_GELATIN
id = REAGENT_ID_GELATIN
description = "It doesnt taste like anything."
taste_description = REAGENT_ID_NOTHING
color = "#aaabcf"
glass_name = REAGENT_GELATIN
glass_desc = "It's like flavourless slime."