From cee15792b7edef93bec4db170cbbe9ee49839fd2 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 7 Jul 2020 07:25:10 -0700 Subject: [PATCH 01/13] ok --- code/datums/datacore.dm | 8 ++--- code/modules/client/preferences.dm | 34 +++++++++++++++++++ .../modules/mob/dead/new_player/new_player.dm | 2 +- 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 84ea6b6458..94940b3855 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -81,7 +81,7 @@ if(N.new_character) log_manifest(N.ckey,N.new_character.mind,N.new_character) if(ishuman(N.new_character)) - manifest_inject(N.new_character, N.client) + manifest_inject(N.new_character, N.client, N.client.prefs) CHECK_TICK /datum/datacore/proc/manifest_modify(name, assignment) @@ -197,7 +197,7 @@ return dat -/datum/datacore/proc/manifest_inject(mob/living/carbon/human/H, client/C) +/datum/datacore/proc/manifest_inject(mob/living/carbon/human/H, client/C, datum/preferences/prefs) set waitfor = FALSE var/static/list/show_directions = list(SOUTH, WEST) if(H.mind && (H.mind.assigned_role != H.mind.special_role)) @@ -260,7 +260,7 @@ M.fields["alg_d"] = "No allergies have been detected in this patient." M.fields["cdi"] = "None" M.fields["cdi_d"] = "No diseases have been diagnosed at the moment." - M.fields["notes"] = H.get_trait_string(medical) + M.fields["notes"] = "Trait information as of shift start: [H.get_trait_string(medical)]
[prefs.medical_records]" medical += M //Security Record @@ -270,7 +270,7 @@ S.fields["criminal"] = "None" S.fields["mi_crim"] = list() S.fields["ma_crim"] = list() - S.fields["notes"] = "No notes." + S.fields["notes"] = prefs.security_records || "No notes." security += S //Locked Record diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index aaee5c85f6..738a2c6fd4 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -165,6 +165,11 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/custom_speech_verb = "default" //if your say_mod is to be something other than your races var/custom_tongue = "default" //if your tongue is to be something other than your races + /// Security record note section + var/security_records + /// Medical record note section + var/medical_records + var/list/custom_names = list() var/preferred_ai_core_display = "Blue" var/prefered_security_department = SEC_DEPT_RANDOM @@ -342,6 +347,25 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Preferred Security Department: [prefered_security_department]
" dat += "" + dat += "Security Records
" + if(length_char(security_records) <= 40) + if(!length(security_records)) + dat += "\[...\]" + else + dat += "[security_records]" + else + dat += "[TextPreview(security_records)]...
" + + dat += "Medical Records
" + if(length_char(medical_records) <= 40) + if(!length(medical_records)) + dat += "\[...\]" + else + dat += "[medical_records]" + else + dat += "[TextPreview(medical_records)]...
" + + //Character Appearance if(2) if(path) @@ -1646,6 +1670,16 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(new_age) age = max(min( round(text2num(new_age)), AGE_MAX),AGE_MIN) + if("security_records") + var/rec = stripped_multiline_input(usr, "Set your security record note section. This should be IC!", "Securitty Records", html_decode(security_records), MAX_FLAVOR_LEN, TRUE) + if(!isnull(rec)) + security_records = rec + + if("medical_records") + var/rec = stripped_multiline_input(usr, "Set your medical record note section. This should be IC!", "Securitty Records", html_decode(medical_records), MAX_FLAVOR_LEN, TRUE) + if(!isnull(rec)) + medical_records = rec + if("flavor_text") var/msg = stripped_multiline_input(usr, "Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!", "Flavor Text", html_decode(features["flavor_text"]), MAX_FLAVOR_LEN, TRUE) if(!isnull(msg)) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 6888a6590f..be18f78cfb 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -398,7 +398,7 @@ humanc = character //Let's retypecast the var to be human, if(humanc) //These procs all expect humans - GLOB.data_core.manifest_inject(humanc) + GLOB.data_core.manifest_inject(humanc, client, client.prefs) if(SSshuttle.arrivals) SSshuttle.arrivals.QueueAnnounce(humanc, rank) else From 6634e43be4e60c9f52d18beabebfc0db196cea07 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 7 Jul 2020 07:41:33 -0700 Subject: [PATCH 02/13] fix --- code/modules/client/preferences.dm | 11 +++++------ code/modules/mob/dead/new_player/new_player.dm | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 738a2c6fd4..1b6b149d66 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -345,9 +345,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Custom job preferences:
" dat += "Preferred AI Core Display: [preferred_ai_core_display]
" dat += "Preferred Security Department: [prefered_security_department]
" - dat += "" - - dat += "Security Records
" + dat += "
Records
" + dat += "
Security Records
" if(length_char(security_records) <= 40) if(!length(security_records)) dat += "\[...\]" @@ -356,15 +355,15 @@ GLOBAL_LIST_EMPTY(preferences_datums) else dat += "[TextPreview(security_records)]...
" - dat += "Medical Records
" + dat += "
Medical Records
" if(length_char(medical_records) <= 40) if(!length(medical_records)) - dat += "\[...\]" + dat += "\[...\]
" else dat += "[medical_records]" else dat += "[TextPreview(medical_records)]...
" - + dat += "" //Character Appearance if(2) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index be18f78cfb..d3892cc282 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -398,7 +398,7 @@ humanc = character //Let's retypecast the var to be human, if(humanc) //These procs all expect humans - GLOB.data_core.manifest_inject(humanc, client, client.prefs) + GLOB.data_core.manifest_inject(humanc, humanc.client, humanc.client.prefs) if(SSshuttle.arrivals) SSshuttle.arrivals.QueueAnnounce(humanc, rank) else From 22c3d9fe3ed123c4b7da8cc7b3528092e2208d98 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 7 Jul 2020 21:07:13 -0700 Subject: [PATCH 03/13] ok --- code/modules/client/preferences_savefile.dm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 3a8e7582cb..440ee1fbc1 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -515,6 +515,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car //Quirks S["all_quirks"] >> all_quirks + //Records + S["security_records"] >> security_records + S["medical_records"] >> medical_records + //Citadel code S["feature_genitals_use_skintone"] >> features["genitals_use_skintone"] S["feature_mcolor2"] >> features["mcolor2"] @@ -698,6 +702,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car custom_speech_verb = sanitize_inlist(custom_speech_verb, GLOB.speech_verbs, "default") custom_tongue = sanitize_inlist(custom_tongue, GLOB.roundstart_tongues, "default") + security_records = copytext(security_records, 1, MAX_FLAVOR_LEN) + medical_records = copytext(medical_records, 1, MAX_FLAVOR_LEN) + features["flavor_text"] = copytext(features["flavor_text"], 1, MAX_FLAVOR_LEN) features["silicon_flavor_text"] = copytext(features["silicon_flavor_text"], 1, MAX_FLAVOR_LEN) features["ooc_notes"] = copytext(features["ooc_notes"], 1, MAX_FLAVOR_LEN) @@ -762,6 +769,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["species"] , pref_species.id) WRITE_FILE(S["custom_speech_verb"] , custom_speech_verb) WRITE_FILE(S["custom_tongue"] , custom_tongue) + + // records + WRITE_FILE(S["security_records"] , security_records) + WRITE_FILE(S["medical_records"] , medical_records) + WRITE_FILE(S["feature_mcolor"] , features["mcolor"]) WRITE_FILE(S["feature_lizard_tail"] , features["tail_lizard"]) WRITE_FILE(S["feature_human_tail"] , features["tail_human"]) From 4b301983544c98990d6bfecec3e8c05bc7e726a9 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 11 Jul 2020 15:15:30 -0700 Subject: [PATCH 04/13] Update reagents.dm --- code/modules/integrated_electronics/subtypes/reagents.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm index 663ba9fe16..991c806f43 100644 --- a/code/modules/integrated_electronics/subtypes/reagents.dm +++ b/code/modules/integrated_electronics/subtypes/reagents.dm @@ -514,6 +514,8 @@ outputs = list("volume used" = IC_PINTYPE_NUMBER,"self reference" = IC_PINTYPE_SELFREF,"temperature" = IC_PINTYPE_NUMBER) spawn_flags = IC_SPAWN_RESEARCH var/heater_coefficient = 0.1 + var/max_temp = 1000 + var/min_temp = 2.7 /obj/item/integrated_circuit/reagent/storage/heater/on_data_written() if(get_pin_data(IC_INPUT, 2)) @@ -531,7 +533,7 @@ /obj/item/integrated_circuit/reagent/storage/heater/process() if(power_draw_idle) - var/target_temperature = get_pin_data(IC_INPUT, 1) + var/target_temperature = clamp(get_pin_data(IC_INPUT, 1), min_temp, max_temp) if(reagents.chem_temp > target_temperature) reagents.chem_temp += min(-1, (target_temperature - reagents.chem_temp) * heater_coefficient) if(reagents.chem_temp < target_temperature) @@ -795,4 +797,4 @@ ..() if(istype(loc,/obj/item/integrated_circuit/input/beaker_connector)) var/obj/item/integrated_circuit/input/beaker_connector/current_circuit = loc - current_circuit.push_vol() \ No newline at end of file + current_circuit.push_vol() From eb0e0b6cbdde34d92ad5a2ea8441387aa763ae29 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Sat, 11 Jul 2020 23:18:17 -0500 Subject: [PATCH 05/13] i may not test my shit but at least i can have less line changes motherfucker --- code/modules/surgery/organs/vocal_cords.dm | 34 ---------------------- 1 file changed, 34 deletions(-) diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index 671d31530a..c575c77236 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -254,7 +254,6 @@ var/static/regex/clap_words = regex("clap|applaud") var/static/regex/honk_words = regex("ho+nk") //hooooooonk var/static/regex/multispin_words = regex("like a record baby|right round") - var/static/regex/orgasm_words = regex("cum|orgasm|climax|squirt|heyo") //CITADEL CHANGE var/static/regex/dab_words = regex("dab|mood") //CITADEL CHANGE var/static/regex/snap_words = regex("snap") //CITADEL CHANGE var/static/regex/bwoink_words = regex("what the fuck are you doing|bwoink|hey you got a moment?") //CITADEL CHANGE @@ -572,16 +571,6 @@ var/mob/living/L = V L.SpinAnimation(speed = 10, loops = 5) - //CITADEL CHANGES - //ORGASM - else if((findtext(message, orgasm_words))) - cooldown = COOLDOWN_MEME - for(var/V in listeners) - var/mob/living/carbon/human/H = V - - if(H.client && H.client.prefs && H.client.prefs.cit_toggles & HYPNO) // probably a redundant check but for good measure - H.mob_climax(forced_climax=TRUE) - //DAB else if((findtext(message, dab_words))) cooldown = COOLDOWN_DAMAGE @@ -765,7 +754,6 @@ var/static/regex/forget_words = regex("forget|muddled|awake and forget") var/static/regex/attract_words = regex("come here|come to me|get over here|attract") //phase 2 - var/static/regex/orgasm_words = regex("cum|orgasm|climax|squirt|heyo") //wah, lewd var/static/regex/awoo_words = regex("howl|awoo|bark") var/static/regex/nya_words = regex("nya|meow|mewl") var/static/regex/sleep_words = regex("sleep|slumber|rest") @@ -1092,28 +1080,6 @@ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "You are drawn towards [user]!"), 5) to_chat(user, "You draw [L] towards you!") - - //teir 2 - - /* removed for now - //ORGASM - else if((findtext(message, orgasm_words))) - for(var/V in listeners) - var/mob/living/carbon/human/H = V - var/datum/status_effect/chem/enthrall/E = H.has_status_effect(/datum/status_effect/chem/enthrall) - if(E.phase > 1) - if(E.lewd) // probably a redundant check but for good measure - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "Your [E.enthrallGender] pushes you over the limit, overwhelming your body with pleasure."), 5) - H.mob_climax(forced_climax=TRUE) - H.SetStun(20) - E.resistanceTally = 0 //makes resistance 0, but resets arousal, resistance buildup is faster unaroused (massively so). - E.enthrallTally += power_multiplier - E.cooldown += 6 - else - H.throw_at(get_step_towards(user,H), 3 * power_multiplier, 1 * power_multiplier) - */ - - //awoo else if((findtext(message, awoo_words))) for(var/V in listeners) From f7b476bc6408660a5ff72bf9105541ce7b58ba94 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 11 Jul 2020 21:23:06 -0700 Subject: [PATCH 06/13] Update preferences.dm --- code/modules/client/preferences.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 1b6b149d66..8b4c28a1f4 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1670,12 +1670,12 @@ GLOBAL_LIST_EMPTY(preferences_datums) age = max(min( round(text2num(new_age)), AGE_MAX),AGE_MIN) if("security_records") - var/rec = stripped_multiline_input(usr, "Set your security record note section. This should be IC!", "Securitty Records", html_decode(security_records), MAX_FLAVOR_LEN, TRUE) + var/rec = stripped_multiline_input(usr, "Set your security record note section. This should be IC!", "Security Records", html_decode(security_records), MAX_FLAVOR_LEN, TRUE) if(!isnull(rec)) security_records = rec if("medical_records") - var/rec = stripped_multiline_input(usr, "Set your medical record note section. This should be IC!", "Securitty Records", html_decode(medical_records), MAX_FLAVOR_LEN, TRUE) + var/rec = stripped_multiline_input(usr, "Set your medical record note section. This should be IC!", "Security Records", html_decode(medical_records), MAX_FLAVOR_LEN, TRUE) if(!isnull(rec)) medical_records = rec From 72c5c2234edfea995baec3f6feb2e285247ee023 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 12 Jul 2020 05:15:55 -0700 Subject: [PATCH 07/13] ok --- code/__DEFINES/chemistry/reactions.dm | 4 ++++ code/__HELPERS/cmp.dm | 8 ++++++++ code/modules/reagents/chemistry/holder.dm | 11 ++--------- code/modules/reagents/chemistry/recipes.dm | 3 +++ .../reagents/chemistry/recipes/pyrotechnics.dm | 1 + tgstation.dme | 1 + 6 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 code/__DEFINES/chemistry/reactions.dm diff --git a/code/__DEFINES/chemistry/reactions.dm b/code/__DEFINES/chemistry/reactions.dm new file mode 100644 index 0000000000..0deadcbfe0 --- /dev/null +++ b/code/__DEFINES/chemistry/reactions.dm @@ -0,0 +1,4 @@ +// Reaction priorities, higher makes it checked first. Otherwise, it goes based on reaction temperature requirements. + +#define CHEMICAL_REACTION_PRIORITY_DEFAULT 100 +#define CHEMICAL_REACTION_PRIORITY_SMOKE 1000 diff --git a/code/__HELPERS/cmp.dm b/code/__HELPERS/cmp.dm index dce4d554b7..e0af4dbec0 100644 --- a/code/__HELPERS/cmp.dm +++ b/code/__HELPERS/cmp.dm @@ -125,3 +125,11 @@ GLOBAL_VAR_INIT(cmp_field, "name") if(A.ui_category == B.ui_category) return sorttext(A.name, B.name) return sorttext(A.ui_category, B.ui_category) + +/proc/cmp_chemical_reactions_default(datum/chemical_reaction/A, datum/chemical_reaction/B) + if(A.priority != B.priority) + return A.priority - B.priority + else if(A.is_cold_recipe) + return B.required_temp - A.required_temp //return coldest + else + return A.required_temp - B.required_temp //return hottest diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 4cf50cd072..c2662a8342 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -463,17 +463,10 @@ if(total_matching_reagents == total_required_reagents && total_matching_catalysts == total_required_catalysts && matching_container && matching_other && meets_temp_requirement && can_special_react) possible_reactions += C + sortTim(possible_reactions, /proc/cmp_chemical_reactions_default, FALSE) + if(possible_reactions.len) var/datum/chemical_reaction/selected_reaction = possible_reactions[1] - //select the reaction with the most extreme temperature requirements - for(var/V in possible_reactions) - var/datum/chemical_reaction/competitor = V - if(selected_reaction.is_cold_recipe) - if(competitor.required_temp <= selected_reaction.required_temp) - selected_reaction = competitor - else - if(competitor.required_temp >= selected_reaction.required_temp) //will return with the hotter reacting first. - selected_reaction = competitor var/list/cached_required_reagents = selected_reaction.required_reagents//update reagents list var/list/cached_results = selected_reaction.results//resultant chemical list var/special_react_result = selected_reaction.check_special_react(src) diff --git a/code/modules/reagents/chemistry/recipes.dm b/code/modules/reagents/chemistry/recipes.dm index 98d66a2b1b..7df061c8aa 100644 --- a/code/modules/reagents/chemistry/recipes.dm +++ b/code/modules/reagents/chemistry/recipes.dm @@ -5,6 +5,9 @@ var/list/required_reagents = new/list() var/list/required_catalysts = new/list() + /// Higher is higher priority, determines which order reactions are checked. + var/priority = CHEMICAL_REACTION_PRIORITY_DEFAULT + // Both of these variables are mostly going to be used with slime cores - but if you want to, you can use them for other things var/required_container = null // the exact container path required for the reaction to happen var/required_other = 0 // an integer required for the reaction to happen diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index 1d06aaacde..efa92ef7d6 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -280,6 +280,7 @@ /datum/chemical_reaction/smoke_powder name = "smoke_powder" id = /datum/reagent/smoke_powder + priority = CHEMICAL_REACTION_PRIORITY_SMOKE results = list(/datum/reagent/smoke_powder = 3) required_reagents = list(/datum/reagent/potassium = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/phosphorus = 1) diff --git a/tgstation.dme b/tgstation.dme index 430e8d8db6..b745cb8d0b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -123,6 +123,7 @@ #include "code\__DEFINES\_flags\item_flags.dm" #include "code\__DEFINES\_flags\obj_flags.dm" #include "code\__DEFINES\admin\keybindings.dm" +#include "code\__DEFINES\chemistry\reactions.dm" #include "code\__DEFINES\combat\attack_types.dm" #include "code\__DEFINES\combat\block.dm" #include "code\__DEFINES\combat\block_parry.dm" From 047a36c973e7ec1d8c40c846829aed3f52c7b4a8 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 12 Jul 2020 05:37:07 -0700 Subject: [PATCH 08/13] fix --- code/__HELPERS/cmp.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/__HELPERS/cmp.dm b/code/__HELPERS/cmp.dm index e0af4dbec0..0825e51ae4 100644 --- a/code/__HELPERS/cmp.dm +++ b/code/__HELPERS/cmp.dm @@ -128,8 +128,8 @@ GLOBAL_VAR_INIT(cmp_field, "name") /proc/cmp_chemical_reactions_default(datum/chemical_reaction/A, datum/chemical_reaction/B) if(A.priority != B.priority) - return A.priority - B.priority + return B.priority - A.priority else if(A.is_cold_recipe) - return B.required_temp - A.required_temp //return coldest + return A.required_temp - B.required_temp //return coldest else - return A.required_temp - B.required_temp //return hottest + return B.required_temp - A.required_temp //return hottest From 8f578da6141b246440eb4139488d7cf21535aec6 Mon Sep 17 00:00:00 2001 From: Linzolle Date: Sun, 12 Jul 2020 14:32:19 -0500 Subject: [PATCH 09/13] PLS NO PREF BREAK --- code/modules/vore/eating/bellymodes.dm | 2 +- code/modules/vore/eating/living.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/vore/eating/bellymodes.dm b/code/modules/vore/eating/bellymodes.dm index 77864021b4..291ef8654f 100644 --- a/code/modules/vore/eating/bellymodes.dm +++ b/code/modules/vore/eating/bellymodes.dm @@ -76,7 +76,7 @@ play_sound = pick(pred_digest) //Pref protection! - if (!M.vore_flags & DIGESTABLE || M.vore_flags & ABSORBED) + if (!CHECK_BITFIELD(M.vore_flags, DIGESTABLE) || M.vore_flags & ABSORBED) continue //Person just died in guts! diff --git a/code/modules/vore/eating/living.dm b/code/modules/vore/eating/living.dm index bffb8b2517..1c9bf029ea 100644 --- a/code/modules/vore/eating/living.dm +++ b/code/modules/vore/eating/living.dm @@ -116,7 +116,7 @@ testing("[user] attempted to feed [prey] to [pred], via [lowertext(belly.name)] but it went wrong.") return - if (!prey.vore_flags & DEVOURABLE) + if (!CHECK_BITFIELD(prey.vore_flags, DEVOURABLE)) to_chat(user, "This can't be eaten!") return FALSE From 62bf98de171062a644b49cd012cca54ab9683930 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 12 Jul 2020 14:36:08 -0500 Subject: [PATCH 10/13] Automatic changelog generation for PR #12752 [ci skip] --- html/changelogs/AutoChangeLog-pr-12752.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12752.yml diff --git a/html/changelogs/AutoChangeLog-pr-12752.yml b/html/changelogs/AutoChangeLog-pr-12752.yml new file mode 100644 index 0000000000..238052dda2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12752.yml @@ -0,0 +1,4 @@ +author: "Linzolle" +delete-after: True +changes: + - bugfix: "you can no longer vore and digest people regardless of vore preferences" From 0a9c3f7015a77ccc826534a1101236840031bf54 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 13 Jul 2020 00:10:10 +0000 Subject: [PATCH 11/13] Automatic changelog compile [ci skip] --- html/changelog.html | 11 +++++++++++ html/changelogs/.all_changelog.yml | 6 ++++++ html/changelogs/AutoChangeLog-pr-12693.yml | 5 ----- html/changelogs/AutoChangeLog-pr-12752.yml | 4 ---- 4 files changed, 17 insertions(+), 9 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-12693.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12752.yml diff --git a/html/changelog.html b/html/changelog.html index c0141074c5..be626132cb 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,17 @@ -->
+

