Commit Graph

1816 Commits

Author SHA1 Message Date
Gandalf
00763bb6e5 Update icons.dm (#3789) 2021-03-03 04:39:55 +00:00
SkyratBot
a05f7e863a [MIRROR] Fully implements the ID Card design document (#3729)
* Fully implements the ID Card design document

* Oh fuck that hurt.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-03-03 01:54:25 +00:00
SkyratBot
84fbdbf1f4 [MIRROR] Fix some announcement sounds (#3686)
* Fix some announcement sounds (#57192)

* Fix some announcement sounds

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2021-02-27 11:27:18 +00:00
SkyratBot
6d7d8c426b [MIRROR] Fixes HC random paying out double as deconverted antag (#3663)
* Fixes HC random paying out double when deconverted antag (#57148)

Fixes hardcore random paying out double as deconverted antag by just doubling it when the round ends instead of starts

* Fixes HC random paying out double as deconverted antag

Co-authored-by: Time-Green <timkoster1@hotmail.com>
2021-02-26 14:04:47 +00:00
SkyratBot
1f665ef7f7 [MIRROR] Beauty is now an element. Fixing an issue with enter/exit area comsigs. (#3639)
* Beauty is now an element. Fixing an issue with enter/exit area comsigs. (#57147)

Co-authored-by: Ghommie <425422238+Ghommie@ users.noreply.github.com>

* Beauty is now an element. Fixing an issue with enter/exit area comsigs.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Ghommie <425422238+Ghommie@ users.noreply.github.com>
2021-02-25 13:37:25 +00:00
SkyratBot
adea9a6449 [MIRROR] Implements JPS (Jump Point Search) Pathfinding (#3581)
* Implements JPS (Jump Point Search) Pathfinding (#56780)

So a month or so ago I wanted to make it so dogs in my dog AI PR could path through doors if they had access, and was told I'd need to improve our pathfinding efficiency if I wanted to use full pathfinding for them. Thus, enter JPS, a pathfinding algorithm that allows for massive timesavings in systems with uniform cost grids like ours. This code is still fairly rough and needs polishing, but it's fully functional and already shows massive savings over traditional A*! I plan for this to replace A* as our default pathing method, but I'll leave the A* code in place in case someone ever needs it for whatever reason, like if a specific case needs variable cost pathing.

Note that this allows for diagonal pathing instead of the cardinal pathing our A* uses right now, and the current version of the code costs the same to move diagonally as it does to move laterally, which may change later. There's also a lot of dummy/test code in right now in general, but you should still be able to test it out for yourself by spawning a bot like a medibot and using your PDA to summon it.
Preliminary Profile Results

A preliminary profile is available here. Using one medibot by itself on Metastation, I generated a list of 500 random blob spawn points around the station, gave the medibot all access, then let each algorithm tackle the list. The old A* algorithm took a total of 86 seconds to complete the list and processed 978065 nodes, while JPS took a total of 46 seconds and processed only 100062 nodes, for a 47% decrease in total time and an almost 90% decrease in nodes processed!
Why It's Good For The Game

Significantly cheaper pathing, which will very much come in handy for the AI datums I'm looking to dig into, what's not to like?

* Implements JPS (Jump Point Search) Pathfinding

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-02-22 02:24:42 +00:00
SkyratBot
da71129f87 [MIRROR] Fermichem part 2.1: Adds a reaction/reagent lookup GUI! (#3513)
* Fermichem part 2.1: Adds a reaction/reagent lookup GUI!

* Update chem_dispenser.dm

* Update reagents.dm

Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-02-19 23:14:45 +00:00
SkyratBot
8cb1c0040b [MIRROR] Fermichem part 2.2 Adds new tools, crafts and methods for ghetto chemists to handle the new reaction mechanics. (#3512)
* Fermichem part 2.2 Adds new tools, crafts and methods for ghetto chemists to handle the new reaction mechanics. (#56871)

Since reactions now require a bit more involvement from chemists, ghetto chemistry is a bit harder. This seeks to help some of those problems by providing new tools for those without a chem heater/reaction chamber.

Also some of these might be useful for chemists in the lab too!

Here's what you can make:
image
the burners are similar to candles - except they burn their internal reagents. The temperature they heat by is dependant on the flame, fuel and oil burn for a lower amount, ethanol for a higher amount and plasma for the highest amount. They can be put on tables and bonked with beakers for a quick way to heat them (similar to lighters). You'll need to light them with a match or lighter too, though, and can be put out by use in hand.

The thermometer looks like this and gives you temperature readings!
thermom

The pH booklets are the same as before - but you can now craft them by making universal indicator. These are the best way for a ghetto chemist to check their pH, and multiple sheets should be used over a reaction.

The improvised chem heater looks like this, and is a reconfigured space heater, it requires more materials and tools lending itself to a static drug den, but has the best method of adjusting temperature and fighting against exo/endo thermic reactions:
Improv_heater

Finally, the cooling spray lets chemists do the oposite of a lighter on their beaker - cooling the reagents within. In addition, fire extinquishers perform the same function.

In addition ice and universal indicator have been added as reactions.

Co-authored-by: Rohesie <rohesie@ gmail.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>

* Fermichem part 2.2 Adds new tools, crafts and methods for ghetto chemists to handle the new reaction mechanics.

Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@ gmail.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
2021-02-19 19:14:58 +00:00
SkyratBot
d0dc199815 [MIRROR] /mob/living/proc/Life(delta_time) (#3509)
* /mob/living/proc/Life(delta_time)

* a

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-19 16:55:52 +00:00
SkyratBot
3b85cf1430 [MIRROR] Addiction rework (#3445)
* Addiction rework

* a

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-17 14:26:44 +00:00
SkyratBot
b281dd7c11 [MIRROR] 'Server's Last Round' fix (#3426)
* 'Server's Last Round' fix (#56934)

* 'Server's Last Round' fix

Co-authored-by: Emmanuel S <mrdoomboyo@gmail.com>
2021-02-16 12:14:05 +00:00
SkyratBot
b332b46b65 [MIRROR] Remove hideous inline tab indentation, and bans it in contributing guidelines (#3394)
* Remove hideous inline tab indentation, and bans it in contributing guidelines

* a

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-15 15:32:02 +00:00
SkyratBot
495b35a679 [MIRROR] Converts all uses of modifiers to lazy access to avoid memes in future (#3331)
* Converts all uses of modifiers to lazy access to avoid memes in future

* Update work_tools.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
2021-02-13 11:06:39 +00:00
SkyratBot
c430e11d0b [MIRROR] Fixes tags on ordered pizza (#3344)
* Fixes tags on ordered pizza (#56369)

Box tags

    Fixes bug where box tags weren't updating correctly on creation
    Adds box tag flavours for the pizzas without them (i.e. Donk Pocket -> Bangin' Donk, Dank -> Fresh Herb, Sassysage -> Sausage Lovers, Arnold -> 9mm Pepperoni)

Randomised pizza crates

    Pizza crates can now come with any five pizzas, weighted by disruptiveness
    Small chance of getting one pizza bomb in a pizza crate (either armed or not) per shift

Armed pizza bomb

    Adds an armed variant of the bomb pizza box, which has the boxtag "Meat Explosion", contains a meat pizza and explodes 5 seconds after opening
    Makes the pizza party spawner use the armed bomb pizza box, instead of giving whoever a free syndicate pizza bomb they probably aren't allowed to use anyway

Secure kitchen crate

    Adds the secure kitchen crate from my previous PR
    Adds a secure pizza crate variant to KiloStation's cargo warehouse where the freezer crate was, which contains the pizza party and is locked with kitchen access

Ghost examines

    Adds ghost examine messages for pizza boxes with bombs or the nanomachine pizza in them

* Fixes tags on ordered pizza

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
2021-02-13 10:13:43 +00:00
SkyratBot
7da4aa9adf [MIRROR] Reaction rates, pH, purity and more! Brings a heavily improved, less explosive and optimised fermichem to tg. (#3306)
* Reaction rates, pH, purity and more! Brings a heavily improved, less explosive and optimised fermichem to tg.

* a

Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-12 00:04:39 +00:00
SkyratBot
e3c1100920 [MIRROR] Add locking into portals with right click on hand tele, refactor hand tele code, add pre_attack_secondary (#3242)
* Add locking into portals with right click on hand tele, refactor hand tele code, add pre_attack_secondary (#56700)

Refactors hand tele code with better variable names, splitting procs, fixing C&P code, etc.
Adds pre_attack_secondary, the right click version of pre_attack.
Adds a new alternate function to hand teles, which will reopen the last location you opened. Works based off locations, not turfs. For example, right clicking after locking in "None (Dangerous)" will not teleport you to the same place.

* Add locking into portals with right click on hand tele, refactor hand tele code, add pre_attack_secondary

Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
2021-02-09 19:44:07 +00:00
SkyratBot
b450304a51 [MIRROR] In-spect scanner tweaks (#3225)
* In-spect scanner tweaks (#56720)

* Spellchecks the in-spect scanner description

- Renames it the N-spect scanner
- Changes the sound effect from the quaint voiced placeholder to something I found on Freesound
- Changes the report to be a piece of paper
- Adds encrypted WGW protocol report to paper

* In-spect scanner tweaks

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
2021-02-09 09:46:58 +00:00
SkyratBot
cc67a133e5 [MIRROR] [READY] Adds station traits: Small modifiers that can randomly be chosen each round (#3132)
* [READY] Adds station traits: Small modifiers that can randomly be chosen each round

* conflicts

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 23:07:24 +00:00
SkyratBot
e83e1b7d41 Standardizes area paths and area-based nomenclature (#3125)
Co-authored-by: Son-of-Space <63861499+Son-of-Space@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 22:59:05 +00:00
SkyratBot
08372ce288 [MIRROR] [s] funny sanitization (#3153)
* [s] Sanitizes captain's announcements on newscasters (#56712)

* [s] funny sanitization

Co-authored-by: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
2021-02-06 21:31:55 +00:00
SkyratBot
762bf6fe62 [MIRROR] Fixes Traitor Uplinks Being Set to Existing Radio Channels (#3118)
* Fixes Traitor Uplinks Being Set to Existing Radio Channels (#56608)

* Fixes Traitor Uplinks Being Set to Existing Radio Channels

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
2021-02-05 22:05:30 +00:00
SkyratBot
18d9daadb1 [MIRROR] Improves friendly commendation code (#3110)
* Improves friendly commendation code (#56453)

* Improves friendly commendation code

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-02-05 21:42:47 +00:00
SkyratBot
25df6e7da3 Cleaning up robot code: modules renamed to models & DOGBORG REWORK (#2837)
* Cleaning up robot code: modules renamed to models

* Merge branch 'master' into upstream-merge-56312

* [PR Fix] Modular_Skyrat borgos (#3019)

* No more linter complaining

* Halfway (or full way, I don't know) through moving stuff around

* Caps!

* a

Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-02-05 21:28:06 +00:00
SkyratBot
528c8b4659 [MIRROR] Dynamic 2021 (#3070)
* Dynamic 2021 (#56221)

About The Pull Request

Dynamic 2021, among much other things, splits the threat level into two separate budgets, one for round start and one for midround/latejoin. You can read the design doc, plus methodology and charts here: https://hackmd.io/@ tgstation/S1C4dYJkO.

To server owners: this is incompatible with current dynamic.json configurations. This is not just because some fields have different values now, but because the older values are not balanced towards this system.

Inidividual list of changes (as I remember them):

    Threat level is now split into two separate budgets, one for round start and one for midround/latejoin.
    In TESTING, you can now run dynamic simulations to see the roundstart picks.
    antag_cap is now based on an equation rather than a fixed list of antags per indice--the old system is not scalable. You can now pass it either a number for a fixed constant, or a list with "denominator" and an optional "offset" to fit the equation ceil(x / denominator) + offset, with x being population.
    Midround/latejoin timers are now vars on /datum/game_mode/dynamic itself, and thus can be configured by head admins per server.
    Removes some older, as far as I can tell completely unused admin tools relating to dynamic.
    autotraitor_cooldown is now properly respected from config, and is based on an exact time rather than on ticks (450 used to be 15 minutes, now it's just 15 MINUTES).
    The rulesets dynamic chooses are now in a dynamic.json file in round logs. Relies on tgstation/tgstation13.org#64 to be public.
    Adds more logging to the autotraitor ruleset for admins.
    Midround/latejoin chance modifiers are now configurable.

Labelled "Do Not Merge", as the design doc outlines the specific playtesting schedule I would like to perform.

    Note to self: Remove the custom MOTD before merge.

Why It's Good For The Game

(Copied from design doc)

Dynamic currently dumps as much threat as it can into round start threats. This means that rounds at ~50 threat can have an absurd amount of antagonists round start, while leaving very little threat for midround/latejoin antagonists. What inevitably happens is just one of those picked decides to murderbone, leading to the inevitable 20 minute shuttle call. Furthermore, once those antagonists are dead, Dynamic doesn’t have any threat left to spend on new antagonists that keep the round flowing, promoting the mentality of “antags dead, I’m bored, let’s leave”.

The proposed solution of Dynamic 2021 is to split threat level into two separate budgets, one for round start and one for midround/latejoin. This split, like threat level, will also be done on a lorentz curve–meaning that while most rounds will have them evenly split, there is still the possibility of chaotic high antagonist round start rounds, or the possibility of a midround onslaught.

* Dynamic 2021

Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
2021-02-04 16:08:32 +00:00
SkyratBot
70024ef6ad [MIRROR] Reverts Adds Neon Carpet (#55782) (#3040)
* reverts Adds Neon Carpet (#55782), it appears to have been causing massive amounts of maptick (#56496)

It appears to have been causing massive amounts of maptick, this'll need a testmerge so we can test my hypothesis

* Reverts Adds Neon Carpet (#55782)

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-02-03 10:22:43 +01:00
uomo
29dd4c6384 The roundend screen will now not show ckeys. (#2952)
* yeehaw

* Formatting I guess.
2021-01-31 05:41:31 +00:00
SkyratBot
7f7252d855 [MIRROR] Adds logging to uplinks, spellbooks, and the codex ciatrix (#2937)
* Adds logging to uplinks, spellbooks, and the codex ciatrix (#56450)

* Initial logging

* Bugfix and adds uplink logging to config file

* Another bugfix

* Adds logging to uplinks, spellbooks, and the codex ciatrix

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2021-01-29 14:12:01 +00:00
SkyratBot
c710b70b0a [MIRROR] removes useless helper proc because SIGN() exists (#2905)
* removes num2sign (#56433)

* removes useless helper proc because SIGN() exists

Co-authored-by: ZeWaka <zewakagamer@gmail.com>
2021-01-28 02:48:29 +01:00
Azarak
f4c4c19d77 [TESTMERGE] Makes icon2html not work (#948)
* teste

* Update icons.dm

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-01-26 00:43:51 +00:00
SkyratBot
902f0a06d7 [MIRROR] Adds Neon Carpet (#2882)
* Adds Neon Carpet

* HARDSET

* Update tgstation.dme

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-01-25 17:01:58 +00:00
SkyratBot
a45c4f9514 [MIRROR] Removes the persistent hold on a tmp savefile. (#2841)
* Removes the persistent hold on a tmp savefile. (#56320)

This was surviving soft reboots and then blocking the deploy of a new code version.

There is zero need to persist this savefile given the low amount of times this proc is called.

* Removes the persistent hold on a tmp savefile.

Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
2021-01-23 17:35:08 +00:00
SkyratBot
6bab35951b [MIRROR] Frame stacking fix and unit test addition. (#2833)
* Frame stacking fix and unit test addition. (#56287)

* Reverts #56205

* Allow things without density to bypass checks

* The rest of the owl

* The rest of the owl

* Doc and tweak

* More feex

* RCD machine frame unit test

* I suck

* AAAAA

* Bad at unit tests

* Revert unit tests (for including in another PR)

* Fix windoor_assembly return logic

* Comment /mob/living/proc/PushAM logic

* Windoor assembley logic tweak

* Fix frame stacking

* Unit test

* Better wording from macros?

* Frame stacking fix and unit test addition.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-01-22 15:31:26 +00:00
SkyratBot
b23690f720 [MIRROR] [bounty code moment] Adds a way to view the 'Server's Last Round' (#2667)
* [bounty code moment] Adds a way to view the 'Server's Last Round' (#55646)

* Adds "View Last Server Round Report" option.

* [bounty code moment] Adds a way to view the 'Server's Last Round'

Co-authored-by: Emmanuel S <mrdoomboyo@gmail.com>
2021-01-13 04:25:29 +01:00
SkyratBot
de38dda364 [MIRROR] Get_hear Minor optimization (#2554)
* get_hear Minor optimization (#55961)

get_hear minor optimization

* Get_hear Minor optimization

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
2021-01-07 23:55:41 +01:00
SkyratBot
ab87c3fe29 [MIRROR] Optimized Getallcontents (#2552)
* Optimized Getallcontents (#55964)

Optimized Getallcontents, split up it's component procs

* Optimized Getallcontents

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
2021-01-07 23:53:25 +01:00
SkyratBot
5b08fcb3c3 [MIRROR] Optimized getviewsize (#2553)
* Optimized getviewsize (#55962)

Optimized getviewsize

* Optimized getviewsize

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
2021-01-07 23:52:24 +01:00
SkyratBot
d77ff33126 [MIRROR] Some of the unsorted chat types being sorted (#2526)
* Some of the unsorted chat types being sorted

* aaa

Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-01-07 00:36:47 +01:00
SkyratBot
2c770bf48e Readds hashes var to sanitize_hexcolor() return values. (#2491)
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-01-04 17:09:19 +01:00
SkyratBot
08c43e0c6e [MIRROR] sanitize_hexcolor can now convert inputs between 12-bit and 24-bit RGB formats plus alpha channel. (#2486)
* sanitize_hexcolor can now convert inputs between 12-bit and 24-bit RGB formats plus alpha channel. (#55560)

* sanitize_hexcolor can now convert inputs to 3, 4, 6 and 8 characters RGB formats.

* update

* Fine, no repeating decimals.

* Update sanitize_values.dm

* Update sanitize_values.dm

* sanitize_hexcolor can now convert inputs between 12-bit and 24-bit RGB formats plus alpha channel.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-01-04 15:55:48 +01:00
SkyratBot
6ec9633a5a [MIRROR] Fixes log collisions (#2412)
* wrinkling my brain (#55829)

#54939 removed a part of individual logging code that used the length of the individual's logging list as part of the index for storing a given line of logging.

The problem is, that number was important for avoiding collisions in the logging lists. Since the length of an atom's logging list can only ever increase by 1 every time a new line is logged, you were guaranteed to always have a unique index for each new line. Without the length in the index, if any logging event was triggered on the same atom multiple times in the same second (like if someone spoke once willingly and once by force from something like tourettes at the same time), two entries would be logged, but both of them would point to whichever one was processed last.

This was most noticeable with wound logging, since the victim would log both the attack itself and the wound it caused at the same time in the same category (LOG_ATTACK), meaning that the wound log would just be turned into a copy of the attack entry, but I believe this is the cause behind most (if not all) of the issues logging has had with duplicating some events and losing others entirely.

The fix is simple, just adding the length of the list to the end of the index. This still allows logs to be sorted by timestamp while ensuring that each log entry is unique.

* Fixes log collisions

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-01-01 14:34:04 +01:00
SkyratBot
d7f054b035 [MIRROR] Refactors monkeys into a species (#2379)
* Refactors monkeys into a species

* aaa

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-31 21:08:07 +01:00
SkyratBot
ff77fe86f3 [MIRROR] Simple proc profiler that just times stuff in TESTING (#2333)
* Added simple profiler (#55613)

* Simple proc profiler that just times stuff in TESTING

Co-authored-by: WarlockD <warlockd@gmail.com>
2020-12-26 23:40:01 +01:00
SkyratBot
35aaa84a84 [MIRROR] Filterrific! (#2233)
* Filterrific!

* a

Co-authored-by: Rob Bailey <actioninja@gmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-19 06:29:54 +01:00
SkyratBot
92ee9a989f [MIRROR] Fixes spelling for richest/most affluent crewmember message at roundend (#2210)
* Fixes spelling for richest crewmember at roundend (#55570)

Fixes an incredibly minor typo fix for roundend screen.

* Fixes spelling for richest/most affluent crewmember message at roundend

Co-authored-by: prodirus <44090982+prodirus@users.noreply.github.com>
2020-12-17 23:25:28 +01:00
SkyratBot
312a312dc6 [MIRROR] Fix Hanukkah (again) and refactor Moth Week and Beer Day (#2200)
* Fix Hanukkah (again) and refactor Moth Week and Beer Day (#55532)

* Fix Hanukkah (again) and refactor Moth Week and Beer Day

* Remove unnecessary changes

* Fix Hanukkah (again) and refactor Moth Week and Beer Day

Co-authored-by: Jack LeCroy <3073035+jacklecroy@users.noreply.github.com>
2020-12-17 08:05:26 +01:00
SkyratBot
d37d6ce8d9 [MIRROR] Disconnect and Reconnect messages for deadchat (#2174)
* Disconnect and Reconnect messages for deadchat (#55395)

adds messages to deadchat when a client with a mob disconnects or reconnects

* Disconnect and Reconnect messages for deadchat

* aaa

Co-authored-by: Emmanuel S <mrdoomboyo@gmail.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-17 02:56:49 +01:00
SkyratBot
9dfb7a1189 [MIRROR] Everything that uses maptext now uses the class that makes it actually readable (#2116)
* Everything that uses maptext now uses the class that makes it actually readable

* Update chatmessage.dm

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2020-12-11 00:40:04 +00:00
SkyratBot
3a0491d3b4 [MIRROR] Small do-after refactor (#2074)
* Small do-after refactor (#55172)

This is an alternative to the PR Ryll made, it does some things similar e.g. the default limit of 1 interaction per target for a person, however, it refactors do_afters to support overrides for max interaction counts and unique sources.

For example, stripping uses the item being stripped as the source, allowing you to strip multiple items, but not the same item multiple times.

I've also fixed most other edge-cases this could cause where balance would be affected, but feel free to point out any I might've missed, this'll probably require some longer-term testmerging.

* Small do-after refactor

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-12-07 22:46:59 +01:00
SkyratBot
ddbcca4de3 [MIRROR] Fix nth week holidays (#2061)
* Fix nth week holidays (#55364)

 fix: Holidays appearing on the nth day of the month like Thanksgiving will work now.
tweak: Columbus day is now called Indigenous Peoples' Day.

* Fix nth week holidays

Co-authored-by: Jack LeCroy <3073035+jacklecroy@users.noreply.github.com>
2020-12-07 10:32:35 +00:00
Funce
3ed84722a0 Adds the original Discord messages back to the alert system, no more barrenness (#2050) 2020-12-06 22:59:47 +01:00