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

[MIRROR] Job rank and radio channel rework (#8965)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2
2024-09-17 12:24:13 -07:00
committed by GitHub
parent 6159cecfc8
commit 4153768ba1
444 changed files with 3341 additions and 2440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/food/food/drinks.dm
View File

@@ -499,8 +499,8 @@
..()
/obj/item/weapon/reagent_containers/food/drinks/flask
name = "\improper Site Manager's flask"
desc = "A metal flask belonging to the Site Manager"
name = "\improper " + JOB_SITE_MANAGER + "'s flask"
desc = "A metal flask belonging to the " + JOB_SITE_MANAGER
icon_state = "flask"
volume = 60
center_of_mass_x = 17 //CHOMPEdit
@@ -520,7 +520,7 @@
icon_state = "lithiumflask"
/obj/item/weapon/reagent_containers/food/drinks/flask/detflask
name = "\improper Detective's flask"
name = "\improper " + JOB_DETECTIVE + "'s flask"
desc = "A metal flask with a leather band and golden badge belonging to the detective."
icon_state = "detflask"
volume = 60

8
code/modules/food/food/snacks.dm
View File

@@ -1434,7 +1434,7 @@
reagents.add_reagent("protein", 8)
/obj/item/weapon/reagent_containers/food/snacks/clownburger
name = "Clown Burger"
name = JOB_CLOWN + " Burger"
desc = "This tastes funny..."
icon_state = "clownburger"
filling_color = "#FF00FF"
@@ -1446,7 +1446,7 @@
/obj/item/weapon/reagent_containers/food/snacks/mimeburger
name = "Mime Burger"
name = JOB_MIME + " Burger"
desc = "Its taste defies language."
icon_state = "mimeburger"
filling_color = "#FFFFFF"
@@ -2615,7 +2615,7 @@
reagents.add_reagent("water", 5)
/obj/item/weapon/reagent_containers/food/snacks/clownstears
name = "Clown's Tears"
name = JOB_CLOWN + "'s Tears"
desc = "Not very funny."
icon_state = "clownstears"
filling_color = "#C4FBFF"
@@ -5998,7 +5998,7 @@
/obj/item/weapon/reagent_containers/food/snacks/burrito_hell
name = "el diablo"
desc = "Meat and an insane amount of chillis packed in a flour tortilla. The Chaplain will see you now."
desc = "Meat and an insane amount of chillis packed in a flour tortilla. The " + JOB_CHAPLAIN + " will see you now."
icon_state = "hellfireburrito"
bitesize = 4
center_of_mass_x = 16 //CHOMPEdit

16
code/modules/food/kitchen/smartfridge/smartfridge_vr.dm
View File

@@ -2,19 +2,19 @@
* Expert Jobs
*/
/obj/machinery/smartfridge
var/expert_job = "Chef"
var/expert_job = JOB_CHEF
/obj/machinery/smartfridge/seeds
expert_job = "Botanist"
expert_job = JOB_BOTANIST
/obj/machinery/smartfridge/secure/extract
expert_job = "Xenobiologist"
expert_job = JOB_XENOBIOLOGIST
/obj/machinery/smartfridge/secure/medbay
expert_job = "Chemist"
expert_job = JOB_CHEMIST
/obj/machinery/smartfridge/secure/chemistry
expert_job = "Chemist"
expert_job = JOB_CHEMIST
/obj/machinery/smartfridge/secure/virology
expert_job = "Medical Doctor" //Virologist is an alt-title unfortunately
expert_job = JOB_MEDICAL_DOCTOR //Virologist is an alt-title unfortunately
/obj/machinery/smartfridge/drinks
expert_job = "Bartender"
expert_job = JOB_BARTENDER
/*
* Allow thrown items into smartfridges
@@ -42,7 +42,7 @@
/obj/machinery/smartfridge/chemistry/chemvator
name = "\improper Smart Chemavator - Upper"
desc = "A refrigerated storage unit for medicine and chemical storage. Now sporting a fancy system of pulleys to lift bottles up and down."
expert_job = "Chemist"
expert_job = JOB_CHEMIST
var/obj/machinery/smartfridge/chemistry/chemvator/attached
/obj/machinery/smartfridge/chemistry/chemvator/accept_check(var/obj/item/O as obj)