Marked Object" -#define VV_MSG_EDITED "
Var Edited" -#define VV_MSG_DELETED "
Deleted" - /datum/proc/CanProcCall(procname) return TRUE @@ -21,1385 +17,34 @@ return debug_variable(var_name, list(), 0, src) return debug_variable(var_name, vars[var_name], 0, src) +/datum/proc/can_vv_mark() + return TRUE + //please call . = ..() first and append to the result, that way parent items are always at the top and child items are further down //add separaters by doing . += "---" /datum/proc/vv_get_dropdown() . = list() - . += "---" - .["Call Proc"] = "?_src_=vars;[HrefToken()];proc_call=\ref[src]" - .["Mark Object"] = "?_src_=vars;[HrefToken()];mark_object=\ref[src]" - .["Delete"] = "?_src_=vars;[HrefToken()];delete=\ref[src]" - .["Show VV To Player"] = "?_src_=vars;[HrefToken(TRUE)];expose=\ref[src]" + VV_DROPDOWN_OPTION("", "---") + VV_DROPDOWN_OPTION(VV_HK_CALLPROC, "Call Proc") + VV_DROPDOWN_OPTION(VV_HK_MARK, "Mark Object") + VV_DROPDOWN_OPTION(VV_HK_DELETE, "Delete") + VV_DROPDOWN_OPTION(VV_HK_EXPOSE, "Show VV To Player") +// VV_DROPDOWN_OPTION(VV_HK_MODIFY_TRAITS, "Modify Traits") +//This proc is only called if everything topic-wise is verified. The only verifications that should happen here is things like permission checks! +//href_list is a reference, modifying it in these procs WILL change the rest of the proc in topic.dm of admin/view_variables! +//This proc is for "high level" actions like admin heal/set species/etc/etc. The low level debugging things should go in admin/view_variables/topic_basic.dm incase this runtimes. +/datum/proc/vv_do_topic(list/href_list) + if(!usr || !usr.client || !usr.client.holder || !check_rights(NONE)) + return FALSE //This is VV, not to be called by anything else. +// if(href_list[VV_HK_MODIFY_TRAITS]) +// usr.client.holder.modify_traits(src) + return TRUE + +/datum/proc/vv_get_header() + . = list() + if(("name" in vars) && !isatom(src)) + . += "[vars["name"]]
" /datum/proc/on_reagent_change(changetype) return - - -/client/proc/debug_variables(datum/D in world) - set category = "Debug" - set name = "View Variables" - //set src in world - var/static/cookieoffset = rand(1, 9999) //to force cookies to reset after the round. - - if(!usr.client || !usr.client.holder) //The usr vs src abuse in this proc is intentional and must not be changed - to_chat(usr, "You need to be an administrator to access this.") - return - - if(!D) - return - - var/islist = islist(D) - if (!islist && !istype(D)) - return - - var/title = "" - var/refid = "\ref[D]" - var/icon/sprite - var/hash - - var/type = /list - if (!islist) - type = D.type - - if(istype(D, /atom)) - var/atom/AT = D - if(AT.icon && AT.icon_state) - sprite = new /icon(AT.icon, AT.icon_state) - hash = md5(AT.icon) - hash = md5(hash + AT.icon_state) - src << browse_rsc(sprite, "vv[hash].png") - - title = "[D] ([REF(D)]) = [type]" - var/formatted_type = replacetext("[type]", "/", "
<< [dir2text(A.dir) || A.dir] >>" - var/mob/living/M = A - atomsnowflake += {" -
[M.ckey || "No ckey"] / [M.real_name || "No real name"] -
- BRUTE:[M.getBruteLoss()] - FIRE:[M.getFireLoss()] - TOXIN:[M.getToxLoss()] - OXY:[M.getOxyLoss()] - CLONE:[M.getCloneLoss()] - BRAIN:[M.getOrganLoss(ORGAN_SLOT_BRAIN)] - STAMINA:[M.getStaminaLoss()] - "} - if(GLOB.Debug2) - atomsnowflake += {" - HEART:[M.getOrganLoss(ORGAN_SLOT_HEART)] - LIVER:[M.getOrganLoss(ORGAN_SLOT_LIVER)] - LUNGS:[M.getOrganLoss(ORGAN_SLOT_LUNGS)] - EYES:[M.getOrganLoss(ORGAN_SLOT_EYES)] - EARS:[M.getOrganLoss(ORGAN_SLOT_EARS)] - STOMACH:[M.getOrganLoss(ORGAN_SLOT_STOMACH)] - TONGUE:[M.getOrganLoss(ORGAN_SLOT_TONGUE)] - APPENDIX:[M.getOrganLoss(ORGAN_SLOT_APPENDIX)] - "} - atomsnowflake += {" - - "} - else - atomsnowflake += "[D]" - atomsnowflake += "
<< [dir2text(A.dir) || A.dir] >>" - else if("name" in D.vars) - atomsnowflake += "[D]" - else - atomsnowflake += "[formatted_type]" - formatted_type = null - - var/marked - if(holder && holder.marked_datum && holder.marked_datum == D) - marked = VV_MSG_MARKED - var/varedited_line = "" - if(!islist && (D.datum_flags & DF_VAR_EDITED)) - varedited_line = VV_MSG_EDITED - var/deleted_line - if(!islist && D.gc_destroyed) - deleted_line = VV_MSG_DELETED - - var/list/dropdownoptions = list() - if (islist) - dropdownoptions = list( - "---", - "Add Item" = "?_src_=vars;[HrefToken()];listadd=[refid]", - "Remove Nulls" = "?_src_=vars;[HrefToken()];listnulls=[refid]", - "Remove Dupes" = "?_src_=vars;[HrefToken()];listdupes=[refid]", - "Set len" = "?_src_=vars;[HrefToken()];listlen=[refid]", - "Shuffle" = "?_src_=vars;[HrefToken()];listshuffle=[refid]", - "Show VV To Player" = "?_src_=vars;[HrefToken()];expose=[refid]" - ) - else - dropdownoptions = D.vv_get_dropdown() - var/list/dropdownoptions_html = list() - - for (var/name in dropdownoptions) - var/link = dropdownoptions[name] - if (link) - dropdownoptions_html += "" - else - dropdownoptions_html += "" - - var/list/names = list() - if (!islist) - for (var/V in D.vars) - names += V - sleep(1)//For some reason, without this sleep, VVing will cause client to disconnect on certain objects. - - var/list/variable_html = list() - if (islist) - var/list/L = D - for (var/i in 1 to L.len) - var/key = L[i] - var/value - if (IS_NORMAL_LIST(L) && !isnum(key)) - value = L[key] - variable_html += debug_variable(i, value, 0, D) - else - - names = sortList(names) - for (var/V in names) - if(D.can_vv_get(V)) - variable_html += D.vv_get_var(V) - - var/html = {" - - -
-
-
-
-
-
- [formatted_type]
- [marked]
- [varedited_line]
- [deleted_line]
-
- |
-
-
- Refresh
-
-
- |
-
- - E - Edit, tries to determine the variable type by itself.
- C - Change, asks you for the var type first.
- M - Mass modify: changes this variable for all objects of this type.
- -
-
|
-
- Search:
-
- |
- - - | -
-
-
- [variable_html.Join()]
-
- [items.Join()]
")]", "window=[target.name];size=500x200") + usr << browse("
")]", "window=[target.name];size=500x200") onclose(usr, "[target.name]") return TRUE @@ -114,6 +114,9 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code //subtypes with additional hooks for DNA and preferences. /datum/element/flavor_text/carbon + //list of antagonists etcetera that should have nothing to do with people's snowflakes. + var/static/list/i_dont_even_know_who_you_are = typecacheof(list(/datum/antagonist/abductor, /datum/antagonist/ert, + /datum/antagonist/nukeop, /datum/antagonist/wizard)) /datum/element/flavor_text/carbon/Attach(datum/target, text = "", _name = "Flavor Text", _addendum, _max_len = MAX_FLAVOR_LEN, _always_show = FALSE, _edit = TRUE) if(!iscarbon(target)) @@ -122,6 +125,7 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code if(. == ELEMENT_INCOMPATIBLE) return RegisterSignal(target, COMSIG_CARBON_IDENTITY_TRANSFERRED_TO, .proc/update_dna_flavor_text) + RegisterSignal(target, COMSIG_MOB_ANTAG_ON_GAIN, .proc/on_antag_gain) if(ishuman(target)) RegisterSignal(target, COMSIG_HUMAN_PREFS_COPIED_TO, .proc/update_prefs_flavor_text) RegisterSignal(target, COMSIG_HUMAN_HARDSET_DNA, .proc/update_dna_flavor_text) @@ -129,7 +133,7 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code /datum/element/flavor_text/carbon/Detach(mob/living/carbon/C) . = ..() - UnregisterSignal(C, list(COMSIG_CARBON_IDENTITY_TRANSFERRED_TO, COMSIG_HUMAN_PREFS_COPIED_TO, COMSIG_HUMAN_HARDSET_DNA, COMSIG_HUMAN_ON_RANDOMIZE)) + UnregisterSignal(C, list(COMSIG_CARBON_IDENTITY_TRANSFERRED_TO, COMSIG_MOB_ANTAG_ON_GAIN, COMSIG_HUMAN_PREFS_COPIED_TO, COMSIG_HUMAN_HARDSET_DNA, COMSIG_HUMAN_ON_RANDOMIZE)) /datum/element/flavor_text/carbon/proc/update_dna_flavor_text(mob/living/carbon/C) texts_by_atom[C] = C.dna.features["flavor_text"] @@ -144,3 +148,9 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code /datum/element/flavor_text/carbon/proc/unset_flavor(mob/living/carbon/user) texts_by_atom[user] = "" + +/datum/element/flavor_text/carbon/proc/on_antag_gain(mob/living/carbon/user, datum/antagonist/antag) + if(is_type_in_typecache(antag, i_dont_even_know_who_you_are)) + texts_by_atom[user] = "" + if(user.dna) + user.dna.features["flavor_text"] = "" \ No newline at end of file diff --git a/code/datums/elements/ghost_role_eligibility.dm b/code/datums/elements/ghost_role_eligibility.dm index 28567c579b..81fd593d5f 100644 --- a/code/datums/elements/ghost_role_eligibility.dm +++ b/code/datums/elements/ghost_role_eligibility.dm @@ -1,15 +1,21 @@ /datum/element/ghost_role_eligibility - element_flags = ELEMENT_DETACH + element_flags = ELEMENT_DETACH | ELEMENT_BESPOKE + id_arg_index = 3 var/list/timeouts = list() var/list/mob/eligible_mobs = list() + var/penalizing = FALSE + var/free_ghost = FALSE -/datum/element/ghost_role_eligibility/Attach(datum/target,penalize = FALSE) +/datum/element/ghost_role_eligibility/Attach(datum/target,penalize = FALSE,free_ghosting = FALSE, penalize_on_ghost = FALSE) . = ..() if(!ismob(target)) return ELEMENT_INCOMPATIBLE + penalizing = penalize_on_ghost + free_ghost = free_ghosting var/mob/M = target if(!(M in eligible_mobs)) eligible_mobs += M + RegisterSignal(M, COMSIG_MOB_GHOSTIZE, .proc/get_ghost_flags) if(penalize) //penalizing them from making a ghost role / midround antag comeback right away. var/penalty = CONFIG_GET(number/suicide_reenter_round_timer) MINUTES var/roundstart_quit_limit = CONFIG_GET(number/roundstart_suicide_time_limit) MINUTES @@ -32,6 +38,7 @@ . = ..() if(M in eligible_mobs) eligible_mobs -= M + UnregisterSignal(M, COMSIG_MOB_GHOSTIZE) /datum/element/ghost_role_eligibility/proc/get_all_ghost_role_eligible(silent = FALSE) var/list/candidates = list() @@ -56,3 +63,11 @@ if(!silent && M.client) to_chat(M, "You are unable to reenter the round[timeout != CANT_REENTER_ROUND ? " yet. Your ghost role blacklist will expire in [DisplayTimeText(timeout - world.realtime)]" : ""].") return FALSE + +/datum/element/ghost_role_eligibility/proc/get_ghost_flags() + . = 0 + if(!penalizing) + . |= COMPONENT_DO_NOT_PENALIZE_GHOSTING + if(free_ghost) + . |= COMPONENT_FREE_GHOSTING + return . diff --git a/code/datums/elements/mob_holder.dm b/code/datums/elements/mob_holder.dm index 3cd5367f65..220aee4608 100644 --- a/code/datums/elements/mob_holder.dm +++ b/code/datums/elements/mob_holder.dm @@ -76,6 +76,7 @@ lefthand_file = 'icons/mob/animals_held_lh.dmi' icon_state = "" w_class = WEIGHT_CLASS_BULKY + dynamic_hair_suffix = "" var/mob/living/held_mob /obj/item/clothing/head/mob_holder/Initialize(mapload, mob/living/target, worn_state, alt_worn, right_hand, left_hand, slots = NONE) @@ -162,6 +163,11 @@ L.visible_message("[held_mob] escapes from [L]!", "[held_mob] escapes your grip!") release() +/obj/item/clothing/head/mob_holder/mob_can_equip(mob/living/M, mob/living/equipper, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE) + if(!ishuman(M)) //monkeys holding monkeys holding monkeys... + return FALSE + return ..() + /obj/item/clothing/head/mob_holder/assume_air(datum/gas_mixture/env) var/atom/location = loc if(!loc) diff --git a/code/datums/elements/spellcasting.dm b/code/datums/elements/spellcasting.dm new file mode 100644 index 0000000000..a917108bf1 --- /dev/null +++ b/code/datums/elements/spellcasting.dm @@ -0,0 +1,54 @@ +/datum/element/spellcasting //allows to cast certain spells or skip requirements. + element_flags = ELEMENT_BESPOKE|ELEMENT_DETACH + id_arg_index = 2 + var/cast_flags + var/cast_slots + var/list/users_by_item = list() + var/list/stacked_spellcasting_by_user = list() + +/datum/element/spellcasting/Attach(datum/target, _flags, _slots) + . = ..() + if(isitem(target)) + RegisterSignal(target, COMSIG_ITEM_EQUIPPED, .proc/on_equip) + RegisterSignal(target, COMSIG_ITEM_DROPPED, .proc/on_drop) + else if(ismob(target)) + RegisterSignal(target, COMSIG_MOB_SPELL_CAST_CHECK, .proc/on_cast) + stacked_spellcasting_by_user[target]++ + else + return ELEMENT_INCOMPATIBLE + cast_flags = _flags + cast_slots = _slots + +/datum/element/spellcasting/Detach(datum/target) + . = ..() + UnregisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED, COMSIG_MOB_SPELL_CAST_CHECK)) + if(users_by_item[target]) + var/mob/user = users_by_item[target] + stacked_spellcasting_by_user[user]-- + if(!stacked_spellcasting_by_user[user]) + stacked_spellcasting_by_user -= user + UnregisterSignal(user, COMSIG_MOB_SPELL_CAST_CHECK) + else if(ismob(target)) + stacked_spellcasting_by_user[target]-- + if(!stacked_spellcasting_by_user[target]) + stacked_spellcasting_by_user -= target + +/datum/element/spellcasting/proc/on_equip(datum/source, mob/equipper, slot) + if(!(slot in cast_slots)) + return + users_by_item[source] = equipper + if(!stacked_spellcasting_by_user[equipper]) + RegisterSignal(equipper, COMSIG_MOB_SPELL_CAST_CHECK, .proc/on_cast) + stacked_spellcasting_by_user[equipper]++ + +/datum/element/spellcasting/proc/on_drop(datum/source, mob/user) + if(!users_by_item[source]) + return + users_by_item -= source + stacked_spellcasting_by_user[user]-- + if(!stacked_spellcasting_by_user[user]) + stacked_spellcasting_by_user -= user + UnregisterSignal(user, COMSIG_MOB_SPELL_CAST_CHECK) + +/datum/element/spellcasting/proc/on_cast(mob/caster, obj/effect/proc_holder/spell) + return cast_flags diff --git a/code/datums/elements/sword_point.dm b/code/datums/elements/sword_point.dm index 8e1d923e33..d691e22a6a 100644 --- a/code/datums/elements/sword_point.dm +++ b/code/datums/elements/sword_point.dm @@ -15,4 +15,4 @@ /datum/element/sword_point/proc/point(datum/source, atom/target, mob/user, proximity_flag, params) if(!proximity_flag && ismob(target)) - user.visible_message("[user] points the tip of [source] at [target].", "You point the tip of [src] at [target].") + user.visible_message("[user] points the tip of [source] at [target].", "You point the tip of [source] at [target].") diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm index 49942976ce..bafb6fbf0e 100644 --- a/code/datums/looping_sounds/_looping_sound.dm +++ b/code/datums/looping_sounds/_looping_sound.dm @@ -73,7 +73,7 @@ var/list/atoms_cache = output_atoms var/sound/S = sound(soundfile) if(direct) - S.channel = open_sound_channel() + S.channel = SSsounds.random_available_channel() S.volume = volume for(var/i in 1 to atoms_cache.len) var/atom/thing = atoms_cache[i] diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm index ea883c5637..16d61c29f9 100644 --- a/code/datums/martial/boxing.dm +++ b/code/datums/martial/boxing.dm @@ -37,7 +37,7 @@ D.apply_damage(damage, STAMINA, affecting, armor_block) log_combat(A, D, "punched (boxing) ") - if(D.getStaminaLoss() > 100) + if(D.getStaminaLoss() > 100 && istype(D.mind?.martial_art, /datum/martial_art/boxing)) var/knockout_prob = (D.getStaminaLoss() + rand(-15,15))*0.75 if((D.stat != DEAD) && prob(knockout_prob)) D.visible_message("[A] has knocked [D] out with a haymaker!", \ diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 2edfcbfd9e..050743fd36 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -63,11 +63,11 @@ playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, TRUE, -1) if((D.mobility_flags & MOBILITY_STAND)) D.apply_damage(10, BRUTE, BODY_ZONE_HEAD) - D.DefaultCombatKnockdown(50) + D.DefaultCombatKnockdown(50, override_hardstun = 0.01, override_stamdmg = 0) D.adjustStaminaLoss(40) //A cit specific change form the tg port to really punish anyone who tries to stand up D.visible_message("[A] kicks [D] in the head, sending them face first into the floor!", \ "You are kicked in the head by [A], sending you crashing to the floor!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) - if(!(D.mobility_flags & MOBILITY_STAND)) + else if(!(D.mobility_flags & MOBILITY_STAND)) D.apply_damage(5, BRUTE, BODY_ZONE_HEAD) D.adjustStaminaLoss(40) D.drop_all_held_items() diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm index 6ed2245dfd..349efdd342 100644 --- a/code/datums/martial/wrestling.dm +++ b/code/datums/martial/wrestling.dm @@ -18,6 +18,8 @@ var/datum/action/drop/drop = new/datum/action/drop() /datum/martial_art/wrestling/proc/check_streak(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) + if(!can_use(A, D)) + return 0 switch(streak) if("drop") streak = "" @@ -448,6 +450,8 @@ /datum/martial_art/wrestling/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) if(check_streak(A,D)) return 1 + if(!can_use(A,D)) + return ..() if(A.pulling == D || A == D) // don't stun grab yoursel return FALSE A.start_pulling(D) @@ -476,3 +480,19 @@ if(H.get_item_by_slot(SLOT_BELT) == src) style.remove(H) return + +//Subtype of wrestling, reserved for the wrestling belts found in the holodeck +/datum/martial_art/wrestling/holodeck + name = "Holodeck Wrestling" + +/obj/item/storage/belt/champion/wrestling/holodeck + name = "Holodeck Wrestling Belt" + style = new /datum/martial_art/wrestling/holodeck + +//Make sure that moves can only be used on people wearing the holodeck belt +/datum/martial_art/wrestling/holodeck/can_use(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) + if(!(istype(D.mind?.martial_art, /datum/martial_art/wrestling/holodeck))) + return 0 + else + return ..() + diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 57b9a25904..45a0f86a98 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -470,7 +470,6 @@ /datum/objective/steal, /datum/objective/download, /datum/objective/nuclear, - /datum/objective/capture, /datum/objective/absorb, /datum/objective/custom ) diff --git a/code/datums/mutations/_mutations.dm b/code/datums/mutations/_mutations.dm index 2156581cb1..9edaa7605c 100644 --- a/code/datums/mutations/_mutations.dm +++ b/code/datums/mutations/_mutations.dm @@ -31,6 +31,7 @@ //MUT_EXTRA - A mutation that is in the mutations tab, and can be given and taken away through though the DNA console. Has a 0 before it's name in the mutation section of the dna console //MUT_OTHER Cannot be interacted with by players through normal means. I.E. wizards mutate + var/list/conflicts //any mutations that might conflict. put mutation typepath defines in here. make sure to enter it both ways (so that A conflicts with B, and B with A) var/can_chromosome = CHROMOSOME_NONE //can we take chromosomes? 0: CHROMOSOME_NEVER never, 1:CHROMOSOME_NONE yeah, 2: CHROMOSOME_USED no, already have one var/chromosome_name //purely cosmetic var/modified = FALSE //ugly but we really don't want chromosomes and on_acquiring to overlap and apply double the powers @@ -60,6 +61,14 @@ return TRUE if(limb_req && !H.get_bodypart(limb_req)) return TRUE + for(var/M in H.dna.mutations)//check for conflicting powers + var/datum/mutation/human/mewtayshun = M + if(LAZYLEN(mewtayshun.conflicts)) + for(var/cons in mewtayshun.conflicts) + var/datum/mutation/human/conflicter = cons + if(conflicter == type) + to_chat(H, "You feel your genes resisting something.") + return TRUE owner = H dna = H.dna dna.mutations += src diff --git a/code/datums/mutations/actions.dm b/code/datums/mutations/actions.dm index f036b25518..e933e02c15 100644 --- a/code/datums/mutations/actions.dm +++ b/code/datums/mutations/actions.dm @@ -41,7 +41,7 @@ desc = "You can breathe fire at a target." school = "evocation" charge_max = 600 - clothes_req = FALSE + clothes_req = NONE range = 20 base_icon_state = "fireball" action_icon_state = "fireball0" @@ -121,7 +121,7 @@ name = "Convoke Void" //magic the gathering joke here desc = "A rare genome that attracts odd forces not usually observed. May sometimes pull you in randomly." school = "evocation" - clothes_req = FALSE + clothes_req = NONE charge_max = 600 invocation = "DOOOOOOOOOOOOOOOOOOOOM!!!" invocation_type = "shout" @@ -155,7 +155,7 @@ dropmessage = "You let the electricity from your hand dissipate." hand_path = /obj/item/melee/touch_attack/shock charge_max = 400 - clothes_req = FALSE + clothes_req = NONE action_icon_state = "zap" /obj/item/melee/touch_attack/shock @@ -211,7 +211,7 @@ name = "Remember the Scent" desc = "Get a scent off of the item you're currently holding to track it. With an empty hand, you'll track the scent you've remembered." charge_max = 100 - clothes_req = FALSE + clothes_req = NONE range = -1 include_user = TRUE action_icon_state = "nose" @@ -289,8 +289,7 @@ /obj/effect/proc_holder/spell/self/self_amputation name = "Drop a limb" desc = "Concentrate to make a random limb pop right off your body." - clothes_req = FALSE - human_req = FALSE + clothes_req = NONE charge_max = 100 action_icon_state = "autotomy" @@ -327,8 +326,7 @@ /obj/effect/proc_holder/spell/self/lay_genetic_web name = "Lay Web" desc = "Drops a web. Only you will be able to traverse your web easily, making it pretty good for keeping you safe." - clothes_req = FALSE - human_req = FALSE + clothes_req = NONE charge_max = 4 SECONDS //the same time to lay a web action_icon = 'icons/mob/actions/actions_genetic.dmi' action_icon_state = "lay_web" @@ -369,8 +367,7 @@ /obj/effect/proc_holder/spell/self/tongue_spike name = "Launch spike" desc = "Shoot your tongue out in the direction you're facing, embedding it and dealing damage until they remove it." - clothes_req = FALSE - human_req = TRUE + clothes_req = NONE charge_max = 100 action_icon = 'icons/mob/actions/actions_genetic.dmi' action_icon_state = "spike" diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index cc286058f1..ab7fe986fb 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -75,20 +75,21 @@ quality = POSITIVE difficulty = 16 instability = 5 + conflicts = list(GIGANTISM) locked = TRUE // Default intert species for now, so locked from regular pool. /datum/mutation/human/dwarfism/on_acquiring(mob/living/carbon/human/owner) if(..()) return owner.transform = owner.transform.Scale(1, 0.8) - owner.pass_flags |= PASSTABLE + passtable_on(owner, GENETIC_MUTATION) owner.visible_message("[owner] suddenly shrinks!", "Everything around you seems to grow..") /datum/mutation/human/dwarfism/on_losing(mob/living/carbon/human/owner) if(..()) return owner.transform = owner.transform.Scale(1, 1.25) - owner.pass_flags &= ~PASSTABLE + passtable_off(owner, GENETIC_MUTATION) owner.visible_message("[owner] suddenly grows!", "Everything around you seems to shrink..") @@ -333,6 +334,7 @@ desc = "The cells within the subject spread out to cover more area, making the subject appear larger." quality = MINOR_NEGATIVE difficulty = 12 + conflicts = list(DWARFISM) /datum/mutation/human/gigantism/on_acquiring(mob/living/carbon/human/owner) if(..()) diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index c8c4c5d3ce..5d86290f8f 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -18,7 +18,6 @@ name = "Asteroid 1" description = "I-spy with my little eye, something beginning with R." - /datum/map_template/ruin/space/asteroid2 id = "asteroid2" suffix = "asteroid2.dmm" @@ -187,6 +186,7 @@ name = "Abandoned Teleporter" description = "In space construction the teleporter is often the first system brought online. \ This lonely half built teleporter is a sign of a proposed structure that for one reason or another just never got built." + always_place = TRUE /datum/map_template/ruin/space/crashedclownship id = "crashedclownship" @@ -268,6 +268,7 @@ suffix = "whiteshipdock.dmm" name = "Whiteship Dock" description = "An abandoned but functional vessel parked in deep space, ripe for the taking." + always_place = TRUE /datum/map_template/ruin/space/cat_experiments id = "meow" @@ -287,6 +288,7 @@ suffix = "hilbertshoteltestingsite.dmm" name = "Hilbert Research Facility" description = "A research facility of great bluespace discoveries. Long since abandoned, willingly or not..." + /datum/map_template/ruin/space/augmentation id = "augmentationfacility" suffix = "augmentationfacility.dmm" @@ -376,13 +378,13 @@ id = "roid8" suffix = "roid8.dmm" name = "Dead wizard Roid" - description = "Mineral asteroid. Ft. Dead wizard and toilet paradox bag." + description = "Mineral asteroid. Ft. Dead wizard and toilet wand." /datum/map_template/ruin/spacenearstation/roid9 id = "roid9" suffix = "roid9.dmm" name = "Monitoring Roid" - description = "Mineral asteroid. Ft. Station monitoring, syndie toolbox and erp." + description = "Mineral asteroid. Ft. Station monitoring, toolbox and erp." /datum/map_template/ruin/spacenearstation/roid10 id = "roid10" diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index cf10244890..5a69ebe427 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -90,6 +90,7 @@ /datum/status_effect/staggered id = "staggered" blocks_sprint = TRUE + alert_type = null /datum/status_effect/staggered/on_creation(mob/living/new_owner, set_duration) if(isnum(set_duration)) diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index ab2a69e7e9..d1b5240798 100644 --- a/code/datums/traits/neutral.dm +++ b/code/datums/traits/neutral.dm @@ -88,14 +88,6 @@ if(quirk_holder) quirk_holder.remove_client_colour(/datum/client_colour/monochrome) -/datum/quirk/libido - name = "Nymphomania" - desc = "You're always feeling a bit in heat. Also, you get aroused faster than usual." - value = 0 - mob_trait = TRAIT_PERMABONER - gain_text = "You are feeling extra wild." - lose_text = "You don't feel that burning sensation anymore." - /datum/quirk/maso name = "Masochism" desc = "You are aroused by pain." diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index bc034db718..cbad2f7ab0 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -324,6 +324,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Service Hallway" icon_state = "hall_service" +/area/hallway/secondary/civilian + name = "Civilian Wing" + icon_state = "hallFS" + + //Command /area/bridge @@ -1046,7 +1051,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Monastery Garden" icon_state = "hydro" - //Science /area/science @@ -1393,3 +1397,199 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters/fitness/pool name = "Pool Area" icon_state = "pool" + +/area/crew_quarters/dorms/blue + name = "Blue Dorms" + icon_state = "Sleep" + nightshift_public_area = NIGHTSHIFT_AREA_NONE + +/area/crew_quarters/dorms/purple + name = "Purple Dorms" + icon_state = "Sleep" + nightshift_public_area = NIGHTSHIFT_AREA_NONE + +/area/crew_quarters/lounge/jazz + name = "Jazz Lounge" + icon_state = "yellow" + ambientsounds = list('sound/ambience/ambidet1.ogg','sound/ambience/ambidet2.ogg') + nightshift_public_area = NIGHTSHIFT_AREA_RECREATION + + +/area/crew_quarters/fitness/recreation + name = "Recreation Area" + icon_state = "fitness" + nightshift_public_area = NIGHTSHIFT_AREA_RECREATION + +/area/crew_quarters/fitness/cogpool + name = "Pool" + icon_state = "fitness" + clockwork_warp_fail = "Pool's closed." + nightshift_public_area = NIGHTSHIFT_AREA_RECREATION + +/area/crew_quarters/barbershop + name = "Barbershop" + icon_state = "blue" + nightshift_public_area = NIGHTSHIFT_AREA_RECREATION + +/area/crew_quarters/observatory + name = "Observatory" + icon_state = "Sleep" + +//Engineering + +/area/engine/teg_hot + name = "Hot Loop" + icon_state = "red" + +/area/engine/teg_cold + name = "Cold Loop" + icon_state = "blue" + +/area/engine/workshop + name = "Engineering Workshop" + icon_state = "engine" + +/area/security/courtroom/jury + name = "Jury Room" + icon_state = "courtroom" + +/area/quartermaster/miningdock/airless + name = "Mining Dock" + icon_state = "mining" + has_gravity = STANDARD_GRAVITY + valid_territory = FALSE + outdoors = TRUE + ambientsounds = SPACE + blob_allowed = FALSE //While part of the station, what good will it do you? + +/area/quartermaster/miningdock/airless/no_grav + name = "Mining Dock" + icon_state = "mining" + dynamic_lighting = DYNAMIC_LIGHTING_IFSTARLIGHT + power_light = FALSE + power_equip = FALSE + power_environ = FALSE + valid_territory = FALSE + outdoors = TRUE + ambientsounds = SPACE + blob_allowed = FALSE //While part of the station, what good will it do you? + +/area/janitor/aux + name = "Auxiliary Custodial Closet" + icon_state = "janitor" + flags_1 = NONE + +/area/hydroponics/lobby + name = "Hydroponics Lobby" + icon_state = "hydro" + +//Storage + +/area/storage/emergency/generic + name = "Emergency Storage" + icon_state = "emergencystorage" + +//Construction + +/area/construction + name = "Construction Area" + icon_state = "yellow" + ambientsounds = ENGINEERING + +/area/construction/secondary + name = "Secondary Construction Area" + icon_state = "yellow" + +/area/construction/minisat_exterior + name = "Minisat Exterior" + icon_state = "yellow" + +/area/construction/mining/aux_base + name = "Auxiliary Base Construction" + icon_state = "yellow" + +/area/construction/mining/aux_base/closet + name = "Auxiliary Closet Construction" + icon_state = "yellow" + +/area/construction/supplyshuttle + name = "Supply Shuttle" + icon_state = "yellow" + +/area/construction/quarters + name = "Engineers' Quarters" + icon_state = "yellow" + +/area/construction/qmaint + name = "Maintenance" + icon_state = "yellow" + +/area/construction/hallway + name = "Hallway" + icon_state = "yellow" + +/area/construction/solars + name = "Solar Panels" + icon_state = "yellow" + +/area/construction/solarscontrol + name = "Solar Panel Control" + icon_state = "yellow" + +/area/construction/storage + name = "Construction Site Storage" + icon_state = "yellow" + +/area/construction/storage/wing + name = "Storage Wing" + icon_state = "storage_wing" + +//Routers + +/area/router + name = "Router" + icon_state = "yellow" + ambientsounds = ENGINEERING + +/area/router/service + name = "Service Router" + icon_state = "green" + +/area/router/public + name = "Public Router" + icon_state = "yellow" + +/area/router/sec + name = "Security Router" + icon_state = "blue" + +/area/router/medsci + name = "MedSci Router" + icon_state = "yellow" + +/area/router/eva + name = "EVA Router" + icon_state = "yellow" + +/area/router/air + name = "Airbridge Router" + icon_state = "red" + +/area/router/eng + name = "Engineering Router" + icon_state = "yellow" + +/area/router/aux + name = "Routing System" + icon_state = "yellow" + requires_power = FALSE + has_gravity = STANDARD_GRAVITY + always_unpowered = TRUE + dynamic_lighting = DYNAMIC_LIGHTING_IFSTARLIGHT + power_light = FALSE + power_equip = FALSE + power_environ = FALSE + valid_territory = FALSE + outdoors = TRUE + ambientsounds = SPACE + blob_allowed = FALSE //While part of the station, what good will it do you? \ No newline at end of file diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index ac56d6f17c..fe9f2a676e 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -63,6 +63,7 @@ var/xenobiology_compatible = FALSE //Can the Xenobio management console transverse this area by default? var/list/canSmoothWithAreas //typecache to limit the areas that atoms in this area can smooth with + /// Color on minimaps, if it's null (which is default) it makes one at random. var/minimap_color diff --git a/code/game/area/areas/holodeck.dm b/code/game/area/areas/holodeck.dm index 10e3249d64..d32091f98b 100644 --- a/code/game/area/areas/holodeck.dm +++ b/code/game/area/areas/holodeck.dm @@ -99,6 +99,9 @@ /area/holodeck/rec_center/winterwonderland name = "Holodeck - Winter Wonderland" +/area/holodeck/rec_center/wrestlingarena + name = "Holodeck - Wrestling Arena" + // Bad programs /area/holodeck/rec_center/burn diff --git a/code/game/atoms.dm b/code/game/atoms.dm index d8d7ce3d91..266d5b5bb5 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -694,14 +694,64 @@ /atom/vv_get_dropdown() . = ..() - . += "---" - var/turf/curturf = get_turf(src) - if (curturf) - .["Jump to"] = "?_src_=holder;[HrefToken()];adminplayerobservecoodjump=1;X=[curturf.x];Y=[curturf.y];Z=[curturf.z]" - .["Modify Transform"] = "?_src_=vars;[HrefToken()];modtransform=[REF(src)]" - .["Add reagent"] = "?_src_=vars;[HrefToken()];addreagent=[REF(src)]" - .["Trigger EM pulse"] = "?_src_=vars;[HrefToken()];emp=[REF(src)]" - .["Trigger explosion"] = "?_src_=vars;[HrefToken()];explode=[REF(src)]" + VV_DROPDOWN_OPTION("", "---------") + if(!ismovableatom(src)) + var/turf/curturf = get_turf(src) + if(curturf) + . += "" + VV_DROPDOWN_OPTION(VV_HK_MODIFY_TRANSFORM, "Modify Transform") + VV_DROPDOWN_OPTION(VV_HK_ADD_REAGENT, "Add Reagent") + VV_DROPDOWN_OPTION(VV_HK_TRIGGER_EMP, "EMP Pulse") + VV_DROPDOWN_OPTION(VV_HK_TRIGGER_EXPLOSION, "Explosion") + +/atom/vv_do_topic(list/href_list) + . = ..() + if(href_list[VV_HK_ADD_REAGENT] && check_rights(R_VAREDIT)) + if(!reagents) + var/amount = input(usr, "Specify the reagent size of [src]", "Set Reagent Size", 50) as num + if(amount) + create_reagents(amount) + + if(reagents) + var/chosen_id = choose_reagent_id(usr) + if(chosen_id) + var/amount = input(usr, "Choose the amount to add.", "Choose the amount.", reagents.maximum_volume) as num + if(amount) + reagents.add_reagent(chosen_id, amount) + log_admin("[key_name(usr)] has added [amount] units of [chosen_id] to [src]") + message_admins("[key_name(usr)] has added [amount] units of [chosen_id] to [src]") + if(href_list[VV_HK_TRIGGER_EXPLOSION] && check_rights(R_FUN)) + usr.client.cmd_admin_explosion(src) + if(href_list[VV_HK_TRIGGER_EMP] && check_rights(R_FUN)) + usr.client.cmd_admin_emp(src) + if(href_list[VV_HK_MODIFY_TRANSFORM] && check_rights(R_VAREDIT)) + var/result = input(usr, "Choose the transformation to apply","Transform Mod") as null|anything in list("Scale","Translate","Rotate") + var/matrix/M = transform + switch(result) + if("Scale") + var/x = input(usr, "Choose x mod","Transform Mod") as null|num + var/y = input(usr, "Choose y mod","Transform Mod") as null|num + if(!isnull(x) && !isnull(y)) + transform = M.Scale(x,y) + if("Translate") + var/x = input(usr, "Choose x mod","Transform Mod") as null|num + var/y = input(usr, "Choose y mod","Transform Mod") as null|num + if(!isnull(x) && !isnull(y)) + transform = M.Translate(x,y) + if("Rotate") + var/angle = input(usr, "Choose angle to rotate","Transform Mod") as null|num + if(!isnull(angle)) + transform = M.Turn(angle) + if(href_list[VV_HK_AUTO_RENAME] && check_rights(R_VAREDIT)) + var/newname = input(usr, "What do you want to rename this to?", "Automatic Rename") as null|text + if(newname) + vv_auto_rename(newname) + +/atom/vv_get_header() + . = ..() + var/refid = REF(src) + . += "[VV_HREF_TARGETREF(refid, VV_HK_AUTO_RENAME, "[src]")]" + . += "
<< [dir2text(dir) || dir] >>" /atom/proc/drop_location() var/atom/L = loc @@ -709,6 +759,9 @@ return null return L.AllowDrop() ? L : L.drop_location() +/atom/proc/vv_auto_rename(newname) + name = newname + /atom/Entered(atom/movable/AM, atom/oldLoc) SEND_SIGNAL(src, COMSIG_ATOM_ENTERED, AM, oldLoc) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 9f1eb534a9..6089d11d6c 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -39,6 +39,37 @@ var/zfalling = FALSE + /// Either FALSE, [EMISSIVE_BLOCK_GENERIC], or [EMISSIVE_BLOCK_UNIQUE] + var/blocks_emissive = FALSE + ///Internal holder for emissive blocker object, do not use directly use blocks_emissive + var/atom/movable/emissive_blocker/em_block + + +/atom/movable/Initialize(mapload) + . = ..() + switch(blocks_emissive) + if(EMISSIVE_BLOCK_GENERIC) + update_emissive_block() + if(EMISSIVE_BLOCK_UNIQUE) + render_target = ref(src) + em_block = new(src, render_target) + vis_contents += em_block + +/atom/movable/Destroy() + QDEL_NULL(em_block) + return ..() + +/atom/movable/proc/update_emissive_block() + if(blocks_emissive != EMISSIVE_BLOCK_GENERIC) + return + if(length(managed_vis_overlays)) + for(var/a in managed_vis_overlays) + var/obj/effect/overlay/vis/vs + if(vs.plane == EMISSIVE_BLOCKER_PLANE) + SSvis_overlays.remove_vis_overlay(src, list(vs)) + break + SSvis_overlays.add_vis_overlay(src, icon, icon_state, EMISSIVE_BLOCKER_LAYER, EMISSIVE_BLOCKER_PLANE) + /atom/movable/proc/can_zFall(turf/source, levels = 1, turf/target, direction) if(!direction) direction = DOWN @@ -437,9 +468,8 @@ /atom/movable/vv_get_dropdown() . = ..() - . -= "Jump to" - .["Follow"] = "?_src_=holder;[HrefToken()];adminplayerobservefollow=[REF(src)]" - .["Get"] = "?_src_=holder;[HrefToken()];admingetmovable=[REF(src)]" + . += "" + . += "" /atom/movable/proc/ex_check(ex_id) if(!ex_id) diff --git a/code/game/gamemodes/bloodsucker/bloodsucker.dm b/code/game/gamemodes/bloodsucker/bloodsucker.dm index a45e989318..9515d6063c 100644 --- a/code/game/gamemodes/bloodsucker/bloodsucker.dm +++ b/code/game/gamemodes/bloodsucker/bloodsucker.dm @@ -19,7 +19,7 @@ antag_flag = ROLE_BLOODSUCKER false_report_weight = 1 restricted_jobs = list("AI","Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_jobs = list("Chaplain", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") required_players = 20 required_enemies = 2 recommended_enemies = 4 diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 14fe960422..4db8f4129a 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -88,13 +88,13 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th user.underwear = chosen_prof.underwear user.undie_color = chosen_prof.undie_color user.undershirt = chosen_prof.undershirt - user.shirt_color =chosen_prof.shirt_color + user.shirt_color = chosen_prof.shirt_color user.socks = chosen_prof.socks user.socks_color =chosen_prof.socks_color chosen_dna.transfer_identity(user, 1) user.updateappearance(mutcolor_update=1) - user.update_body() + user.update_body(TRUE) user.domutcheck() //vars hackery. not pretty, but better than the alternative. diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index c1baf0a77a..15d7744205 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -351,5 +351,5 @@ Credit where due: /obj/item/paper/servant_primer/oui_getcontent(mob/target) if(!is_servant_of_ratvar(target) && !isobserver(target)) - return "
[stamps]" + return "
[stamps]" return ..() diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm index 4c3ef824b9..b8a5e72d55 100644 --- a/code/game/gamemodes/dynamic/dynamic.dm +++ b/code/game/gamemodes/dynamic/dynamic.dm @@ -54,16 +54,16 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) // Current storyteller var/datum/dynamic_storyteller/storyteller = null // Threat logging vars - /// The "threat cap", threat shouldn't normally go above this and is used in ruleset calculations + /// Target threat level right now. Events and antags will try to keep the round at this level. var/threat_level = 0 - /// Set at the beginning of the round. Spent by the mode to "purchase" rules. - var/threat = 0 + /// The current antag threat. Recalculated every time a ruletype starts or ends. + var/threat = 0 /// Starting threat level, for things that increase it but can bring it back down. var/initial_threat_level = 0 /// Things that cause a rolling threat adjustment to be displayed at roundend. var/list/threat_tallies = list() /// Running information about the threat. Can store text or datum entries. - var/list/threat_log = list() + var/list/threat_log = list() /// As above, but with info such as refunds. var/list/threat_log_verbose = list() /// List of roundstart rules used for selecting the rules. @@ -127,6 +127,8 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) var/only_ruleset_executed = FALSE /// Antags rolled by rules so far, to keep track of and discourage scaling past a certain ratio of crew/antags especially on lowpop. var/antags_rolled = 0 + // Arbitrary threat addition, for fudging purposes. + var/added_threat = 50 /datum/game_mode/dynamic/New() // i have NO IDEA if this is the proper way to do this. ..() @@ -150,11 +152,11 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) GLOB.dynamic_first_midround_delay_max = CONFIG_GET(number/dynamic_first_midround_delay_max)*600 /datum/game_mode/dynamic/admin_panel() - var/list/dat = list("
Game Mode Panel
") + var/list/dat = list("Game Mode Panel
") dat += "Dynamic Mode \[VV\]\[Refresh\]" - dat += "Threat Level: [threat_level]
" + dat += "Target threat: [threat_level]
" - dat += "Threat to Spend: [threat] \[Adjust\] \[View Log\]
" + dat += "Current threat: [threat] \[Adjust\] \[View Log\]
" dat += "
" dat += "Storyteller: [storyteller.name]
" dat += "Parameters: centre = [GLOB.dynamic_curve_centre] ; width = [GLOB.dynamic_curve_width].
" @@ -172,9 +174,9 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) else dat += "none.
" dat += "
Injection Timers: ([storyteller.get_injection_chance(TRUE)]% chance)
" - dat += "Latejoin: [(latejoin_injection_cooldown-world.time)>60*10 ? "[round((latejoin_injection_cooldown-world.time)/60/10,0.1)] minutes" : "[(latejoin_injection_cooldown-world.time)] seconds"] \[Now!\]
" - dat += "Midround: [(midround_injection_cooldown-world.time)>60*10 ? "[round((midround_injection_cooldown-world.time)/60/10,0.1)] minutes" : "[(midround_injection_cooldown-world.time)] seconds"] \[Now!\]
" - dat += "Event: [(event_injection_cooldown-world.time)>60*10 ? "[round((event_injection_cooldown-world.time)/60/10,0.1)] minutes" : "[(event_injection_cooldown-world.time)] seconds"] \[Now!\]
" + dat += "Latejoin: [(latejoin_injection_cooldown-world.time)>60*10 ? "[round((latejoin_injection_cooldown-world.time)/60/10,0.1)] minutes" : "[(latejoin_injection_cooldown-world.time)/10] seconds"] \[Now!\]
" + dat += "Midround: [(midround_injection_cooldown-world.time)>60*10 ? "[round((midround_injection_cooldown-world.time)/60/10,0.1)] minutes" : "[(midround_injection_cooldown-world.time)/10] seconds"] \[Now!\]
" + dat += "Event: [(event_injection_cooldown-world.time)>60*10 ? "[round((event_injection_cooldown-world.time)/60/10,0.1)] minutes" : "[(event_injection_cooldown-world.time)/10] seconds"] \[Now!\]
" usr << browse(dat.Join(), "window=gamemode_panel;size=500x500") /datum/game_mode/dynamic/Topic(href, href_list) @@ -261,11 +263,11 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) . += "Uncharted Space
" . += "Congratulations and thank you for participating in the NT 'Frontier' space program! Your station is actively orbiting a high value system far from the nearest support stations. Little is known about your region of space, and the opportunity to encounter the unknown invites greater glory. You are encouraged to elevate security as necessary to protect Nanotrasen assets." set_security_level(SEC_LEVEL_BLUE) - if(80 to 99) + if(80 to 95) . += "Black Orbit
" . += "As part of a mandatory security protocol, we are required to inform you that as a result of your orbital pattern directly behind an astrological body (oriented from our nearest observatory), your station will be under decreased monitoring and support. It is anticipated that your extreme location and decreased surveillance could pose security risks. Avoid unnecessary risks and attempt to keep your station in one piece." set_security_level(SEC_LEVEL_AMBER) - if(100) + if(96 to 100) . += "Impending Doom
" . += "Your station is somehow in the middle of hostile territory, in clear view of any enemy of the corporation. Your likelihood to survive is low, and station destruction is expected and almost inevitable. Secure any sensitive material and neutralize any enemy you will come across. It is important that you at least try to maintain the station.
" . += "Good luck." @@ -330,7 +332,6 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) peaceful_percentage = round(LORENTZ_CUMULATIVE_DISTRIBUTION(relative_threat, GLOB.dynamic_curve_centre, GLOB.dynamic_curve_width), 0.01)*100 - threat = threat_level SSblackbox.record_feedback("tally","dynamic_threat",threat_level,"Initial threat level") SSblackbox.record_feedback("tally","dynamic_threat",GLOB.dynamic_curve_centre,"Curve centre") SSblackbox.record_feedback("tally","dynamic_threat",GLOB.dynamic_curve_width,"Curve width") @@ -340,9 +341,10 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) storyteller = new GLOB.dynamic_storyteller_type // this is where all the initialization happens storyteller.on_start() SSblackbox.record_feedback("text","dynamic_storyteller",1,storyteller.name) - message_admins("Dynamic mode parameters for the round:") - message_admins("Centre is [GLOB.dynamic_curve_centre], Width is [GLOB.dynamic_curve_width], Forced extended is [GLOB.dynamic_forced_extended ? "Enabled" : "Disabled"], No stacking is [GLOB.dynamic_no_stacking ? "Enabled" : "Disabled"].") - message_admins("Stacking limit is [GLOB.dynamic_stacking_limit], Classic secret is [GLOB.dynamic_classic_secret ? "Enabled" : "Disabled"], High population limit is [GLOB.dynamic_high_pop_limit].") + message_admins("Dynamic mode parameters for the round:\n\ + Storyteller is [storyteller.name].\n\ + Centre is [GLOB.dynamic_curve_centre], Width is [GLOB.dynamic_curve_width], Forced extended is [GLOB.dynamic_forced_extended ? "Enabled" : "Disabled"], No stacking is [GLOB.dynamic_no_stacking ? "Enabled" : "Disabled"].\n\ + Stacking limit is [GLOB.dynamic_stacking_limit], Classic secret is [GLOB.dynamic_classic_secret ? "Enabled" : "Disabled"], High population limit is [GLOB.dynamic_high_pop_limit].") log_game("DYNAMIC: Dynamic mode parameters for the round:") log_game("DYNAMIC: Centre is [GLOB.dynamic_curve_centre], Width is [GLOB.dynamic_curve_width], Forced extended is [GLOB.dynamic_forced_extended ? "Enabled" : "Disabled"], No stacking is [GLOB.dynamic_no_stacking ? "Enabled" : "Disabled"].") log_game("DYNAMIC: Stacking limit is [GLOB.dynamic_stacking_limit], Classic secret is [GLOB.dynamic_classic_secret ? "Enabled" : "Disabled"], High population limit is [GLOB.dynamic_high_pop_limit].") @@ -404,7 +406,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) /datum/game_mode/dynamic/post_setup(report) update_playercounts() - + for(var/datum/dynamic_ruleset/roundstart/rule in executed_rules) addtimer(CALLBACK(src, /datum/game_mode/dynamic/.proc/execute_roundstart_rule, rule), rule.delay) ..() @@ -463,7 +465,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) log_game("DYNAMIC: Additional ruleset picked successfully, now [executed_rules.len] picked. [extra_rulesets_amount] remaining.") else - if(threat >= 50) + if(threat_level >= 50) message_admins("DYNAMIC: Picking first roundstart ruleset failed. You should report this.") log_game("DYNAMIC: Picking first roundstart ruleset failed. drafted_rules.len = [drafted_rules.len] and threat = [threat]/[threat_level]") return FALSE @@ -509,10 +511,9 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) drafted_rules -= starting_rule starting_rule.trim_candidates() - var/added_threat = starting_rule.scale_up(extra_rulesets_amount, threat) + starting_rule.scale_up(extra_rulesets_amount, threat_level) if (starting_rule.pre_execute()) - spend_threat(starting_rule.cost + added_threat) - log_threat("[starting_rule.ruletype] - [starting_rule.name] -[starting_rule.cost + starting_rule.scaled_times * starting_rule.scaling_cost] threat", verbose = TRUE) + log_threat("[starting_rule.ruletype] - [starting_rule.name] [starting_rule.cost + starting_rule.scaled_times * starting_rule.scaling_cost] threat", verbose = TRUE) if(starting_rule.flags & HIGHLANDER_RULESET) highlander_executed = TRUE else if(starting_rule.flags & ONLY_RULESET) @@ -534,8 +535,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) /datum/game_mode/dynamic/proc/execute_roundstart_rule(sent_rule) var/datum/dynamic_ruleset/rule = sent_rule if(rule.execute()) - if(rule.persistent) - current_rules += rule + current_rules += rule SSblackbox.record_feedback("associative","dynamic_rulesets",1,rule.get_blackbox_info()) return TRUE rule.clean_up() // Refund threat, delete teams and so on. @@ -607,8 +607,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) if ((forced || (new_rule.acceptable(current_players[CURRENT_LIVING_PLAYERS].len, threat_level) && new_rule.cost <= threat))) new_rule.trim_candidates() if (new_rule.ready(forced)) - spend_threat(new_rule.cost) - log_threat("[new_rule.ruletype] - [new_rule.name] -[new_rule.cost] threat", verbose = TRUE) + log_threat("[new_rule.ruletype] - [new_rule.name] [new_rule.cost] threat", verbose = TRUE) if (new_rule.execute()) // This should never fail since ready() returned 1 if(new_rule.flags & HIGHLANDER_RULESET) highlander_executed = TRUE @@ -617,8 +616,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) log_game("DYNAMIC: Making a call to a specific ruleset...[new_rule.name]!") SSblackbox.record_feedback("associative","dynamic_rulesets",1,new_rule.get_blackbox_info()) executed_rules += new_rule - if (new_rule.persistent) - current_rules += new_rule + current_rules += new_rule return TRUE else if (forced) log_game("DYNAMIC: The ruleset [new_rule.name] couldn't be executed due to lack of eligible players.") @@ -629,8 +627,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) var/datum/dynamic_ruleset/rule = sent_rule if (rule.execute()) log_game("DYNAMIC: Injected a [rule.ruletype == "latejoin" ? "latejoin" : "midround"] ruleset [rule.name].") - spend_threat(rule.cost) - log_threat("[rule.ruletype] [rule.name] spent [rule.cost]", verbose = TRUE) + log_threat("[rule.ruletype] [rule.name] added [rule.cost]", verbose = TRUE) if(rule.flags & HIGHLANDER_RULESET) highlander_executed = TRUE else if(rule.flags & ONLY_RULESET) @@ -649,7 +646,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) return FALSE /datum/game_mode/dynamic/process() - if (pop_last_updated < world.time - (60 SECONDS)) + if (pop_last_updated < world.time - (120 SECONDS)) pop_last_updated = world.time update_playercounts() @@ -658,9 +655,9 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) current_rules -= rule SSblackbox.record_feedback("tally","dynamic",1,"Rulesets finished") SSblackbox.record_feedback("associative","dynamic_rulesets_finished",1,rule.get_blackbox_info()) - + storyteller.do_process() - + if (midround_injection_cooldown < world.time) if (GLOB.dynamic_forced_extended) return @@ -717,7 +714,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) current_players[CURRENT_OBSERVERS].Add(M) continue current_players[CURRENT_DEAD_PLAYERS].Add(M) // Players who actually died (and admins who ghosted, would be nice to avoid counting them somehow) - + threat = storyteller.calculate_threat() + added_threat /// Removes type from the list /datum/game_mode/dynamic/proc/remove_from_list(list/type_list, type) for(var/I in type_list) @@ -767,25 +764,23 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) SSblackbox.record_feedback("tally","dynamic",1,"Successful latejoin injections") latejoin_injection_cooldown = storyteller.get_latejoin_cooldown() + world.time -/// Refund threat, but no more than threat_level. -/datum/game_mode/dynamic/proc/refund_threat(regain) - threat = min(threat_level,threat+regain) - SSblackbox.record_feedback("tally","dynamic_threat",regain,"Refunded threat") - log_threat("[regain] refunded. Threat is now [threat].", verbose = TRUE) - -/// Generate threat and increase the threat_level if it goes beyond, capped at 100 +/// Increase the threat level. /datum/game_mode/dynamic/proc/create_threat(gain) - threat = min(100, threat+gain) - if(threat > threat_level) - threat_level = threat - SSblackbox.record_feedback("tally","dynamic_threat",gain,"Created threat") - log_threat("[gain] created. Threat is now [threat] and threat level is now [threat_level].", verbose = TRUE) + threat_level += gain + SSblackbox.record_feedback("tally","dynamic_threat",gain,"Created threat level") + log_threat("[gain] created. Threat level is now [threat_level].", verbose = TRUE) -/// Expend threat, can't fall under 0. +/// Decrease the threat level. +/datum/game_mode/dynamic/proc/remove_threat(loss) + threat_level -= loss + SSblackbox.record_feedback("tally","dynamic_threat",loss,"Removed threat level") + log_threat("[loss] removed. Threat level is now [threat_level].", verbose = TRUE) + +/// Fill up more of the threat level. /datum/game_mode/dynamic/proc/spend_threat(cost) - threat = max(threat-cost,0) - SSblackbox.record_feedback("tally","dynamic_threat",cost,"Threat spent") - log_threat("[cost] spent. Threat is now [threat].", verbose = TRUE) + added_threat += cost + SSblackbox.record_feedback("tally","dynamic_threat",cost,"Threat added") + log_threat("[cost] added. Threat is now [threat].", verbose = TRUE) /// Turns the value generated by lorentz distribution to threat value between 0 and 100. /datum/game_mode/dynamic/proc/lorentz_to_threat(x) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets.dm b/code/game/gamemodes/dynamic/dynamic_rulesets.dm index 2f143f7233..eb7da2144f 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets.dm @@ -174,8 +174,8 @@ /// This is called if persistent variable is true everytime SSTicker ticks. /datum/dynamic_ruleset/proc/rule_process() - return - + return TRUE + /// Called on game mode pre_setup for roundstart rulesets. /// Do everything you need to do before job is assigned here. /// IMPORTANT: ASSIGN special_role HERE @@ -201,8 +201,7 @@ /// Runs from gamemode process() if ruleset fails to start, like delayed rulesets not getting valid candidates. /// This one only handles refunding the threat, override in ruleset to clean up the rest. /datum/dynamic_ruleset/proc/clean_up() - mode.refund_threat(cost + (scaled_times * scaling_cost)) - mode.log_threat("[ruletype] [name] refunded [cost + (scaled_times * scaling_cost)]",verbose=TRUE) + return /// Gets weight of the ruleset /// Note that this decreases weight if repeatable is TRUE and repeatable_weight_decrease is higher than 0 diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index f6755057e2..cec6f31e99 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -241,5 +241,5 @@ requirements = list(10,10,10,10,10,10,10,10,10,10) high_population_requirement = 10 repeatable = TRUE - flags = TRAITOR_RULESET + flags = TRAITOR_RULESET | MINOR_RULESET property_weights = list("story_potential" = 2, "trust" = -1, "extended" = 2) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 638d8b53b6..b746100f27 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -106,7 +106,7 @@ if (M.mind && M.mind.assigned_role && (M.mind.assigned_role in enemy_roles) && (!(M in candidates) || (M.mind.assigned_role in restricted_roles))) job_check++ // Checking for "enemies" (such as sec officers). To be counters, they must either not be candidates to that rule, or have a job that restricts them from it - var/threat = round(mode.threat_level/10) + var/threat = CLAMP(round(mode.threat_level/10),1,10) if (job_check < required_enemies[threat]) SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough enemy roles") return FALSE @@ -216,7 +216,7 @@ var/player_count = mode.current_players[CURRENT_LIVING_PLAYERS].len var/antag_count = mode.current_players[CURRENT_LIVING_ANTAGS].len var/max_traitors = round(player_count / 10) + 1 - if ((antag_count < max_traitors) && prob(mode.threat_level))//adding traitors if the antag population is getting low + if ((antag_count < max_traitors) && prob(min(100,mode.threat_level)))//adding traitors if the antag population is getting low return ..() else return FALSE @@ -315,7 +315,6 @@ /datum/dynamic_ruleset/midround/from_ghosts/wizard name = "Wizard" config_tag = "midround_wizard" - persistent = TRUE antag_datum = /datum/antagonist/wizard antag_flag = ROLE_WIZARD enemy_roles = list("Security Officer","Detective","Head of Security", "Captain") @@ -344,7 +343,6 @@ /datum/dynamic_ruleset/midround/from_ghosts/wizard/rule_process() // i can literally copy this from are_special_antags_dead it's great if(isliving(wizard.current) && wizard.current.stat!=DEAD) return FALSE - for(var/obj/item/phylactery/P in GLOB.poi_list) //TODO : IsProperlyDead() if(P.mind && P.mind.has_antag_datum(/datum/antagonist/wizard)) return FALSE @@ -417,7 +415,7 @@ required_candidates = 1 blocking_rules = list(/datum/dynamic_ruleset/roundstart/clockcult) weight = 4 - cost = 10 + cost = 20 requirements = list(101,101,101,80,60,50,50,50,50,50) high_population_requirement = 50 repeatable = TRUE @@ -666,9 +664,6 @@ Mind.transfer_to(Ninja) var/datum/antagonist/ninja/ninjadatum = new ninjadatum.helping_station = pick(TRUE,FALSE) - if(ninjadatum.helping_station) - mode.refund_threat(cost+5) - mode.log_threat("Ninja was helping station; [cost+5] cost refunded.") Mind.add_antag_datum(ninjadatum) if(Ninja.mind != Mind) //something has gone wrong! diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index 2527c83077..a7fc9b86ce 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -802,11 +802,10 @@ /datum/dynamic_ruleset/roundstart/bloodsucker name = "Bloodsuckers" config_tag = "bloodsucker" - persistent = TRUE antag_flag = ROLE_BLOODSUCKER antag_datum = ANTAG_DATUM_BLOODSUCKER minimum_required_age = 0 - protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_roles = list("Chaplain", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") restricted_roles = list("Cyborg", "AI") required_candidates = 1 weight = 2 diff --git a/code/game/gamemodes/dynamic/dynamic_storytellers.dm b/code/game/gamemodes/dynamic/dynamic_storytellers.dm index d25416a4d1..35d5a04488 100644 --- a/code/game/gamemodes/dynamic/dynamic_storytellers.dm +++ b/code/game/gamemodes/dynamic/dynamic_storytellers.dm @@ -5,17 +5,19 @@ var/list/property_weights = list() // See below. var/curve_centre = 0 // As GLOB.dynamic_curve_centre. var/curve_width = 1.8 // As GLOB.dynamic_curve_width. - var/forced_threat_level = -1 + var/forced_threat_level = -1 // As GLOB.dynamic_forced_threat_level /* NO_ASSASSIN: Will not have permanent assassination targets. WAROPS_ALWAYS_ALLOWED: Can always do warops, regardless of threat level. USE_PREF_WEIGHTS: Will use peoples' preferences to change the threat centre. + FORCE_IF_WON: If this mode won the vote, forces it */ var/flags = 0 + var/dead_player_weight = 1 // How much dead players matter for threat calculation var/weight = 3 // Weights for randomly picking storyteller. Multiplied by score after voting. var/event_frequency_lower = 6 MINUTES // How rare events will be, at least. var/event_frequency_upper = 20 MINUTES // How rare events will be, at most. - var/pop_antag_ratio = 5 // How many non-antags there should be vs antags. + var/min_players = -1 // How many players are required for this one to start. var/datum/game_mode/dynamic/mode = null // Cached as soon as it's made, by dynamic. /** @@ -39,6 +41,31 @@ Property weights are: var/event_injection_cooldown_middle = 0.5*(GLOB.dynamic_event_delay_max + GLOB.dynamic_event_delay_min) mode.event_injection_cooldown = (round(CLAMP(EXP_DISTRIBUTION(event_injection_cooldown_middle), GLOB.dynamic_event_delay_min, GLOB.dynamic_event_delay_max)) + world.time) +/datum/dynamic_storyteller/proc/calculate_threat() + var/threat = 0 + for(var/datum/antagonist/A in GLOB.antagonists) + if(A?.owner?.current && A.owner.current.stat != DEAD) + threat += A.threat() + for(var/r in SSevents.running) + var/datum/round_event/R = r + threat += R.threat() + for(var/mob/living/simple_animal/hostile/H in GLOB.mob_living_list) + var/turf/T = get_turf(H) + if(H.stat != DEAD && is_station_level(T.z) && !("Station" in H.faction)) + threat += H.threat() + for(var/obj/item/phylactery/P in GLOB.poi_list) + threat += 25 // can't be giving them too much of a break + for (var/mob/M in mode.current_players[CURRENT_LIVING_PLAYERS]) + if (M?.mind?.assigned_role && M.stat != DEAD) + var/datum/job/J = SSjob.GetJob(M.mind.assigned_role) + if(J) + if(length(M.mind.antag_datums)) + threat += J.GetThreat() + else + threat -= J.GetThreat() + threat += (mode.current_players[CURRENT_DEAD_PLAYERS].len)*dead_player_weight + return round(threat,0.1) + /datum/dynamic_storyteller/proc/do_process() return @@ -83,30 +110,14 @@ Property weights are: if(mode.forced_injection) mode.forced_injection = !dry_run return 100 - var/chance = 0 - // If the high pop override is in effect, we reduce the impact of population on the antag injection chance - var/high_pop_factor = (mode.current_players[CURRENT_LIVING_PLAYERS].len >= GLOB.dynamic_high_pop_limit) - var/max_pop_per_antag = max(pop_antag_ratio,15 - round(mode.threat_level/10) - round(mode.current_players[CURRENT_LIVING_PLAYERS].len/(high_pop_factor ? 10 : 5))) - if (!mode.current_players[CURRENT_LIVING_ANTAGS].len) - chance += 80 // No antags at all? let's boost those odds! - else - var/current_pop_per_antag = mode.current_players[CURRENT_LIVING_PLAYERS].len / mode.current_players[CURRENT_LIVING_ANTAGS].len - if (current_pop_per_antag > max_pop_per_antag) - chance += min(50, 25+10*(current_pop_per_antag-max_pop_per_antag)) - else - chance += 25-10*(max_pop_per_antag-current_pop_per_antag) - if (mode.current_players[CURRENT_DEAD_PLAYERS].len > mode.current_players[CURRENT_LIVING_PLAYERS].len) - chance -= 30 // More than half the crew died? ew, let's calm down on antags - if (mode.threat > 70) - chance += 15 - if (mode.threat < 30) - chance -= 15 - return round(max(0,chance)) + var/threat_perc = mode.threat/mode.threat_level + + return round(max(0,100*(1-(threat_perc*threat_perc*threat_perc)))) /datum/dynamic_storyteller/proc/roundstart_draft() var/list/drafted_rules = list() for (var/datum/dynamic_ruleset/roundstart/rule in mode.roundstart_rules) - if (rule.acceptable(mode.roundstart_pop_ready, mode.threat_level) && mode.threat >= rule.cost) // If we got the population and threat required + if (rule.acceptable(mode.roundstart_pop_ready, mode.threat_level)) // If we got the population and threat required rule.candidates = mode.candidates.Copy() rule.trim_candidates() if (rule.ready() && rule.candidates.len > 0) @@ -114,32 +125,43 @@ Property weights are: for(var/property in property_weights) if(property in rule.property_weights) // just treat it as 0 if it's not in there property_weight += rule.property_weights[property] * property_weights[property] - drafted_rules[rule] = (rule.get_weight() + property_weight)*rule.weight_mult + drafted_rules[rule] = (rule.get_weight() * property_weight)*rule.weight_mult return drafted_rules /datum/dynamic_storyteller/proc/midround_draft() var/list/drafted_rules = list() for (var/datum/dynamic_ruleset/midround/rule in mode.midround_rules) // if there are antags OR the rule is an antag rule, antag_acceptable will be true. - if (rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level) && mode.threat >= rule.cost) + if (rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level)) // Classic secret : only autotraitor/minor roles if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET))) continue rule.trim_candidates() + var/threat_weight = 1 + if(!(rule.flags & MINOR_RULESET)) // makes the traitor rulesets always possible anyway + var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat)) + /* Basically, the closer the cost is to the current threat-level-away-from-threat, the more likely it is to + pick this particular ruleset. + Let's use a toy example: there's 60 threat level and 10 threat spent. + We want to pick a ruleset that's close to that, so we run the below equation, on two rulesets. + Ruleset 1 has 30 cost, ruleset 2 has 5 cost. + When we do the math, ruleset 1's threat_weight is 0.538, and ruleset 2's is 0.238, meaning ruleset 1 + is 2.26 times as likely to be picked, all other things considered. + Of course, we don't want it to GUARANTEE the closest, that's no fun, so it's just a weight. + */ + threat_weight = 1-abs(1-LOGISTIC_FUNCTION(2,0.05,cost_difference,0)) if (rule.ready()) var/property_weight = 0 for(var/property in property_weights) if(property in rule.property_weights) property_weight += rule.property_weights[property] * property_weights[property] - drafted_rules[rule] = (rule.get_weight() + property_weight)*rule.weight_mult - else if(mode.threat < rule.cost) - SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough threat to spend") + drafted_rules[rule] = round(((rule.get_weight() * property_weight)*rule.weight_mult*threat_weight)*1000,1) return drafted_rules /datum/dynamic_storyteller/proc/latejoin_draft(mob/living/carbon/human/newPlayer) var/list/drafted_rules = list() for (var/datum/dynamic_ruleset/latejoin/rule in mode.latejoin_rules) - if (rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level) && mode.threat >= rule.cost) + if (rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level - mode.threat)) // Classic secret : only autotraitor/minor roles if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET))) continue @@ -150,56 +172,56 @@ Property weights are: rule.candidates = list(newPlayer) rule.trim_candidates() + var/threat_weight = 1 + if(!(rule.flags & MINOR_RULESET)) + var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat)) + threat_weight = 1-abs(1-(LOGISTIC_FUNCTION(2,0.05,cost_difference,0))) if (rule.ready()) var/property_weight = 0 for(var/property in property_weights) if(property in rule.property_weights) property_weight += rule.property_weights[property] * property_weights[property] - drafted_rules[rule] = (rule.get_weight() + property_weight)*rule.weight_mult - else if(mode.threat < rule.cost) - SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough threat to spend") + drafted_rules[rule] = round(((rule.get_weight() * property_weight)*rule.weight_mult*threat_weight)*1000,1) return drafted_rules /datum/dynamic_storyteller/proc/event_draft() var/list/drafted_rules = list() for(var/datum/dynamic_ruleset/event/rule in mode.events) - if(rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level) && mode.threat >= rule.cost) + if(rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level) && (mode.threat_level - mode.threat) >= rule.cost) if(rule.ready()) var/property_weight = 0 for(var/property in property_weights) if(property in rule.property_weights) property_weight += rule.property_weights[property] * property_weights[property] drafted_rules[rule] = (rule.get_weight() + property_weight)*rule.weight_mult - else if(mode.threat < rule.cost) - SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough threat to spend") return drafted_rules -/datum/dynamic_storyteller/cowabunga +/datum/dynamic_storyteller/chaotic name = "Chaotic" config_tag = "chaotic" curve_centre = 10 desc = "High chaos modes. Revs, wizard, clock cult. Multiple antags at once. Chaos is kept up all round." - property_weights = list("extended" = -1, "chaos" = 10) + property_weights = list("extended" = -1, "chaos" = 1) weight = 1 event_frequency_lower = 2 MINUTES event_frequency_upper = 10 MINUTES flags = WAROPS_ALWAYS_ALLOWED - pop_antag_ratio = 4 + min_players = 40 var/refund_cooldown = 0 -/datum/dynamic_storyteller/cowabunga/get_midround_cooldown() +/datum/dynamic_storyteller/chaotic/do_process() + if(refund_cooldown < world.time) + mode.create_threat(20) + mode.log_threat("Chaotic storyteller ramped up the chaos. Threat level is now [mode.threat_level].") + refund_cooldown = world.time + 20 MINUTES + +/datum/dynamic_storyteller/chaotic/get_midround_cooldown() return ..() / 4 -/datum/dynamic_storyteller/cowabunga/get_latejoin_cooldown() +/datum/dynamic_storyteller/chaotic/get_latejoin_cooldown() return ..() / 4 -/datum/dynamic_storyteller/cowabunga/do_process() - if(refund_cooldown < world.time) - mode.refund_threat(40) - mode.log_threat("Chaotic storyteller refunded 40 threat. Threat is now [mode.threat].") - refund_cooldown = world.time + 1200 SECONDS - /datum/dynamic_storyteller/team name = "Teamwork" config_tag = "teamwork" @@ -207,6 +229,7 @@ Property weights are: curve_centre = 2 curve_width = 1.5 weight = 2 + min_players = 30 flags = WAROPS_ALWAYS_ALLOWED property_weights = list("valid" = 3, "trust" = 5) @@ -223,23 +246,97 @@ Property weights are: flags = WAROPS_ALWAYS_ALLOWED property_weights = list("valid" = 1, "conversion" = 20) -/datum/dynamic_storyteller/classic +/datum/dynamic_storyteller/random name = "Random" config_tag = "random" - desc = "No special weights attached. Anything goes." - weight = 4 - curve_width = 4 - pop_antag_ratio = 7 - flags = USE_PREF_WEIGHTS + weight = 1 + desc = "No weighting at all; every ruleset has the same chance of happening. Cooldowns vary wildly. As random as it gets." + +/datum/dynamic_storyteller/random/on_start() + ..() + GLOB.dynamic_forced_threat_level = rand(0,100) + +/datum/dynamic_storyteller/random/get_midround_cooldown() + return rand(GLOB.dynamic_midround_delay_min/2, GLOB.dynamic_midround_delay_max*2) + +/datum/dynamic_storyteller/random/get_event_cooldown() + return rand(GLOB.dynamic_event_delay_min/2, GLOB.dynamic_event_delay_max*2) + +/datum/dynamic_storyteller/random/get_latejoin_cooldown() + return rand(GLOB.dynamic_latejoin_delay_min/2, GLOB.dynamic_latejoin_delay_max*2) + +/datum/dynamic_storyteller/random/get_injection_chance() + return 50 // i would do rand(0,100) but it's actually the same thing when you do the math + +/datum/dynamic_storyteller/random/calculate_threat() + return 0 // what IS threat + +/datum/dynamic_storyteller/random/roundstart_draft() + var/list/drafted_rules = list() + for (var/datum/dynamic_ruleset/roundstart/rule in mode.roundstart_rules) + if (rule.acceptable(mode.roundstart_pop_ready, mode.threat_level)) // If we got the population and threat required + rule.candidates = mode.candidates.Copy() + rule.trim_candidates() + if (rule.ready() && rule.candidates.len > 0) + drafted_rules[rule] = 1 + return drafted_rules + +/datum/dynamic_storyteller/random/midround_draft() + var/list/drafted_rules = list() + for (var/datum/dynamic_ruleset/midround/rule in mode.midround_rules) + if (rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level)) + // Classic secret : only autotraitor/minor roles + if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET))) + continue + rule.trim_candidates() + if (rule.ready()) + drafted_rules[rule] = 1 + return drafted_rules + +/datum/dynamic_storyteller/random/latejoin_draft(mob/living/carbon/human/newPlayer) + var/list/drafted_rules = list() + for (var/datum/dynamic_ruleset/latejoin/rule in mode.latejoin_rules) + if (rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level)) + // Classic secret : only autotraitor/minor roles + if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET))) + continue + // No stacking : only one round-ender, unless threat level > stacking_limit. + if (mode.threat_level > GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking) + if(rule.flags & HIGHLANDER_RULESET && mode.highlander_executed) + continue + rule.candidates = list(newPlayer) + rule.trim_candidates() + if (rule.ready()) + drafted_rules[rule] = 1 + return drafted_rules + +/datum/dynamic_storyteller/random/event_draft() + var/list/drafted_rules = list() + for(var/datum/dynamic_ruleset/event/rule in mode.events) + if(rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level)) + if(rule.ready()) + drafted_rules[rule] = 1 + return drafted_rules /datum/dynamic_storyteller/story name = "Story" config_tag = "story" - desc = "Antags with options for loadouts and gimmicks. Traitor, wizard, nukies." + desc = "Antags with options for loadouts and gimmicks. Traitor, wizard, nukies. Has a buildup-climax-falling action threat curve." weight = 2 curve_width = 2 - pop_antag_ratio = 7 - property_weights = list("story_potential" = 10) + property_weights = list("story_potential" = 2) + + +/datum/dynamic_storyteller/story/calculate_threat() + var/current_time = (world.time / SSautotransfer.targettime)*180 + mode.threat_level = round(mode.initial_threat_level*(sin(current_time)+0.25),0.1) + ..() + +/datum/dynamic_storyteller/classic + name = "Classic" + config_tag = "classic" + desc = "No special antagonist weights. Good variety, but not like random. Uses your chaos preference to weight." + flags = USE_PREF_WEIGHTS /datum/dynamic_storyteller/suspicion name = "Intrigue" @@ -247,8 +344,8 @@ Property weights are: desc = "Antags that instill distrust in the crew. Traitors, bloodsuckers." weight = 2 curve_width = 2 - pop_antag_ratio = 7 - property_weights = list("trust" = -5) + dead_player_weight = 2 + property_weights = list("trust" = -3) /datum/dynamic_storyteller/liteextended name = "Calm" @@ -256,10 +353,10 @@ Property weights are: desc = "Low-chaos round. Few antags. No conversion." curve_centre = -3 curve_width = 0.5 - flags = NO_ASSASSIN + flags = NO_ASSASSIN | FORCE_IF_WON weight = 1 - pop_antag_ratio = 10 - property_weights = list("extended" = 1, "chaos" = -1, "valid" = -1, "story_potential" = 1, "conversion" = -10) + dead_player_weight = 5 + property_weights = list("extended" = 2, "chaos" = -1, "valid" = -1, "story_potential" = 1, "conversion" = -10) /datum/dynamic_storyteller/no_antag name = "Extended" @@ -267,7 +364,7 @@ Property weights are: desc = "No standard antags. Threatening events may still spawn." curve_centre = -5 curve_width = 0.5 - flags = NO_ASSASSIN + flags = NO_ASSASSIN | FORCE_IF_WON weight = 1 property_weights = list("extended" = 2) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index b98462d4d4..5affeba6d6 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -323,7 +323,7 @@ var/free_tickets = CONFIG_GET(number/default_antag_tickets) //Max extra tickets you can use var/additional_tickets = CONFIG_GET(number/max_tickets_per_roll) - + var/list/ckey_to_mind = list() //this is admittedly shitcode but I'm webediting var/list/prev_tickets = SSpersistence.antag_rep //cache for hyper-speed in theory. how many tickets someone has stored var/list/curr_tickets = list() //how many tickets someone has for *this* antag roll, so with the free tickets @@ -337,7 +337,7 @@ continue curr_tickets[mind_ckey] = amount ckey_to_mind[mind_ckey] = M //make sure we can look them up after picking - + if(!return_list) //return a single guy var/ckey if(length(curr_tickets)) @@ -584,7 +584,7 @@ //By default nuke just ends the round /datum/game_mode/proc/OnNukeExplosion(off_station) nuke_off_station = off_station - if(off_station < 2) + if(!off_station) station_was_nuked = TRUE //Will end the round on next check. //Additional report section in roundend report diff --git a/code/game/gamemodes/gangs/gang.dm b/code/game/gamemodes/gangs/gang.dm index fa25701ac4..df94d68688 100644 --- a/code/game/gamemodes/gangs/gang.dm +++ b/code/game/gamemodes/gangs/gang.dm @@ -4,6 +4,7 @@ can_coexist_with_others = FALSE job_rank = ROLE_GANG antagpanel_category = "Gang" + threat = 2 var/hud_type = "gangster" var/message_name = "Gangster" var/datum/team/gang/gang @@ -167,6 +168,7 @@ name = "Gang boss" hud_type = "gang_boss" message_name = "Leader" + threat = 10 /datum/antagonist/gang/boss/on_gain() ..() @@ -474,4 +476,4 @@ #undef MAXIMUM_RECALLS -#undef INFLUENCE_INTERVAL \ No newline at end of file +#undef INFLUENCE_INTERVAL diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index b42b41aba4..4497f9faef 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -663,7 +663,7 @@ GLOBAL_LIST_EMPTY(possible_items_special) if(count) target_amount = count update_explanation_text() - +/* /datum/objective/capture name = "capture" var/captured_amount = 0 @@ -709,7 +709,7 @@ GLOBAL_LIST_EMPTY(possible_items_special) if(count) target_amount = count update_explanation_text() - +*/ //Changeling Objectives /datum/objective/absorb diff --git a/code/game/gamemodes/objective_sabotage.dm b/code/game/gamemodes/objective_sabotage.dm index 3cc5bc4aa8..d2cdd2e029 100644 --- a/code/game/gamemodes/objective_sabotage.dm +++ b/code/game/gamemodes/objective_sabotage.dm @@ -77,14 +77,14 @@ /datum/sabotage_objective/processing/supermatter/can_run() return (locate(/obj/machinery/power/supermatter_crystal) in GLOB.machines) - +/* /datum/sabotage_objective/station_integrity name = "Make sure the station is at less than 80% integrity by the end. Smash walls, windows etc. to reach this goal." sabotage_type = "integrity" /datum/sabotage_objective/station_integrity/check_conditions() return 5-(max(SSticker.station_integrity*4,320)/80) - +*/ /datum/sabotage_objective/cloner name = "Destroy all Nanotrasen cloning machines." sabotage_type = "cloner" @@ -98,6 +98,9 @@ special_equipment = list(/obj/item/aiModule/syndicate) excludefromjob = list("Chief Engineer","Research Director","Head of Personnel","Captain","Chief Medical Officer","Head Of Security") +/datum/sabotage_objective/ai_law/can_run() + return length(active_ais()) + /datum/sabotage_objective/ai_law/check_conditions() for (var/i in GLOB.ai_list) var/mob/living/silicon/ai/aiPlayer = i diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index cdae0ea713..42904383bb 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -207,11 +207,14 @@ /obj/machinery/sleeper/ui_data() var/list/data = list() + var/chemical_list = list() + var/blood_percent = 0 + data["occupied"] = occupant ? 1 : 0 data["open"] = state_open - data["efficiency"] = efficiency - data["current_vol"] = reagents.total_volume - data["tot_capacity"] = reagents.maximum_volume + data["blood_levels"] = blood_percent + data["blood_status"] = "Patient either has no blood, or does not require it to function." + data["chemical_list"] = chemical_list data["chems"] = list() for(var/chem in available_chems) @@ -247,10 +250,13 @@ data["occupant"]["fireLoss"] = mob_occupant.getFireLoss() data["occupant"]["cloneLoss"] = mob_occupant.getCloneLoss() data["occupant"]["brainLoss"] = mob_occupant.getOrganLoss(ORGAN_SLOT_BRAIN) - data["occupant"]["reagents"] = list() - if(mob_occupant.reagents && mob_occupant.reagents.reagent_list.len) + + if(mob_occupant.reagents.reagent_list.len) for(var/datum/reagent/R in mob_occupant.reagents.reagent_list) - data["occupant"]["reagents"] += list(list("name" = R.name, "volume" = R.volume)) + chemical_list += list(list("name" = R.name, "volume" = R.volume)) + else + chemical_list = "Patient has no reagents." + data["occupant"]["failing_organs"] = list() var/mob/living/carbon/C = mob_occupant if(C) @@ -259,21 +265,25 @@ continue data["occupant"]["failing_organs"] += list(list("name" = Or.name)) - if(mob_occupant.has_dna()) // Blood-stuff is mostly a copy-paste from the healthscanner. - var/blood_id = C.get_blood_id() - if(blood_id) - data["occupant"]["blood"] = list() // We can start populating this list. - var/blood_type = C.dna.blood_type - if(!(blood_id in GLOB.blood_reagent_types)) // special blood substance - var/datum/reagent/R = GLOB.chemical_reagents_list[blood_id] - if(R) - blood_type = R.name - else - blood_type = blood_id - data["occupant"]["blood"]["maxBloodVolume"] = (BLOOD_VOLUME_NORMAL*C.blood_ratio) - data["occupant"]["blood"]["currentBloodVolume"] = C.blood_volume - data["occupant"]["blood"]["dangerBloodVolume"] = BLOOD_VOLUME_SAFE - data["occupant"]["blood"]["bloodType"] = blood_type + if(istype(C)) //Non-carbons shouldn't be able to enter sleepers, but this is to prevent runtimes if something ever breaks + if(mob_occupant.has_dna()) // Blood-stuff is mostly a copy-paste from the healthscanner. + blood_percent = round((C.blood_volume / BLOOD_VOLUME_NORMAL)*100) + var/blood_id = C.get_blood_id() + var/blood_warning = "" + if(blood_percent < 80) + blood_warning = "Patient has low blood levels." + if(blood_percent < 60) + blood_warning = "Patient has DANGEROUSLY low blood levels." + if(blood_id) + var/blood_type = C.dna.blood_type + if(!(blood_id in GLOB.blood_reagent_types)) // special blood substance + var/datum/reagent/R = GLOB.chemical_reagents_list[blood_id] + if(R) + blood_type = R.name + else + blood_type = blood_id + data["blood_status"] = "Patient has [blood_type] type blood. [blood_warning]" + data["blood_levels"] = blood_percent return data /obj/machinery/sleeper/ui_act(action, params) @@ -309,14 +319,14 @@ if(allowed(usr)) if(!is_operational()) return - reagents.remove_reagent(chem, 10) + reagents.remove_reagent(chem, 1000) return if(chem in available_chems) if(!is_operational()) return /*var/datum/reagent/R = reagents.has_reagent(chem) //For when purity effects are in if(R.purity < 0.8)*/ - reagents.remove_reagent(chem, 10) + reagents.remove_reagent(chem, 1000) else visible_message("Access Denied.") playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 760d48b57b..c8b8e7c9cd 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -240,10 +240,10 @@ to_chat(AI, "[U] holds \a [itemname] up to one of your cameras ...") else to_chat(AI, "[U] holds \a [itemname] up to one of your cameras ...") - AI.last_paper_seen = "
" \
+ "", "window=pdaphoto;size=[picture.psize_x]x[picture.psize_y];can-close=true")
diff --git a/code/game/mecha/combat/honker.dm b/code/game/mecha/combat/honker.dm
index fb1b278919..717884e9a4 100644
--- a/code/game/mecha/combat/honker.dm
+++ b/code/game/mecha/combat/honker.dm
@@ -42,7 +42,9 @@
/obj/mecha/combat/honker/get_stats_html()
var/output = {"
- Tracking beacons data
" var/list/trackerlist = list() diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm index 774e30fa5d..8d6328cf08 100644 --- a/code/game/mecha/mecha_topic.dm +++ b/code/game/mecha/mecha_topic.dm @@ -5,7 +5,9 @@ /obj/mecha/proc/get_stats_html() . = {" -
+
+
+
+
+
+ [formatted_type]
+ [marked_line]
+ [varedited_line]
+ [deleted_line]
+
+ |
+
+
+ Refresh
+
+
+ |
+
+ + E - Edit, tries to determine the variable type by itself.
+ C - Change, asks you for the var type first.
+ M - Mass modify: changes this variable for all objects of this type.
+ +
+
|
+
+ Search:
+
+ |
+ + + | +
+
-
+ [variable_html.Join()]
+
[parts.Join("
")]
"
\ No newline at end of file
+ return "")]
[parts.Join("
")]
"
diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm
index a99e3900b0..2d84ed7c22 100644
--- a/code/modules/antagonists/revenant/revenant_abilities.dm
+++ b/code/modules/antagonists/revenant/revenant_abilities.dm
@@ -117,7 +117,7 @@
tinfoil_check = FALSE
/obj/effect/proc_holder/spell/aoe_turf/revenant
- clothes_req = 0
+ clothes_req = NONE
action_icon = 'icons/mob/actions/actions_revenant.dmi'
action_background_icon_state = "bg_revenant"
panel = "Revenant Abilities (Locked)"
@@ -135,7 +135,7 @@
else
name = "[initial(name)] ([cast_amount]E)"
-/obj/effect/proc_holder/spell/aoe_turf/revenant/can_cast(mob/living/simple_animal/revenant/user = usr)
+/obj/effect/proc_holder/spell/aoe_turf/revenant/can_cast(mob/living/simple_animal/revenant/user = usr, skipcharge = FALSE, silent = FALSE)
if(charge_counter < charge_max)
return FALSE
if(!istype(user)) //Badmins, no. Badmins, don't do it.
diff --git a/code/modules/antagonists/revenant/revenant_antag.dm b/code/modules/antagonists/revenant/revenant_antag.dm
index 8d99edf26e..46c1176533 100644
--- a/code/modules/antagonists/revenant/revenant_antag.dm
+++ b/code/modules/antagonists/revenant/revenant_antag.dm
@@ -2,6 +2,7 @@
name = "Revenant"
show_in_antagpanel = FALSE
show_name_in_check_antagonists = TRUE
+ threat = 5
/datum/antagonist/revenant/greet()
owner.announce_objectives()
diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm
index c4190d8cd9..4f308cc4c0 100644
--- a/code/modules/antagonists/revolution/revolution.dm
+++ b/code/modules/antagonists/revolution/revolution.dm
@@ -7,6 +7,7 @@
antagpanel_category = "Revolution"
job_rank = ROLE_REV
antag_moodlet = /datum/mood_event/revolution
+ threat = 2
var/hud_type = "rev"
var/datum/team/revolution/rev_team
@@ -148,6 +149,7 @@
/datum/antagonist/rev/head
name = "Head Revolutionary"
hud_type = "rev_head"
+ threat = 8
var/remove_clumsy = FALSE
var/give_flash = FALSE
var/give_hud = TRUE
diff --git a/code/modules/antagonists/santa/santa.dm b/code/modules/antagonists/santa/santa.dm
index bf42188cf6..f58a21ba42 100644
--- a/code/modules/antagonists/santa/santa.dm
+++ b/code/modules/antagonists/santa/santa.dm
@@ -18,7 +18,7 @@
owner.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/presents)
var/obj/effect/proc_holder/spell/targeted/area_teleport/teleport/telespell = new
- telespell.clothes_req = 0 //santa robes aren't actually magical.
+ telespell.clothes_req = NONE //santa robes aren't actually magical.
owner.AddSpell(telespell) //does the station have chimneys? WHO KNOWS!
/datum/antagonist/santa/proc/give_objective()
diff --git a/code/modules/antagonists/slaughter/slaughter_antag.dm b/code/modules/antagonists/slaughter/slaughter_antag.dm
index a018603cf1..04f7167fa5 100644
--- a/code/modules/antagonists/slaughter/slaughter_antag.dm
+++ b/code/modules/antagonists/slaughter/slaughter_antag.dm
@@ -3,6 +3,7 @@
show_name_in_check_antagonists = TRUE
var/objective_verb = "Kill"
var/datum/mind/summoner
+ threat = 10
job_rank = ROLE_ALIEN
show_in_antagpanel = FALSE
@@ -28,4 +29,4 @@
/datum/antagonist/slaughter/laughter
name = "Laughter demon"
- objective_verb = "Hug and Tickle"
\ No newline at end of file
+ objective_verb = "Hug and Tickle"
diff --git a/code/modules/antagonists/survivalist/survivalist.dm b/code/modules/antagonists/survivalist/survivalist.dm
index 0b66e8cb23..04ad53f65b 100644
--- a/code/modules/antagonists/survivalist/survivalist.dm
+++ b/code/modules/antagonists/survivalist/survivalist.dm
@@ -3,6 +3,7 @@
show_in_antagpanel = FALSE
show_name_in_check_antagonists = TRUE
blacklisted_quirks = list(/datum/quirk/nonviolent) // mutes are allowed
+ threat = 1
var/greet_message = ""
/datum/antagonist/survivalist/proc/forge_objectives()
diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm
index 292fb10202..724c4e6f76 100644
--- a/code/modules/antagonists/swarmer/swarmer.dm
+++ b/code/modules/antagonists/swarmer/swarmer.dm
@@ -70,6 +70,7 @@
icon_living = "swarmer"
icon_dead = "swarmer_unactivated"
icon_gib = null
+ threat = 0.5
wander = 0
harm_intent_damage = 5
minbodytemp = 0
diff --git a/code/modules/antagonists/traitor/classes/ai.dm b/code/modules/antagonists/traitor/classes/ai.dm
index fac1efeb49..eaa1137d51 100644
--- a/code/modules/antagonists/traitor/classes/ai.dm
+++ b/code/modules/antagonists/traitor/classes/ai.dm
@@ -1,5 +1,6 @@
/datum/traitor_class/ai // this one is special, so has no weight
name = "Malfunctioning AI"
+ threat = 20
/datum/traitor_class/ai/forge_objectives(datum/antagonist/traitor/T)
var/objective_count = 0
diff --git a/code/modules/antagonists/traitor/classes/assassin.dm b/code/modules/antagonists/traitor/classes/assassin.dm
index 0c1d950f57..6b709aac59 100644
--- a/code/modules/antagonists/traitor/classes/assassin.dm
+++ b/code/modules/antagonists/traitor/classes/assassin.dm
@@ -3,7 +3,7 @@
employer = "Donk Corporation"
weight = 0
chaos = 1
- cost = 2
+ threat = 2
/datum/traitor_class/human/assassin/forge_single_objective(datum/antagonist/traitor/T)
.=1
diff --git a/code/modules/antagonists/traitor/classes/hijack.dm b/code/modules/antagonists/traitor/classes/hijack.dm
index e89eda1dcf..59e0591600 100644
--- a/code/modules/antagonists/traitor/classes/hijack.dm
+++ b/code/modules/antagonists/traitor/classes/hijack.dm
@@ -3,7 +3,7 @@
employer = "The Gorlex Marauders"
weight = 3
chaos = 5
- cost = 5
+ threat = 3
uplink_filters = list(/datum/uplink_item/stealthy_weapons/romerol_kit)
/datum/traitor_class/human/hijack/forge_objectives(datum/antagonist/traitor/T)
diff --git a/code/modules/antagonists/traitor/classes/human.dm b/code/modules/antagonists/traitor/classes/human.dm
index 4e096390c0..30aa11e39d 100644
--- a/code/modules/antagonists/traitor/classes/human.dm
+++ b/code/modules/antagonists/traitor/classes/human.dm
@@ -34,7 +34,7 @@
if(is_dynamic)
var/threat_spent = CONFIG_GET(number/dynamic_assassinate_cost)
mode.spend_threat(threat_spent)
- mode.log_threat("[T.owner.name] spent [threat_spent] on an assassination target.")
+ mode.log_threat("[T.owner.name] added [threat_spent] on an assassination target.")
var/list/active_ais = active_ais()
if(active_ais.len && prob(100/GLOB.joined_player_list.len))
var/datum/objective/destroy/destroy_objective = new
diff --git a/code/modules/antagonists/traitor/classes/martyr.dm b/code/modules/antagonists/traitor/classes/martyr.dm
index 78f8bf9b0c..72f9ac86fc 100644
--- a/code/modules/antagonists/traitor/classes/martyr.dm
+++ b/code/modules/antagonists/traitor/classes/martyr.dm
@@ -3,7 +3,7 @@
employer = "The Tiger Cooperative"
weight = 2
chaos = 5
- cost = 5
+ threat = 5
uplink_filters = list(/datum/uplink_item/stealthy_weapons/romerol_kit,/datum/uplink_item/bundles_TC/contract_kit)
/datum/traitor_class/human/martyr/forge_objectives(datum/antagonist/traitor/T)
diff --git a/code/modules/antagonists/traitor/classes/traitor_class.dm b/code/modules/antagonists/traitor/classes/traitor_class.dm
index 3df9dec929..012a269572 100644
--- a/code/modules/antagonists/traitor/classes/traitor_class.dm
+++ b/code/modules/antagonists/traitor/classes/traitor_class.dm
@@ -5,7 +5,7 @@ GLOBAL_LIST_EMPTY(traitor_classes)
var/employer = "The Syndicate"
var/weight = 0
var/chaos = 0
- var/cost = 0
+ var/threat = 0
var/TC = 20
var/list/uplink_filters
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index a9dee81a6c..338d135b4c 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -12,6 +12,7 @@
var/datum/traitor_class/traitor_kind
var/datum/contractor_hub/contractor_hub
hijack_speed = 0.5 //10 seconds per hijack stage by default
+ threat = 5
/datum/antagonist/traitor/New()
..()
@@ -21,11 +22,6 @@
/datum/antagonist/traitor/proc/set_traitor_kind(var/kind)
traitor_kind = GLOB.traitor_classes[kind]
- if(istype(SSticker.mode, /datum/game_mode/dynamic))
- var/datum/game_mode/dynamic/mode = SSticker.mode
- if(traitor_kind.cost)
- mode.spend_threat(traitor_kind.cost)
- mode.log_threat("[traitor_kind.cost] was spent due to [owner.name] being a [traitor_kind.name].")
/datum/antagonist/traitor/on_gain()
if(owner.current && isAI(owner.current))
@@ -38,7 +34,7 @@
var/list/weights = list()
for(var/C in GLOB.traitor_classes)
var/datum/traitor_class/class = GLOB.traitor_classes[C]
- var/weight = (1.5*class.weight)/(0.5+NUM_E**(-chaos_weight*class.chaos)) // just a logistic function
+ var/weight = LOGISTIC_FUNCTION(1.5*class.weight,chaos_weight,class.chaos,0)
weights[C] = weight
var/choice = pickweightAllowZero(weights)
if(!choice)
@@ -100,6 +96,13 @@
equip(silent)
owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/tatoralert.ogg', 100, FALSE, pressure_affected = FALSE)
+/datum/antagonist/traitor/antag_panel_objectives()
+ . = ..()
+ if(contractor_hub?.assigned_targets && length(contractor_hub.assigned_targets))
+ . += "Contract Targets:")]
" + for(var/datum/mind/M in contractor_hub.assigned_targets) + . += " - [key_name(M, FALSE, TRUE)]
" + /datum/antagonist/traitor/apply_innate_effects(mob/living/mob_override) . = ..() update_traitor_icons_added() @@ -294,3 +297,6 @@ /datum/antagonist/traitor/is_gamemode_hero() return SSticker.mode.name == "traitor" + +/datum/antagonist/traitor/threat() + return (..())+traitor_kind.threat diff --git a/code/modules/antagonists/traitor/syndicate_contract.dm b/code/modules/antagonists/traitor/syndicate_contract.dm index 20d07556c1..daa9127591 100644 --- a/code/modules/antagonists/traitor/syndicate_contract.dm +++ b/code/modules/antagonists/traitor/syndicate_contract.dm @@ -87,9 +87,9 @@ As is policy we've taken a portion of the station's funds to offset the overall cost.", null, "attention", null, "Nanotrasen Asset Protection") /datum/syndicate_contract/proc/handleVictimExperience(var/mob/living/M) // They're off to holding - handle the return timer and give some text about what's going on. - addtimer(CALLBACK(src, .proc/returnVictim, M), (60 * 10) * 4) // Ship 'em back - dead or alive... 4 minutes wait. + addtimer(CALLBACK(src, .proc/returnVictim, M), 4 MINUTES) // Ship 'em back - dead or alive... 4 minutes wait. if(M.stat != DEAD) //Even if they weren't the target, we're still treating them the same. - M.reagents.add_reagent(/datum/reagent/medicine/omnizine, 20) // Heal them up - gets them out of crit/soft crit. + M.reagents.add_reagent(/datum/reagent/medicine/regen_jelly, 20) // Heal them up - gets them out of crit/soft crit. -- now 100% toxinlover friendly!! M.flash_act() M.confused += 10 M.blur_eyes(5) @@ -147,4 +147,4 @@ if(iscarbon(M)) var/mob/living/carbon/C = M if(C.can_heartattack()) - C.set_heartattack(TRUE) \ No newline at end of file + C.set_heartattack(TRUE) diff --git a/code/modules/antagonists/wishgranter/wishgranter.dm b/code/modules/antagonists/wishgranter/wishgranter.dm index 15ec78692f..46b5edffd3 100644 --- a/code/modules/antagonists/wishgranter/wishgranter.dm +++ b/code/modules/antagonists/wishgranter/wishgranter.dm @@ -2,6 +2,7 @@ name = "Wishgranter Avatar" show_in_antagpanel = FALSE show_name_in_check_antagonists = TRUE + threat = 20 /datum/antagonist/wishgranter/proc/forge_objectives() var/datum/objective/hijack/hijack = new @@ -25,4 +26,4 @@ H.dna.add_mutation(HULK) H.dna.add_mutation(XRAY) H.dna.add_mutation(SPACEMUT) - H.dna.add_mutation(TK) \ No newline at end of file + H.dna.add_mutation(TK) diff --git a/code/modules/antagonists/wizard/equipment/spellbook.dm b/code/modules/antagonists/wizard/equipment/spellbook.dm index 5ef3f24bd6..2bcda1d400 100644 --- a/code/modules/antagonists/wizard/equipment/spellbook.dm +++ b/code/modules/antagonists/wizard/equipment/spellbook.dm @@ -11,7 +11,6 @@ var/buy_word = "Learn" var/limit //used to prevent a spellbook_entry from being bought more than X times with one wizard spellbook var/list/no_coexistance_typecache //Used so you can't have specific spells together - var/dynamic_cost = 0 // How much threat the spell costs to purchase for dynamic. var/dynamic_requirement = 0 // How high the threat level needs to be for purchasing in dynamic. /datum/spellbook_entry/New() @@ -31,10 +30,6 @@ for(var/spell in user.mind.spell_list) if(is_type_in_typecache(spell, no_coexistance_typecache)) return 0 - if(dynamic_cost>0 && istype(SSticker.mode,/datum/game_mode/dynamic)) - var/datum/game_mode/dynamic/mode = SSticker.mode - if(mode.threat < dynamic_cost) - return 0 return 1 /datum/spellbook_entry/proc/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) //return 1 on success @@ -70,10 +65,6 @@ SSblackbox.record_feedback("nested tally", "wizard_spell_improved", 1, list("[name]", "[aspell.spell_level]")) return 1 //No same spell found - just learn it - if(dynamic_cost > 0 && istype(SSticker.mode,/datum/game_mode/dynamic)) - var/datum/game_mode/dynamic/mode = SSticker.mode - mode.spend_threat(dynamic_cost) - mode.log_threat("Wizard spent [dynamic_cost] on [name].") SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name) user.mind.AddSpell(S) to_chat(user, "You have learned [S.name].") @@ -97,10 +88,6 @@ if(!S) S = new spell_type() var/spell_levels = 0 - if(dynamic_cost > 0 && istype(SSticker.mode,/datum/game_mode/dynamic)) - var/datum/game_mode/dynamic/mode = SSticker.mode - mode.refund_threat(dynamic_cost) - mode.log_threat("Wizard refunded [dynamic_cost] on [name].") for(var/obj/effect/proc_holder/spell/aspell in user.mind.spell_list) if(initial(S.name) == initial(aspell.name)) spell_levels = aspell.spell_level @@ -117,7 +104,7 @@ dat += " Cooldown:[S.charge_max/10]" dat += " Cost:[cost]
" dat += "[S.desc][desc]
" - dat += "[S.clothes_req?"Needs wizard garb":"Can be cast without wizard garb"]
" + dat += "[S.clothes_req & SPELL_WIZARD_GARB ? "Needs wizard garb" : "Can be cast without wizard garb"]
" return dat /datum/spellbook_entry/fireball @@ -308,7 +295,6 @@ desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself." item_path = /obj/item/gun/magic/staff/change dynamic_requirement = 60 - dynamic_cost = 20 /datum/spellbook_entry/item/staffanimation name = "Staff of Animation" @@ -376,7 +362,6 @@ item_path = /obj/item/storage/belt/wands/full category = "Defensive" dynamic_requirement = 60 - dynamic_cost = 10 /datum/spellbook_entry/item/armor name = "Mastercrafted Armor Set" @@ -396,7 +381,6 @@ item_path = /obj/item/antag_spawner/contract category = "Assistance" dynamic_requirement = 50 - dynamic_cost = 10 /datum/spellbook_entry/item/plasmafist name = "Plasma Fist" @@ -424,10 +408,6 @@ category = "Assistance" dynamic_requirement = 60 -/datum/spellbook_entry/item/bloodbottle/New() - ..() - dynamic_cost = CONFIG_GET(keyed_list/dynamic_cost)["slaughter_demon"] - /datum/spellbook_entry/item/hugbottle name = "Bottle of Tickles" desc = "A bottle of magically infused fun, the smell of which will \ @@ -443,10 +423,6 @@ category = "Assistance" dynamic_requirement = 40 -/datum/spellbook_entry/item/hugbottle/New() - ..() - dynamic_cost = CONFIG_GET(keyed_list/dynamic_cost)["slaughter_demon"]/3 - /datum/spellbook_entry/item/mjolnir name = "Mjolnir" desc = "A mighty hammer on loan from Thor, God of Thunder. It crackles with barely contained power." @@ -522,7 +498,6 @@ /datum/spellbook_entry/summon/guns name = "Summon Guns" desc = "Nothing could possibly go wrong with arming a crew of lunatics just itching for an excuse to kill you. Just be careful not to stand still too long!" - dynamic_cost = 10 dynamic_requirement = 60 /datum/spellbook_entry/summon/guns/IsAvailible() @@ -536,17 +511,11 @@ active = 1 playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1) to_chat(user, "You have cast summon guns!") - if(istype(SSticker.mode,/datum/game_mode/dynamic)) - var/datum/game_mode/dynamic/mode = SSticker.mode - var/threat_spent = dynamic_cost - mode.spend_threat(threat_spent) - mode.log_threat("Wizard spent [threat_spent] on summon guns.") return 1 /datum/spellbook_entry/summon/magic name = "Summon Magic" desc = "Share the wonders of magic with the crew and show them why they aren't to be trusted with it at the same time." - dynamic_cost = 10 dynamic_requirement = 60 /datum/spellbook_entry/summon/magic/IsAvailible() @@ -560,17 +529,11 @@ active = 1 playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1) to_chat(user, "You have cast summon magic!") - if(istype(SSticker.mode,/datum/game_mode/dynamic)) - var/datum/game_mode/dynamic/mode = SSticker.mode - var/threat_spent = dynamic_cost - mode.spend_threat(threat_spent) - mode.log_threat("Wizard spent [threat_spent] on summon magic.") return 1 /datum/spellbook_entry/summon/events name = "Summon Events" desc = "Give Murphy's law a little push and replace all events with special wizard ones that will confound and confuse everyone. Multiple castings increase the rate of these events." - dynamic_cost = 20 dynamic_requirement = 60 var/times = 0 @@ -582,11 +545,6 @@ /datum/spellbook_entry/summon/events/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name) summonevents() - if(istype(SSticker.mode,/datum/game_mode/dynamic) && times == 0) - var/datum/game_mode/dynamic/mode = SSticker.mode - var/threat_spent = dynamic_cost - mode.spend_threat(threat_spent) - mode.log_threat("Wizard spent [threat_spent] on summon events.") times++ playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1) to_chat(user, "You have cast summon events.") @@ -687,7 +645,7 @@ /obj/item/spellbook/proc/wrap(content) var/dat = "" - dat +="