shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,051 Commits 5 Branches 0 Tags
0d03e90e9fd65f33ba761eefb3ea4623cb8eb244
Commit Graph

14051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
CitadelStationBot
6ab78d46e3 Automatic changelog generation for PR #5478 [ci skip] 2018-02-18 19:26:41 -06:00
cebutris
fb43a6d0e9 Gives mineral storage access to those who need it (#5478) 
* Gives material storage access to those who need it

* Update engineering.dm

* reee tabbing

* Update tgstation.dme
 2018-02-18 19:26:39 -06:00
CitadelStationBot
09162ae64d Automatic changelog generation for PR #5576 [ci skip] 2018-02-18 19:26:17 -06:00
deathride58
0e9125eeaf makes lighting a little fancier (#5576) 2018-02-18 19:26:15 -06:00
CitadelStationBot
7039068ce6 Automatic changelog generation for PR #5558 [ci skip] 2018-02-18 19:20:46 -06:00
deathride58
af759e9849 reduces base rnd point generation rate to 1,200 points per minute (#5558) 2018-02-18 19:20:44 -06:00
Poojawa
8b529bcd6b Buffs door security. (#5574) 
* Buffs door security.

* a n n o y i n g

* oh right, obj not wires
 2018-02-18 19:20:26 -06:00
CitadelStationBot
bf3a926186 Automatic changelog generation for PR #5571 [ci skip] 2018-02-18 18:46:59 -06:00
deathride58
fb289cfa5e Merge pull request #5571 from Citadel-Station-13/upstream-merge-35739 
[MIRROR] Fixes bicycle riding
 2018-02-19 00:46:57 +00:00
deathride58
7063a07e6b Merge pull request #5564 from Citadel-Station-13/upstream-merge-35760 
[MIRROR] fixes flametrowers not being buildiable in the autolathe
 2018-02-19 00:04:04 +00:00
deathride58
8c21545dd7 Merge pull request #5572 from Citadel-Station-13/upstream-merge-35344 
[MIRROR] [READY]Fixes hitscan beams going across the station, hitscan projectiles now properly cross zlevels and generate beams.
 2018-02-18 23:40:24 +00:00
CitadelStationBot
c3f7fb219d [MIRROR] Makes the watcher wing crusher trophy less effective (#5573) 
* Makes the watcher wing crusher trophy less effective

* Makes the watcher wing crusher trophy less effective
 2018-02-18 17:40:00 -06:00
CitadelStationBot
cdd8e1e590 [MIRROR] Removes one dotty boi (#5575) 
* Removes one dotty boi

* Removes one dotty boi
 2018-02-18 17:39:37 -06:00
deathride58
dac26732e2 Update packs.dm 2018-02-18 18:32:00 -05:00
deathride58
9bb0f20467 Merge pull request #5570 from Citadel-Station-13/upstream-merge-35738 
[MIRROR] MMIs can now whisper without talking on the radio
 2018-02-18 23:31:00 +00:00
deathride58
316cfb3ab4 Merge pull request #5569 from Citadel-Station-13/upstream-merge-35756 
[MIRROR] [s] makes chemical mob spawning log
 2018-02-18 23:30:33 +00:00
CitadelStationBot
606349191e Automatic changelog generation for PR #5568 [ci skip] 2018-02-18 17:30:22 -06:00
deathride58
12e8ca50b3 Merge pull request #5568 from Citadel-Station-13/upstream-merge-35746 
[MIRROR] Actually fixes SCP 294 overlay problems
 2018-02-18 23:30:20 +00:00
CitadelStationBot
dd8d5ad3f4 Automatic changelog generation for PR #5567 [ci skip] 2018-02-18 17:30:09 -06:00
deathride58
c913ca262a Merge pull request #5567 from Citadel-Station-13/upstream-merge-35751 
[MIRROR] Crew pinpointers now fit on medical belts
 2018-02-18 23:30:07 +00:00
CitadelStationBot
3da0e4fff0 Automatic changelog generation for PR #5566 [ci skip] 2018-02-18 17:29:56 -06:00
deathride58
51ee7ae43b Merge pull request #5566 from Citadel-Station-13/upstream-merge-35581 
[MIRROR] Newliquors
 2018-02-18 23:29:54 +00:00
deathride58
96ab8e0161 Merge pull request #5565 from Citadel-Station-13/upstream-merge-35762 
[MIRROR] fixes some stuff in flametrowers
 2018-02-18 23:29:17 +00:00