Skip to content

Outreach contamination features #486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Andrew-Fall merged 8 commits into from
Jan 11, 2024
Merged

Outreach contamination features #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
002794a
Updating nutriment temperature values so that solid food doesn't melt…
MistakeNot4892 Dec 17, 2023
aa7da03
Added solid-at-room-temperature cleaner subtype for soap, and did som…
MistakeNot4892 Dec 17, 2023
1cfebb8
Reworks washing machine
NataKilar Jan 9, 2024
3952b32
Adds chemicals for cleaning contaminants
NataKilar Jan 9, 2024
7cf1ba5
Adds recipes for clothes ironing
NataKilar Jan 9, 2024
155de5f
Adds missing flag on chemical hoods
NataKilar Jan 9, 2024
d015dfd
Adjusts contaminant head protection
NataKilar Jan 9, 2024
16ee282
Removes extraneous saved var on clothes
NataKilar Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions code/__defines/chemistry.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,10 @@
#define MAT_SOLVENT_MODERATE 2
#define MAT_SOLVENT_STRONG 3

#define DIRTINESS_STERILE -2
#define DIRTINESS_CLEAN -1
#define DIRTINESS_NEUTRAL 0
#define DIRTINESS_DECONTAMINATE -3
#define DIRTINESS_STERILE -2
#define DIRTINESS_CLEAN -1
#define DIRTINESS_NEUTRAL 0

#define DEFAULT_GAS_ACCELERANT /decl/material/gas/hydrogen
#define DEFAULT_GAS_OXIDIZER /decl/material/gas/oxygen
Expand Down
5 changes: 0 additions & 5 deletions code/__defines/misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,6 @@
#define WRINKLES_WRINKLY 1
#define WRINKLES_NONE 2

//detergent states for clothes
#define SMELL_DEFAULT 0
#define SMELL_CLEAN 1
#define SMELL_STINKY 2

//Shuttle mission stages
#define SHUTTLE_MISSION_PLANNED 1
#define SHUTTLE_MISSION_STARTED 2
Expand Down
20 changes: 13 additions & 7 deletions code/datums/extensions/scent/_scent.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Scent intensity
*****/
/decl/scent_intensity
var/cooldown = 5 MINUTES
var/cooldown = 5 MINUTES
var/intensity = 1

/decl/scent_intensity/proc/PrintMessage(var/mob/user, var/descriptor, var/scent)
Expand Down Expand Up @@ -121,18 +121,24 @@ To add a scent extension to an atom using a reagent's info, where R. is the reag
*****/

/proc/set_scent_by_reagents(var/atom/smelly_atom)
var/decl/material/smelliest = get_smelliest_reagent(smelly_atom.reagents)
if(smelliest)
set_extension(smelly_atom, /datum/extension/scent/custom, smelliest.scent, smelliest.scent_intensity, smelliest.scent_descriptor, smelliest.scent_range)

// Returns the smelliest reagent of a reagent holder.
/proc/get_smelliest_reagent(var/datum/reagents/holder)
var/decl/material/smelliest
var/decl/material/scent_intensity
if(!smelly_atom.reagents || !smelly_atom.reagents.total_volume)
if(!holder || !holder.total_volume)
return
for(var/reagent_type in smelly_atom.reagents.reagent_volumes)
for(var/reagent_type in holder.reagent_volumes)
var/decl/material/R = GET_DECL(reagent_type)
if(!R.scent)
continue
var/decl/scent_intensity/SI = GET_DECL(R.scent_intensity)
var/r_scent_intensity = REAGENT_VOLUME(smelly_atom.reagents, reagent_type) * SI.intensity
var/r_scent_intensity = REAGENT_VOLUME(holder, reagent_type) * SI.intensity
if(r_scent_intensity > scent_intensity)
smelliest = R
scent_intensity = r_scent_intensity
if(smelliest)
set_extension(smelly_atom, /datum/extension/scent/custom, smelliest.scent, smelliest.scent_intensity, smelliest.scent_descriptor, smelliest.scent_range)
scent_intensity = r_scent_intensity

return smelliest
Loading