13 July 2020

+

Linzolle updated:

+
    +
  • you can no longer vore and digest people regardless of vore preferences
    • +
+

Owai-Seek updated:

+
    +
  • Trashbags can now hold most shoes, and organs.
    • +
  • You can no longer nest nuke disks or hold brains in the trash.
    • +
+

12 July 2020

DeltaFire15 updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 025e1d2685..dd8db8bb5c 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -26344,3 +26344,9 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. people. zeroisthebiggay: - bugfix: a singular stray pixel +2020-07-13: + Linzolle: + - bugfix: you can no longer vore and digest people regardless of vore preferences + Owai-Seek: + - tweak: Trashbags can now hold most shoes, and organs. + - balance: You can no longer nest nuke disks or hold brains in the trash. diff --git a/html/changelogs/AutoChangeLog-pr-12693.yml b/html/changelogs/AutoChangeLog-pr-12693.yml deleted file mode 100644 index ef0ed66c05..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12693.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Owai-Seek" -delete-after: True -changes: - - tweak: "Trashbags can now hold most shoes, and organs." - - balance: "You can no longer nest nuke disks or hold brains in the trash." diff --git a/html/changelogs/AutoChangeLog-pr-12752.yml b/html/changelogs/AutoChangeLog-pr-12752.yml deleted file mode 100644 index 238052dda2..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12752.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Linzolle" -delete-after: True -changes: - - bugfix: "you can no longer vore and digest people regardless of vore preferences" From b486f15fc3d35ecd1d960aa41d3b66ebbd57a1fa Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 13 Jul 2020 11:28:56 -0500 Subject: [PATCH 12/13] Automatic changelog generation for PR #12746 [ci skip] --- html/changelogs/AutoChangeLog-pr-12746.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12746.yml diff --git a/html/changelogs/AutoChangeLog-pr-12746.yml b/html/changelogs/AutoChangeLog-pr-12746.yml new file mode 100644 index 0000000000..a81e5907ad --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12746.yml @@ -0,0 +1,4 @@ +author: "silicons" +delete-after: True +changes: + - rscadd: "chemical reactions now are sorted by priority first and temperature second." From b28b06db1025ee25770095af44fa6aefeb3772d9 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 13 Jul 2020 11:29:27 -0500 Subject: [PATCH 13/13] Automatic changelog generation for PR #12737 [ci skip] --- html/changelogs/AutoChangeLog-pr-12737.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12737.yml diff --git a/html/changelogs/AutoChangeLog-pr-12737.yml b/html/changelogs/AutoChangeLog-pr-12737.yml new file mode 100644 index 0000000000..f2c00ee6da --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12737.yml @@ -0,0 +1,4 @@ +author: "silicons" +delete-after: True +changes: + - bugfix: "circuit reagent heaters are now sanitized for temperature from 2.7 to 1000."