Skip to content

Commit

Permalink
Chemmaster TGUI (#16662)
Browse files Browse the repository at this point in the history
* minimum viable product

* the E in TGUI stands for Enjoyment

* sdaf

* what the boss asked
  • Loading branch information
FluffyGhoster authored Jul 12, 2023
1 parent 799903a commit 63f3f89
Show file tree
Hide file tree
Showing 7 changed files with 545 additions and 200 deletions.
8 changes: 8 additions & 0 deletions code/__defines/chemistry.dm
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,15 @@
#define VOMIT_CHANCE_SCALE 2.5 //Percent change added for every 0.01 percent over the VOMIT limit

#define REAGENTS_FREE_SPACE(R) (R.maximum_volume - R.total_volume)

/**
* Returns the reagent volume in the specified holder
*
* * REAGENT_HOLDER - The holder (container) of the reagent
* * REAGENT_TYPE - The type of reagent you want to know the amount of
*/
#define REAGENT_VOLUME(REAGENT_HOLDER, REAGENT_TYPE) (REAGENT_HOLDER?.reagent_volumes && REAGENT_HOLDER.reagent_volumes[REAGENT_TYPE])

#define REAGENT_DATA(REAGENT_HOLDER, REAGENT_TYPE) (REAGENT_HOLDER?.reagent_data && REAGENT_HOLDER.reagent_data[REAGENT_TYPE])

#define PROCESS_REACTION_ITER 5 //when processing a reaction, iterate this many times
2 changes: 1 addition & 1 deletion code/modules/asset_cache/asset_cache.dm
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ var/list/asset_datums = list()

/datum/asset/spritesheet/chem_master
name = "chemmaster"
cross_round_cachable = TRUE
cross_round_cachable = FALSE
var/list/bottle_sprites = list("bottle-1", "bottle-2", "bottle-3", "bottle-4", "bottle-5", "bottle-6")
var/max_pill_sprite = 20

Expand Down
Loading

0 comments on commit 63f3f89

Please sign in to comment.