Commit Graph

14074 Commits

Author SHA1 Message Date
deathride58 a5d9fc4ddd Merge pull request #5601 from Citadel-Station-13/upstream-merge-35740
[MIRROR] Fixes mushroom bowls
2018-02-20 15:21:59 +00:00
deathride58 c9d36d7ec8 Merge pull request #5600 from Citadel-Station-13/upstream-merge-35780
[MIRROR] Fixed instant summon behavior with simple animals
2018-02-20 15:21:39 +00:00
deathride58 77f48a3ceb Merge pull request #5599 from Citadel-Station-13/upstream-merge-35782
[MIRROR] Fixed mutate not removing its effects when refunded
2018-02-20 15:21:16 +00:00
deathride58 e70ba8d322 Merge pull request #5598 from Citadel-Station-13/upstream-merge-35793
[MIRROR] Fixes up foam and smoke code and comments again to atleast be correct
2018-02-20 15:20:51 +00:00
CitadelStationBot 6943a24618 Automatic changelog generation for PR #5597 [ci skip] 2018-02-20 09:20:32 -06:00
deathride58 940351b8de Merge pull request #5597 from Citadel-Station-13/upstream-merge-35804
[MIRROR] Fixes ghost role spawners still showing up in the spawner menu even if they're deleted
2018-02-20 15:20:28 +00:00
CitadelStationBot 5a52b258de Automatic changelog generation for PR #5596 [ci skip] 2018-02-20 09:20:04 -06:00
deathride58 11174ef300 Merge pull request #5596 from Citadel-Station-13/upstream-merge-35805
[MIRROR] Fixes walls under doors breaking to space
2018-02-20 15:20:01 +00:00
CitadelStationBot b4262286b0 Automatic changelog generation for PR #5595 [ci skip] 2018-02-20 09:19:46 -06:00
deathride58 1b27d1a93c Merge pull request #5595 from Citadel-Station-13/upstream-merge-35718
[MIRROR] Adds circutry to diagnostic hud, adds action flags to circuits
2018-02-20 15:19:43 +00:00
CitadelStationBot 1ea37f9688 Fixes mushroom bowls 2018-02-19 22:08:09 -06:00
fludd12 0d03e90e9f Fixes mushroom bowls (#35740)
* Fixes mushroom bowls

Made the mushroom bowl a subtype of the normal bowl, and deleted a
duplicate definition.

Also, adds custom soup and salad support for the mushroom bowls.

Fixes #32471

* Remove a dangling return
2018-02-19 22:08:09 -06:00
CitadelStationBot 1be40ba78c Fixed instant summon behavior with simple animals 2018-02-19 22:08:01 -06:00
Cruix 558b87ce65 Fixed instant summon behavior with simple animals (#35780)
Removed hand slots from lots of things that should not have them
2018-02-19 22:08:01 -06:00
CitadelStationBot 05ff98da77 Fixed mutate not removing its effects when refunded 2018-02-19 22:07:52 -06:00
oranges 07fc2d1f5e Merge pull request #35782 from Cruix/mutate_off
Fixed mutate not removing its effects when refunded
2018-02-19 22:07:52 -06:00
CitadelStationBot f9a04916a9 Fixes up foam and smoke code and comments again to atleast be correct 2018-02-19 22:07:44 -06:00
Jordan Brown c5f3aa7043 Merge pull request #35793 from DaedalusGame/naksu-pls
Fixes up foam and smoke code and comments again to atleast be correct
2018-02-19 22:07:44 -06:00
CitadelStationBot 236f40e25b Fixes ghost role spawners still showing up in the spawner menu even if they're deleted 2018-02-19 22:07:34 -06:00
Jordan Brown ff0f8189c5 Merge pull request #35804 from DaedalusGame/ghost-rolling
Fixes ghost role spawners still showing up in the spawner menu even if they're deleted
2018-02-19 22:07:34 -06:00
CitadelStationBot a13b69481d Fixes walls under doors breaking to space 2018-02-19 22:07:26 -06:00
Jordan Brown 378d8b9c01 Merge pull request #35805 from DaedalusGame/walls-dont-break-to-space-robustin-you-smoothbrain-extraordinaire
Fixes walls under doors breaking to space
2018-02-19 22:07:26 -06:00
CitadelStationBot f9361326ac Adds circutry to diagnostic hud, adds action flags to circuits 2018-02-19 22:07:17 -06:00
Trevor Serpas 108f1c85ff Adds circutry to diagnostic hud, adds action flags to circuits (#35718)
cl
add: Circuits integrity, charge, and overall circuit composition is displayed on diagnostic huds. If the assembly has dangerous circuits then the status icon will display exclamation points, if the assembly can communicate with something far away a wifi icon will appear next to the status icon, and if the circuit can not operate the status icon will display an 'X'.
add: AR interface circuit which can modify the status icon if it is not displaying the exclamation points or the 'X'.
tweak: Locomotive circuits can no longer be added to assemblies that can't use them.
spellcheck: Fixed a typo in the grenade primer description.
code: Added flags to circuits that help group subsets of circuits and regulate them.
/cl

The diagnostic hud addition is meant to allow more counter play to circuits by seeing the assemblies's healths and how dangerous they are. The flags are a useful addition to the code because players shouldn't be able to put circuits in assemblies if the assembly can't use that circuit (this can also be used later for other assemblies which could use unique circuits).

The following circuits are flagged as dangerous:
weapon firing mechanism
grenade primer
thrower

The following circuits are flagged as long range:
NTNet networking circuit
integrated signaler
video camera circuit

possible AR interface displays:
default
alert
move
2018-02-19 22:07:16 -06:00
deathride58 fef23bd7cc Merge pull request #5594 from Poojawa/Tweaks
fixes possible missing sprites
2018-02-20 03:37:39 +00:00
Poojawa 91c9434404 fixes possible missing sprites 2018-02-19 20:03:02 -06:00
CitadelStationBot 86798b91e5 Automatic changelog generation for PR #5590 [ci skip] 2018-02-19 10:48:13 -06:00
CitadelStationBot 1e65c813f0 [MIRROR] Extensive surgery additions (#5590)
* Extensive surgery additions

* Update role_preferences.dm

* Update surgery_step.dm
2018-02-19 10:48:11 -06:00
CitadelStationBot d8faf15832 [MIRROR] Cleans up some spaces (#5593)
* Merge pull request #35811 from ShizCalev/spacing

Cleans up some spaces

* Cleans up some spaces
2018-02-19 10:27:17 -06:00
CitadelStationBot c6fe0229c8 Automatic changelog generation for PR #5592 [ci skip] 2018-02-19 10:23:23 -06:00
CitadelStationBot 7ef05e33ad [MIRROR] Mime's Bane recipe (#5592)
* Mime's Bane recipe (#35570)

* Makes Mimes's Bane use the new EMOTEMUTE trait

It randomly occured to me that I should do this.

Mime's Bane is currently a reagent currently only used in cloning pods
to stop growing clones from gasping from crit/lack of air (since they're
in a pure nitrogen environment).

* 2 Mime's Bane = 1 Mute Toxin + 1 Nothing

* Mutetoxin + nothing + radium

* Mime's Bane recipe
2018-02-19 10:23:20 -06:00
CitadelStationBot 74009632a2 [MIRROR] Fixed overlapping timestop behavior (#5591)
* Merge pull request #35784 from Cruix/timestop_overlap

Fixed overlapping timestop behavior

* Fixed overlapping timestop behavior
2018-02-19 10:22:59 -06:00
CitadelStationBot 177b808794 [MIRROR] Adds a space on check antag between name and role (#5589)
* Merge pull request #35683 from lzimann/checka

Adds a space on check antag between name and role

* Adds a space on check antag between name and role
2018-02-19 10:22:47 -06:00
CitadelStationBot 58af563131 [MIRROR] Redeems my sins. Defib mount fixes. (#5588)
* Redeems my sins. Defib mount fixes. (#35727)

* Never again

* stuff

* Bumps up the recharge.

* Redeems my sins. Defib mount fixes.
2018-02-19 10:22:21 -06:00
CitadelStationBot 350029e212 [MIRROR] Adds the missing wrapper to meteor report (#5587)
* Merge pull request #35798 from AnturK/meteorwrap

Adds the missing wrapper to meteor report

* Adds the missing wrapper to meteor report
2018-02-19 10:22:03 -06:00
CitadelStationBot d81c35b55f Automatic changelog generation for PR #5586 [ci skip] 2018-02-19 10:21:50 -06:00
CitadelStationBot 6e28b456ba [MIRROR] Deletes a redundant double proc definition in paper bins (#5586)
* Merge pull request #35797 from DaedalusGame/freon-is-back-baybee

Deletes a redundant double proc definition in paper bins

* Deletes a redundant double proc definition in paper bins
2018-02-19 10:21:47 -06:00
CitadelStationBot 5a532dd606 [MIRROR] Sheet icon fixes (#5585)
* Sheet icon fixes

* Update sheet_types.dm
2018-02-19 10:21:32 -06:00
Poojawa 97f69d6b05 Stop the fucking posibrain pinging, christ (#5584) 2018-02-19 01:04:15 -06:00
CitadelStationBot cb02494c35 Automatic changelog generation for PR #5582 [ci skip] 2018-02-18 19:52:57 -06:00
CitadelStationBot e3691b8857 [MIRROR] Fixes immersion, fried eggs now no longer requires boiled eggs (#5582)
* Update recipes_egg.dm (#35769)

* Fixes immersion, fried eggs now no longer requires boiled eggs
2018-02-18 19:52:54 -06:00
CitadelStationBot 1d028256d2 [MIRROR] Slippery Ice Fix (#5581)
* Slippery Ice Fix (#35770)

* Makes ice slippery again

* Update misc_plating.dm

* Slippery Ice Fix
2018-02-18 19:52:03 -06:00
CitadelStationBot 8f17ce586b Automatic changelog generation for PR #5577 [ci skip] 2018-02-18 19:38:36 -06:00
Poojawa f1f3905a66 Make Atmosia Lethal Again (#5577)
* Make Atmosia Lethal Again

* Update atmospherics.dm
2018-02-18 19:38:34 -06:00
Poojawa e3fbca27c3 Code owners citadel style (#5578)
* just in case.

* added jellypeople owner

* Jay senpai, you're on the list now.

* Jay senpai, you're on the list
2018-02-18 19:37:28 -06:00
LetterJay 8483f94d5f Blood Red Tie - Donator Loadout (#5579)
* donation item

* path cleanup

* ditto

* Update __donator.dm
2018-02-18 19:37:10 -06:00
CitadelStationBot 382854d4da Automatic changelog generation for PR #5580 [ci skip] 2018-02-18 19:30:21 -06:00
CitadelStationBot 773169564c [MIRROR] Fixes invincible blobs and blob nodes producing tiles after its death (#5580)
* Fixes invincible blobs and blob nodes producing tiles after its death (#35706)

* Fixes invinciblobs

* who put that there in the first place?!

* Update theblob.dm

* Fixes invincible blobs and blob nodes producing tiles after its death
2018-02-18 19:30:19 -06:00
CitadelStationBot bea3016593 Automatic changelog generation for PR #5538 [ci skip] 2018-02-18 19:26:57 -06:00
fludd12 954bb7330e Sake! (#5538)
* Sake!

🆑 Fel and LeonDuvall
add: You can now drink sake! Can be found in the bar, or made with rice
and sugar.
/🆑

Sprites and idea courtesy of LeonDuvall.
Can be made with 15u rice and 5u sugar at 400k.

* Does the thing

Modularization of vending machines would require a lot more effort than
is remotely worth for such a simple change. Fortunately, not a lot of
new alcohols are added to it often, so it should be fine.
2018-02-18 19:26:55 -06:00