shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,326 Commits 5 Branches 0 Tags
5142076ea77ab12b3d324e674df7eab8db7e25bd
Commit Graph
15326 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jordan BrownandCitadelStationBot 5142076ea7 Merge pull request #36901 from KorPhaeron/beeper 
Fixes morgue beeper message
 2018-04-02 08:32:33 -05:00
LetterJayandGitHub 7de2934a26 Merge pull request #6210 from Citadel-Station-13/upstream-merge-36834 
[MIRROR] Removes advanced darkness
 2018-04-02 06:58:18 -05:00
LetterJayandGitHub 89f382df4e Merge pull request #6025 from Poojawa/increase-age-gap 
Increase age gap
 2018-04-02 06:57:24 -05:00
LetterJay aaeb289c78 Automatic changelog generation for PR #6131 [ci skip] 2018-04-02 05:50:13 -05:00
LetterJayandGitHub 5dbb046757 Merge pull request #6131 from deathride58/gearIDwhitelists 
Adds support for manipulating gear entries via config
 2018-04-02 05:50:10 -05:00
LetterJayandGitHub 66420d8504 Merge pull request #6116 from cebutris/moreminerloot 
adds lavaknight corpses to legion drops
 2018-04-02 05:47:30 -05:00
LetterJay 9c4a589f03 Automatic changelog generation for PR #6174 [ci skip] 2018-04-02 05:43:22 -05:00
LetterJayandGitHub b09d271e17 Merge pull request #6174 from Michiyamenotehifunana/polychrome-Cloth-Globalize 
(Partially) Globalizes Polychromic Clothing Code
 2018-04-02 05:43:18 -05:00
LetterJayandGitHub 9045de2c90 Merge pull request #6204 from Citadel-Station-13/upstream-merge-36873 
[MIRROR] Comms console fix - no more refreshing every 2 seconds while trying to purchase a shuttle.
 2018-04-02 05:41:19 -05:00
LetterJayandGitHub af2cc17248 Merge pull request #6232 from Citadel-Station-13/upstream-merge-36886 
[MIRROR] servant blockers no longer glitch out when deleted without force
 2018-04-02 05:39:55 -05:00
LetterJayandGitHub daf2e6efa7 Merge pull request #6231 from Citadel-Station-13/upstream-merge-36721 
[MIRROR] Fix crafting tools tooltips
 2018-04-02 05:23:50 -05:00
LetterJayandGitHub 242fd0556d Merge pull request #6230 from Citadel-Station-13/upstream-merge-36875 
[MIRROR] adds a sprite to the "show roundend report" button
 2018-04-02 05:22:20 -05:00
