cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 21:27:01 +01: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 14:04:25 +01:00
committed by GitHub
co-authored by Guti Kashargul
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
modular_chomp/code/modules/clothing/head/jobs.dm
-6
View File
@@ -1,6 +0,0 @@
/obj/item/clothing/head/mailman2
name = "mailman hat"
desc = "A hat used by the mailman to show who's the delivery person here."
icon_state = "mailman2"
icon = 'icons/obj/clothing/hats_ch.dmi'
icon_override = 'icons/mob/head.dmi'
modular_chomp/code/modules/clothing/under/jobs/civilian.dm
-8
View File
@@ -1,8 +0,0 @@
/obj/item/clothing/under/rank/mailman2
name = "mailman's suit"
desc = "A good looking suit for the delivery person!"
icon_state = "mailman2"
icon = 'icons/inventory/uniform/mob_ch.dmi'
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
rolled_sleeves = 0
icon_override = 'icons/inventory/uniform/mob_ch.dmi' //rollsleeves mechanics set by upstream overrides and breaks all clothing in \under\ otherwise.
modular_chomp/code/modules/food/glass/bottle.dm
-29
View File
@@ -1,29 +0,0 @@
/obj/item/reagent_containers/glass/bottle/cakebatter
name = "cake batter bottle"
desc = "A bottle of pre-made cake batter."
icon_state = "bottle-1"
prefill = list(REAGENT_ID_CAKEBATTER = 60)
/obj/item/reagent_containers/glass/bottle/cinnamonpowder
name = "cinnamon powder bottle"
desc = "A bottle with expensive cinnamon powder."
icon_state = "bottle-1"
prefill = list(REAGENT_ID_CINNAMONPOWDER = 30) // Expensive!
/obj/item/reagent_containers/glass/bottle/nothing
name = "empty bottle?"
desc = "An apparently empty bottle."
icon_state = "bottle-1"
prefill = list(REAGENT_ID_NOTHING = 60)
/obj/item/reagent_containers/glass/bottle/gelatin
name = "gelatin bottle"
desc = "A bottle full of gelatin."
icon_state = "bottle-1"
prefill = list(REAGENT_GELATIN = 60)
/obj/item/reagent_containers/glass/bottle/lube
name = "lube bottle"
desc = "A bottle full of lube."
icon_state = "bottle-1"
prefill = list(REAGENT_ID_LUBE = 60)
modular_chomp/code/modules/reagents/reagents/food_drinks.dm
-10
View File
@@ -681,16 +681,6 @@
/////////FOODSTUFF/////////////////////////////
//////////////////////////////////////////////
/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_CINNAMONPOWDER
glass_desc = "A glass of ground cinnamon. Dare you take the challenge?"
//YW drinks
/datum/reagent/drink/lovepotion_yw
name = REAGENT_STRAWBERRYLOVEPOTION