mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-09 16:12:17 +00:00
Compare commits
2 Commits
upstream-m
...
upstream-m
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
422d9b7815 | ||
|
|
040c8eb195 |
@@ -10,7 +10,6 @@
|
||||
ui_title = "Premium Drink Dispensary"
|
||||
accept_drinking = 1
|
||||
var/max_cartridges = 90
|
||||
import_job = null
|
||||
|
||||
/obj/machinery/chemical_dispenser/premium/full
|
||||
spawn_cartridges = list(
|
||||
|
||||
@@ -3035,3 +3035,18 @@ includes scars and tattoos
|
||||
body_parts = list(BP_HEAD)
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
hide_body_parts = list(BP_HEAD)
|
||||
|
||||
/datum/sprite_accessory/marking/scug_shelter
|
||||
name = "Catslug Belly Mark, Shelter"
|
||||
icon_state = "scug_shelter"
|
||||
body_parts = list(BP_GROIN)
|
||||
|
||||
/datum/sprite_accessory/marking/scug_gate
|
||||
name = "Catslug Belly Mark, Gate"
|
||||
icon_state = "scug_gate"
|
||||
body_parts = list(BP_GROIN)
|
||||
|
||||
/datum/sprite_accessory/marking/scug_door
|
||||
name = "Catslug Belly Mark, Door"
|
||||
icon_state = "scug_door"
|
||||
body_parts = list(BP_GROIN)
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
var/list/recording_recipe
|
||||
/// Saves all the recipes recorded by the machine
|
||||
var/list/saved_recipes = list()
|
||||
var/import_job = JOB_CHEMIST
|
||||
|
||||
/obj/machinery/chemical_dispenser/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -204,9 +203,6 @@
|
||||
. = TRUE
|
||||
|
||||
if("import_config")
|
||||
if(import_job && (ui.user.mind.assigned_role != import_job))
|
||||
to_chat(ui.user, span_warning("This option is only available to the job: [import_job]"))
|
||||
return FALSE
|
||||
var/list/our_data = params["config"]
|
||||
if(!islist(our_data))
|
||||
return FALSE
|
||||
|
||||
@@ -64,7 +64,6 @@
|
||||
icon_state = "soda_dispenser"
|
||||
ui_title = "Soda Dispenser"
|
||||
accept_drinking = 1
|
||||
import_job = JOB_BARTENDER
|
||||
|
||||
/obj/machinery/chemical_dispenser/bar_soft/full
|
||||
spawn_cartridges = list(
|
||||
@@ -96,7 +95,6 @@
|
||||
icon_state = "booze_dispenser"
|
||||
ui_title = "Booze Dispenser"
|
||||
accept_drinking = 1
|
||||
import_job = JOB_BARTENDER
|
||||
|
||||
/obj/machinery/chemical_dispenser/bar_alc/full
|
||||
spawn_cartridges = list(
|
||||
@@ -129,7 +127,6 @@
|
||||
icon_state = "coffee_dispenser"
|
||||
ui_title = "Coffee Dispenser"
|
||||
accept_drinking = 1
|
||||
import_job = JOB_BARTENDER
|
||||
|
||||
/obj/machinery/chemical_dispenser/bar_coffee/full
|
||||
spawn_cartridges = list(
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
dispense_reagents = list(
|
||||
REAGENT_ID_WATER, REAGENT_ID_SUGAR, REAGENT_ID_ETHANOL, REAGENT_ID_RADIUM, REAGENT_ID_AMMONIA, REAGENT_ID_DIETHYLAMINE, REAGENT_ID_PLANTBGONE, REAGENT_ID_MUTAGEN, REAGENT_ID_CALCIUM
|
||||
)
|
||||
import_job = JOB_XENOBOTANIST
|
||||
|
||||
/obj/machinery/chemical_dispenser/xenoflora/full
|
||||
spawn_cartridges = list(
|
||||
@@ -25,7 +24,6 @@
|
||||
dispense_reagents = list(
|
||||
REAGENT_ID_NUTRIMENT, REAGENT_ID_PROTEIN, REAGENT_ID_MILK
|
||||
)
|
||||
import_job = null
|
||||
|
||||
/obj/machinery/chemical_dispenser/biochemistry/full
|
||||
spawn_cartridges = list(
|
||||
@@ -34,9 +32,6 @@
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/milk
|
||||
)
|
||||
|
||||
/obj/machinery/chemical_dispenser/ert/specialops
|
||||
import_job = null
|
||||
|
||||
/obj/machinery/chemical_dispenser/ert/specialops
|
||||
spawn_cartridges = list(
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/inaprov,
|
||||
@@ -75,4 +70,3 @@
|
||||
name = "chemical dispenser"
|
||||
icon_state = "dispenser_2way"
|
||||
desc = "A mysterious machine which can fabricate many chemicals."
|
||||
import_job = null
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 161 KiB After Width: | Height: | Size: 161 KiB |
@@ -438,7 +438,6 @@
|
||||
icon_state = "kettle"
|
||||
ui_title = "kettle"
|
||||
accept_drinking = 1
|
||||
import_job = null
|
||||
|
||||
/obj/machinery/chemical_dispenser/kettle/full
|
||||
spawn_cartridges = list(
|
||||
|
||||
Reference in New Issue
Block a user