CitadelStationBot 5161f9b8fa servant blockers no longer glitch out when deleted without force 2018-04-02 02:13:03 -05:00
kevinz000andCitadelStationBot 91f9596eec damnit (#36886) 2018-04-02 02:13:03 -05:00
CitadelStationBotandPoojawa dc7585fabf [MIRROR] Moves quick equip hotkey up to /mob (#6229) 
* Moves quick equip hotkey up to /mob

* Merge pull request #36869 from RandomMarine/e

Moves quick equip hotkey up to /mob
 2018-04-02 01:36:42 -05:00
CitadelStationBot 494c3e076d Fix crafting tools tooltips 2018-04-01 22:02:46 -05:00
Jordan BrownandCitadelStationBot 4c97bc84e7 Merge pull request #36721 from GrayRachnid/fix-crafting-tools 
Fix crafting tools tooltips
 2018-04-01 22:02:46 -05:00
CitadelStationBot c5da65b20b adds a sprite to the "show roundend report" button 2018-04-01 21:51:08 -05:00
MrDoomBringerandCitadelStationBot b87addc531 adds a sprite to the "show roundend report" button (#36875) 
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* bingo bongo i dont wanna leave the congo i REFUSE to go

* wjhon approval
 2018-04-01 21:51:08 -05:00
LetterJayandGitHub a9c91b4d00 Merge pull request #6127 from Citadel-Station-13/upstream-merge-36689 
[MIRROR] Hotfix for #36688 - Excludes non-carbon-based life from the disco machine's dance4 proc to fix pAI "resting/getting up" chat spam
 2018-04-01 19:51:58 -05:00
LetterJayandGitHub 022ac2e6c3 Merge pull request #6178 from Citadel-Station-13/shit 
sanity
 2018-04-01 19:51:39 -05:00
LetterJayandGitHub 7682dd2a7f Merge pull request #6188 from Citadel-Station-13/upstream-merge-36822 
[MIRROR] Fixes monkey retaliation from beyond the grave
 2018-04-01 19:51:17 -05:00
LetterJayandGitHub a5ec18d566 Merge pull request #6185 from Citadel-Station-13/upstream-merge-36816 
[MIRROR] Fixes mutant bodypart assignments
 2018-04-01 19:50:58 -05:00
LetterJayandGitHub dd579e35bc Merge pull request #6183 from Citadel-Station-13/upstream-merge-36548 
[MIRROR] Added a new ability to sentient diseases
 2018-04-01 19:50:43 -05:00
LetterJayandGitHub 28e188cbbe Merge pull request #6169 from Citadel-Station-13/upstream-merge-36722 
[MIRROR] Fix 512-only code in recent conveyor belt fix
 2018-04-01 19:49:55 -05:00
LetterJayandGitHub 77a4b58c60 Merge pull request #6132 from Michiyamenotehifunana/gimme-da-blasta 
Adds Particle Blasters to armories
 2018-04-01 19:49:27 -05:00
LetterJayandGitHub 31bb211cb3 Update communications.dm 2018-04-01 19:48:15 -05:00
LetterJayandGitHub 57ed2fcb70 Merge pull request #6215 from Citadel-Station-13/iconstate 
icon state fix for TechDemon core
 2018-04-01 17:48:13 -05:00
LetterJayandGitHub 8bd10ebb2e Merge pull request #6216 from Citadel-Station-13/upstream-merge-36850 
[MIRROR] Pubby: fixes bomb testing site cam networks
 2018-04-01 17:47:59 -05:00
LetterJayandGitHub 661f8b3468 Merge pull request #6217 from Citadel-Station-13/upstream-merge-36851 
[MIRROR] Adds singular_name to BS polycrystals
 2018-04-01 17:47:37 -05:00
LetterJayandGitHub b6873e9bd4 Merge pull request #6219 from Citadel-Station-13/upstream-merge-36857 
[MIRROR] you can now walk through abductor table frames
 2018-04-01 17:47:07 -05:00
LetterJayandGitHub 982eef4158 Merge pull request #6227 from Citadel-Station-13/upstream-merge-36524 
[MIRROR] Walls made entirely of wood!
 2018-04-01 17:46:45 -05:00
LetterJayandGitHub 7d1746a84a Merge pull request #6226 from Citadel-Station-13/upstream-merge-36865 
[MIRROR] adds a "the" to robo's supervisor in job description
 2018-04-01 17:46:22 -05:00
LetterJayandGitHub 2177a51a09 Merge pull request #6225 from Citadel-Station-13/upstream-merge-36856 
[MIRROR] The y/n confirmation for laying eggs or resin over vents as a xeno is no longer reversed
 2018-04-01 17:46:03 -05:00
LetterJayandGitHub f5b2315531 Merge pull request #6223 from Citadel-Station-13/upstream-merge-36885 
[MIRROR] Fixes revenants being unable to siphon after failing a siphon
 2018-04-01 17:45:41 -05:00
LetterJayandGitHub a11f0c4eb7 Merge pull request #6222 from Citadel-Station-13/upstream-merge-36829 
[MIRROR] [s]Minor Refactor of click code, anti-auto clicker protection
 2018-04-01 17:45:21 -05:00
LetterJayandGitHub 64705aaf07 Merge pull request #6221 from Citadel-Station-13/upstream-merge-36864 
[MIRROR] Cleaned up tile pointer circuit and converted to absolute coordinates
 2018-04-01 17:45:04 -05:00
LetterJayandGitHub 954027e16d Merge branch 'master' into upstream-merge-36722 2018-04-01 17:44:41 -05:00
LetterJayandGitHub 6b50b35897 Merge pull request #6140 from Citadel-Station-13/upstream-merge-36743 
[MIRROR] Fixes modular computer ui_interact runtime
 2018-04-01 17:41:34 -05:00
LetterJayandGitHub 9bb405d27c Merge pull request #6147 from Citadel-Station-13/upstream-merge-36738 
[MIRROR] Nutriment can get you fat again.
 2018-04-01 17:40:38 -05:00
LetterJayandGitHub c4ac6e63f7 Update combat.dm 2018-04-01 17:39:41 -05:00
LetterJayandGitHub 5c817dfd01 Update humans.dm 2018-04-01 17:39:26 -05:00
LetterJayandGitHub d63ff01364 Update components.dm 2018-04-01 17:38:50 -05:00
CitadelStationBot 34bb9d51b8 Walls made entirely of wood! 2018-04-01 12:24:33 -05:00
fludd12andCitadelStationBot 7826515aed Walls made entirely of wood! (#36524) 
* Buffs Lifebringers (And kind of botany.)

* Retools staff to use earthsblood as fuel, can now remove rock walls

* No more blessings!

* Dismantle the means of production.
 2018-04-01 12:24:33 -05:00
CitadelStationBot 216da37e08 adds a "the" to robo's supervisor in job description 2018-04-01 11:16:57 -05:00
Jordan BrownandCitadelStationBot 4d0df4ab16 Merge pull request #36865 from factoryman942/master 
adds a "the" to robo's supervisor in job description
 2018-04-01 11:16:57 -05:00
CitadelStationBot 626f584ef4 The y/n confirmation for laying eggs or resin over vents as a xeno is no longer reversed 2018-04-01 11:11:38 -05:00
Jordan BrownandCitadelStationBot 9b8ca10da2 Merge pull request #36856 from iskyp/resin+egg 
The y/n confirmation for laying eggs or resin over vents as a xeno is no longer reversed
 2018-04-01 11:11:38 -05:00
CitadelStationBot 4e9287029a Fixes revenants being unable to siphon after failing a siphon 2018-04-01 08:33:39 -05:00