Commit Graph
6041 Commits
Author SHA1 Message Date
0ee54f4bd4 [MIRROR] Combo streaks (not just the hud icons) now reset after half a dozen seconds (amount subject to change). (#3672)
* Combo streaks (not just the hud icons) now reset after half a dozen seconds (amount subject to change). (#57167)

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

* Combo streaks (not just the hud icons) now reset after half a dozen seconds (amount subject to change).

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Ghommie <425422238+Ghommie@ users.noreply.github.com>
2021-02-26 14:09:01 +00:00
40cd6757fb [MIRROR] Improves throat slitting combat log messages (#3661)
* Improves throat slitting combat log messages (#57176)

Co-authored-by: ShizCalev <ShizCalev@ users.noreply.github.com>

* Improves throat slitting combat log messages

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
Co-authored-by: ShizCalev <ShizCalev@ users.noreply.github.com>
2021-02-26 14:04:22 +00:00
AzarakandGitHub ec13ad8e36 Removes forced brain damage speech from dumbness trauma (#3630) 2021-02-25 13:51:16 +00:00
786788ca56 [MIRROR] Allows ghosts to start messages with asterisks in deadchat again (#3644)
* Allows ghosts to start messages with asterisks in deadchat again (#57159)

#56519 had noble goals in trying to make emote code more robust for
ghosts, but in doing so it undid #47144, which was made to allow people
to start messages with asterisks in deadchat without getting hassled by
the game thinking you're emoting. This re-limits the emote checker to
the only two emotes ghosts have ever had, *spin and *flip.

* Allows ghosts to start messages with asterisks in deadchat again

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-02-25 13:41:20 +00:00
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
21a986753e [MIRROR] Monkeys no longer rip apart machines from the inside (#3632)
* Monkeys no longer rip apart machines from the inside

monkeys only take things if theyre on a turf now...technically this bug made sense cuz the monkey was in the machine with the parts

* Monkeys no longer rip apart machines from the inside

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2021-02-24 20:35:33 +00:00
98d17d7fee [MIRROR] Adds the Intento! (#3617)
* Adds the Intento! (#56770)

Co-authored-by: Jack Edge <yellowbounder@ gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Adds the Intento!

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Jack Edge <yellowbounder@ gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-02-23 23:19:16 +00:00
e5ff997ef8 [MIRROR] Experi-Sci: Techweb nodes may now require you to perform "scientific" experiments (#3614)
* Experi-Sci: Techweb nodes may now require you to perform "scientific" experiments

* Update all_nodes.dm

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-23 21:51:28 +00:00
c2215e3905 [MIRROR] Adds a subsystem for ai movement (#3613)
* Adds a subsystem for ai movement (#57111)

* done

* straight walk

* movement

* yep

* removes unused macro

* done

* Update ai_movement.dm

* Adds a subsystem for ai movement

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2021-02-23 21:46:00 +00:00
fc2fc8db6b [MIRROR] Icebox QoL minus features (#3459)
* Icebox QoL minus features (#56472)

* Icebox QoL minus features

Co-authored-by: Whoneedspacee <yougotreallyowned@gmail.com>
2021-02-21 22:02:33 +00:00
SwiftfeatherandGitHub 7dbc4756e2 yes (#3559) 2021-02-21 14:24:55 +00:00
9bc6ee7bb5 [MIRROR] improves fire extinguisher code, and makes fire extinguisher water go through machinery, lockers, and crates (#3560)
* improves fire extinguisher code, and makes fire extinguisher water go through machinery, lockers, and crates (#57004)

* improves fire extinguisher code, and makes fire extinguisher water go through machinery, lockers, and crates

Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
2021-02-21 14:17:12 +00:00
7e646af235 [MIRROR] Makes overlay lighting flags actually respond to attaching/detaching lights (#3554)
* Makes overlay lighting flags actually respond to attaching/detaching lights (#57058)

Fixes overlay lighting components not handling attaching/detaching lights.

* Makes overlay lighting flags actually respond to attaching/detaching lights

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2021-02-21 13:59:24 +00:00
0a6cc5e475 [MIRROR] cult construct stuff (#3553)
* cult construct stuff (#57027)

edits sprites for wizard cult constructs to have more sheen
fixes wizard cult constructs not working
makes soulstone code a bit cleaner i think
makes cult spells use second defines
fixes wraith jaunts being invisible

* cult construct stuff

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-02-21 02:49:11 +00:00
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
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
18eca27569 [MIRROR] update_appearance (#3508)
* update_appearance

* a

* a

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-19 16:08:09 +00:00
d757510356 [MIRROR] Fixes reflection of hitscan beams against tiles (#3493)
* Fixes reflection of hitscan beams against tiles (#56881)

Co-authored-by: Ranged <nickvanderkroon@ gmail.com>

* Fixes reflection of hitscan beams against tiles

Co-authored-by: NotRanged <rangedvdk@gmail.com>
Co-authored-by: Ranged <nickvanderkroon@ gmail.com>
2021-02-18 21:04:19 +00:00
d2c0090c83 [MIRROR] replaces all instances of ammo_casing/BB to loaded_projectile again without crashing this time (#3478)
* replaces all instances of ammo_casing/BB to loaded_projectile again without crashing this time

* a

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-18 21:00:40 +00:00
9e07263fdf [MIRROR] Improves crafting code a tiny bit (#3477)
* Improves crafting code a tiny bit (#56937)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Improves crafting code a tiny bit

* a

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-18 20:59:11 +00:00
5baa0448af [MIRROR] Held Up status effect no longer permanent. (#3472)
* Held Up status effect no longer permanent. (#56973)

Heldup status effect is "grouped" and is only removed when all sources of it are removed.

A source is never passed into it, so the sources list just contains a single null element.

Once put on a player, the status effect will never be removed without admin intervention and will forever display the HUD alerts as a result.

I pass in the "shooter" as a source and as such this should now clear appropriately while staying around when a player is being held up by multiple people at once.

* Held Up status effect no longer permanent.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-02-18 04:46:43 +00:00
9e35706bc7 [MIRROR] Fix oversight allowing orbiting players to force the player they're orbitting to *surrender (#3474)
* Fix oversight allowing orbiting players to force the player they're orbitting to *surrender (#56972)

Observers with auto-observe inherit the HUD of the person they're observing. This includes Alerts. Alerts can be clicked. Alerts have varying levels of snowflaked checks. Some called parent and didn't check the return value. Some perform actions direct on usr instead of owner.

All of this has been standardised. Every single screen alert now calls ..() on Click() and returns early if the parent proc call returns false.

/atom/movable/screen/alert/Click now returns some useful value to children that call it.

* Fix oversight allowing orbiting players to force the player they're orbitting to *surrender

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-02-18 04:46:01 +00:00
f2b1e99a73 [MIRROR] Tailed species now gain a negative moodlet for having their tail lost (#3456)
* Tailed species now gain a negative moodlet for having their tail lost

* a

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-17 17:14:18 +00:00
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
43febe3145 [MIRROR] Converts many proc overrides to properly use list/modifiers, lots of other smaller things (#3433)
* Converts many proc overrides to properly use list/modifiers, lots of other smaller things

* Update human_defense.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-17 14:18:21 +00:00
c7ee4d2b13 [MIRROR] Plumbing IV drip (#3453)
* Plumbing IV drip (#56920)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Plumbing IV drip

Co-authored-by: Time-Green <timkoster1@hotmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-02-17 13:43:42 +00:00
9eb1a85e63 [NONMODULAR]Removes RESTRICTED_GAS roll chance for both lavaland and icebox (#3460)
* Hopefully reduces lag

* Update planetary.dm

* Update planetary.dm

* proper formatting of comments

+ original values in comments

Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
2021-02-17 12:42:03 +00:00
63de7b4b0d [MIRROR] Refactors the Light Eater and gives it some flavortext. Some minor behavior changes included. (#3415)
* Refactors the Light Eater and gives it some flavortext. Some minor behavior changes included. (#55551)

Converts the effects of the nightmares light eater into a component and a couple elements
Adds some flavor text to the light eater
Makes the effects of the nightmare's light eater dispel if the armblade is destroyed
Probably a net increase in code quality
More flavortext
The nightmare's light eater effect can be dispelled if you are willing to sacrifice the armblade

* Refactors the Light Eater and gives it some flavortext. Some minor behavior changes included.

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2021-02-16 00:45:39 +00:00
679bff1671 [MIRROR] Adds more admin memery and deadchat_control options to immovable rods. (#3418)
* Adds more admin memery and deadchat_control options to immovable rods. (#56888)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Adds more admin memery and deadchat_control options to immovable rods.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-02-16 00:13:31 +00:00
e8d2b34964 [MIRROR] Add back hearts for valentines, but in a sane manner (#3401)
* Add back hearts for valentines, but in a sane manner (#56900)

Adds back hearts removed by #56897, but in a way that doesn't completely murder timers.

Also made the code a bit better.

Here you can see it on my hideous date.

https://user-images.githubusercontent.com/35135081/107848333-6ec06280-6da7-11eb-91b6-1382380eb3b4.mp4

* Add back hearts for valentines, but in a sane manner

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-02-15 15:33:30 +00:00
ce1c037244 [MIRROR] Nerfs the roundstart planetary gasmixes, cleans up the code a bit (#3396)
* Nerfs the roundstart planetary gasmixes, cleans up the code a bit (#56909)

Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>

* Nerfs the roundstart planetary gasmixes, cleans up the code a bit

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
2021-02-15 15:32:09 +00:00
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
a765e5b0db [MIRROR] Pirates are split into three different ghastly crews! (#3395)
* Pirates are split into three different ghastly crews! (#56264)

Co-authored-by: DeAndre <robustness13@ hotmail.com>
Co-authored-by: itseasytosee <55666666+itseasytosee@ users.noreply.github.com>
Co-authored-by: tgstation-server <tgstation-server@ tgstation13.org>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Pirates are split into three different ghastly crews!

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: DeAndre <robustness13@ hotmail.com>
Co-authored-by: itseasytosee <55666666+itseasytosee@ users.noreply.github.com>
Co-authored-by: tgstation-server <tgstation-server@ tgstation13.org>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-02-15 13:32:35 +00:00
d441599907 [MIRROR] Adds moodlet for moth wings burning off (#3378)
* Adds moodlet for moth wings burning off (#56895)

Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>

* Adds moodlet for moth wings burning off

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
2021-02-14 10:24:08 +00:00
Yawet330andGitHub e676cd060a [NONMODULAR] Nanites can now infect all MOB_HUMANOIDs. (#3334)
* HATRED

* Update nanites.dm
2021-02-13 23:28:29 +00:00
39121c53ce [MIRROR] Minor ERT refactor, introduces a few ERT admin options (#3339)
* Minor ERT refactor, introduces a few ERT admin options (#56345)

* Minor ERT refactor, introduces a few ERT admin options

* Proper Modularisation Protocol

* Update preferences.dm

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-13 11:12:01 +00:00
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
acae57bc04 [MIRROR] Fixes critical server crashing bug with Valentines' Day (#3348)
* Fixes critical server crashing bug with Valentines' Day (#56897)

for any onlookers, the better solution here is just to make the love effect a basic overlay you put on mobs once, animated completely through a normal icon state

this is just pressing enough to do for now

* Fixes critical server crashing bug with Valentines' Day

Co-authored-by: Iamgoofball <iamgoofball@gmail.com>
2021-02-13 10:15:39 +00:00
c3570d7168 [Semi-Modular] Adds Shipstation, an entire station... on a shuttle. (#2680)
* Adds Shipstation

* Whoops, haven't ported the turnstile module in yet

* Update maps.txt

* SHIPSTATION OVERHAUL BABYYYY

Updates shipstation to (most) of Kath's suggestions, adds a dedicated shuttle pilot job and completely overhauls the map itself.

* Shuttle Pilot  Landmark

* Air Supply

* Scrubber Pipes

* Scrubber Pipes 2

* Digi Fix

* card.dmi fix

* Update tgstation.dme

* a

* Update tgstation.dme

* card.dmi

* HOP Office Beutification

Sec next

* sec overhaul compliance

* Update station_ship.dmm

* area / iron repath

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-02-12 14:34:26 +00:00
BluBerry016andGitHub 0b40512064 [Semi-Modular] Cybersun Overhaul (#2888)
* Create forgottenship_skyrat.dmm

* Cybersun Overhaul

* Whoops

* Add pipe dispenser and porta-pump as per Kath's suggestions

* Config fix

* Update space.dm

* Updates per Kath's requests
2021-02-12 14:22:47 +00:00
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
TomandGitHub 167584ee95 [SEMI-MODULAR] Adds catnip & felinid race drink (#3267)
* yes yes

* updates plantgrowth test

* comment
2021-02-11 23:52:38 +00:00
134377fc2c [MIRROR] No More Calling get_equipped_items() in mob/living/Crossed(), Makes Slippery Component Work Without it (#3292)
* No More Calling get_equipped_items() in mob/living/Crossed(), Makes Slippery Component Work Without it (#56820)

* gets rid of mob/living/crossed and makes clown pdas work without it

* makes squeaky work without COMSIG_ITEM_WEARERECROSSED

* No More Calling get_equipped_items() in mob/living/Crossed(), Makes Slippery Component Work Without it

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
2021-02-11 23:44:29 +00:00
b902f89062 [MIRROR] Refactor can_inject, and introduce try_inject (#3300)
* Refactor can_inject, and introduce try_inject (#56816)

Splits can_inject into can_inject and try_inject. The latter can perform side effects, while the former cannot. Moved the show_error bool parameter to a flag that try_inject checks.

Changes the signature to can_inject(mob/user, target_zone, injection_flags). This was previously redefined in several places, making it impossible to use named parameters. This refactor now allows named parameters to be used, and thus avoiding the ugliness of TRUE, FALSE, FALSE in parameters.

* Refactor can_inject, and introduce try_inject

Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
2021-02-11 19:49:47 +00:00
3957bfd6b2 [MIRROR] The immovable rod is now crazy fast, is overpowered broken and doesn't afraid of anything. (#3289)
* The immovable rod is now crazy fast, is overpowered broken and doesn't afraid of anything. (#56794)

Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>

* The immovable rod is now crazy fast, is overpowered broken and doesn't afraid of anything.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
2021-02-11 13:13:01 +01:00
47f8fbba05 [MIRROR] Move Jolly and Depression into mood handling (#3286)
* Move Jolly and Depression into mood handling (#56580)

The Jolly and Depression quirks are much more active. You can expect the positive/negative moodlets to affect you around 50% of the time.

Previously, the probability of the Jolly/Depression moodlet firing was so low, you only have a less than 1/3 chance of seeing the 2 minute moodlet in an hour of play. Now they will be far more active.
Depression's hardcore point value has increased, since it is far more negative now.

The quirks now just add the TRAIT_JOLLY and TRAIT_DEPRESSION, which is then used by the mood component to have a chance of triggering the corresponding mood episode.

Gonbolas now have an always on positive mood message, rather than applying a do nothing TRAIT_JOLLY trait.

To demonstrate how the mood traits are independent of the quirks, There is now a "jolly grey cap", which gives you TRAIT_JOLLY while it is being worn.

* Move Jolly and Depression into mood handling

Co-authored-by: coiax <yellowbounder@gmail.com>
2021-02-11 13:11:46 +01:00
17b3cf8216 [MIRROR] fixes 2 runtimes caused by holding people up with a gun (#3283)
* fixes 2 runtimes caused by holding people up with a gun (#56800)

Fixes two runtimes, one caused by status effects always expecting a return from throw_alert, and another caused by holding yourself up (which you shouldn't even be able to do). Also fixes an issue caused by multiple people holding up the same person, when one of the perpetrators stopped holding up the victim, all of the victim's related alerts disappeared.

* fixes 2 runtimes caused by holding people up with a gun

Co-authored-by: TJatPBnJ <69724863+TJatPBnJ@users.noreply.github.com>
2021-02-11 13:10:46 +01:00
e0a4b94b6d [MIRROR] felinids with the family heirloom quirk can now roll toy mice as their family heirlooms (#3277)
* felinids with the family heirloom quirk can now roll toy mice as their family heirlooms (#56790)

* felinids with the family heirloom quirk can now roll toy mice as their family heirlooms

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
2021-02-11 00:05:57 +00:00
7b326654b3 [MIRROR] Cargo bounty cube incentives (#3263)
* Cargo bounty cube incentives (#56375)

Bounty cube announces its creation over Supply with its creator and
area, starting the speedy delivery bonus countdown
20% bonus for cargo if you send the cube within 5 minutes of its
creation.

Using an export scanner on it in the supply shuttle awards a 10%
personal handling tip when it reaches Centcom.

Cube nags at five minutes over Supply if it's not sent and cargo bonus
is lost.

All nags tell you the cube's area

Co-authored-by: coiax <yellowbounder@ gmail.com>

* Cargo bounty cube incentives

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
Co-authored-by: coiax <yellowbounder@ gmail.com>
2021-02-10 11:55:27 +00:00
9ca50d99d8 [MIRROR] Light moodlet cleaning (#3250)
* Light moodlet cleaning (#56768)

Factors some raw deciseconds into time defines
Standardizes use of "Oh god,"
Fixes some other small formatting issues
Refactors entries of 1.x MINUTES into SECONDS

* Light moodlet cleaning

Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
2021-02-10 00:43:16 +00:00