shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,182 Commits 5 Branches 0 Tags
a7781f77fd43f1f36bbd64dad49cf07ddd04d67a
Commit Graph

43182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
silicons a7781f77fd Merge pull request #14802 from bunny232/atmosfoam 
Atmos resin buff? fix?
 2021-06-09 11:15:56 -07:00
CitadelStationBot 31b544dc67 Automatic changelog generation for PR #14805 [ci skip] 2021-06-09 13:15:41 -05:00
silicons 2402c56bfc Merge pull request #14805 from bunny232/hydroslimejelly 
Hydroponics slimejelly recipe from tg
 2021-06-09 11:15:36 -07:00
silicons 460026f3bc Merge pull request #14774 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/ws-7.4.6 
Bump ws from 7.4.3 to 7.4.6 in /tgui
 2021-06-09 11:15:22 -07:00
silicons 5ffceb376d Merge pull request #14812 from Citadel-Station-13/dependabot/pip/tools/pillow-8.2.0 
Bump pillow from 8.1.1 to 8.2.0 in /tools
 2021-06-09 11:15:11 -07:00
CitadelStationBot 87e6b3992f Automatic changelog generation for PR #14809 [ci skip] 2021-06-09 13:15:03 -05:00
silicons c0e3b8d5ef Merge pull request #14809 from SandPoot/speak-nice-yes 
Centralizes borg speech and uses some of the icons for the typing indicator
 2021-06-09 11:15:01 -07:00
silicons 259aed7903 Merge pull request #14783 from DeltaFire15/spec-species-color 
Colors species names depending on traits
 2021-06-09 11:14:48 -07:00
silicons fe8323f503 Merge pull request #14747 from keronshb/reinforcedplasmawindowsteps 
Adds more deconstruction steps to stronger windows.
 2021-06-09 11:13:13 -07:00
CitadelStationBot 03e71c36a5 Automatic changelog generation for PR #14712 [ci skip] 2021-06-09 13:12:26 -05:00
silicons 7963dce24e Merge pull request #14712 from keronshb/hereticadjustments 
Minor Heretic rework and fixes (Includes shifting realities and more)
 2021-06-09 11:12:23 -07:00
CitadelStationBot 0a2f05b5dd Automatic changelog generation for PR #14160 [ci skip] 2021-06-09 13:10:20 -05:00
silicons 716c2a04e4 Merge pull request #14160 from keronshb/motivation 
Adds a new traitor item, Motivation (Part 1)
 2021-06-09 11:10:17 -07:00
Changelogs 103731ed05 Automatic changelog compile [ci skip] 2021-06-09 00:26:52 +00:00
dependabot[bot] 413bb15961 Bump pillow from 8.1.1 to 8.2.0 in /tools 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.1.1...8.2.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-08 23:13:41 +00:00
SandPoot b0940456f5 upload files 2021-06-08 13:13:22 -03:00
bunny232 1a72070f5c slimejelly 
a
 2021-06-07 21:44:33 -04:00
Changelogs 614c3192e5 Automatic changelog compile [ci skip] 2021-06-08 00:43:09 +00:00
bunny232 7826ced174 Update effects_foam.dm 2021-06-06 12:54:07 -04:00
Changelogs e24ecea492 Automatic changelog compile [ci skip] 2021-06-06 00:41:17 +00:00
Lin 697fffd347 Merge pull request #14792 from bunny232/meta-pool 
More reasonable SUCC for the meta pool drain.
 2021-06-05 16:27:12 -05:00
CitadelStationBot f3f5b0d605 Automatic changelog generation for PR #14793 [ci skip] 2021-06-05 16:26:23 -05:00
Lin 27d7b4b564 Merge pull request #14793 from bunny232/pool-fog 
Pools now get misty at warm insteaed of scalding
 2021-06-05 16:26:21 -05:00
Lin 06bcb7c904 Merge pull request #14795 from MrJWhit/boxstation-touchups2 
Boxstation touchups2
 2021-06-05 16:21:12 -05:00
Lin 5f6cb40d16 Merge pull request #14773 from Putnam3145/fix-activity-typo 
Fixes an activity display issue
 2021-06-04 21:37:42 -05:00
Changelogs 4b3a4d99dc Automatic changelog compile [ci skip] 2021-06-05 00:48:25 +00:00
CitadelStationBot 560ce54d59 Automatic changelog generation for PR #14763 [ci skip] 2021-06-04 17:37:59 -05:00
Putnam3145 b757e22956 Merge pull request #14763 from zeroisthebiggay/dogears 
adds floppy dog ears that aren't obscenely dark
 2021-06-04 15:37:57 -07:00
MrJWhit d3f6b69a86 Update BoxStation.dmm 2021-06-04 13:26:06 -04:00
CitadelStationBot 2ec1abe71e Automatic changelog generation for PR #14786 [ci skip] 2021-06-04 12:13:39 -05:00
Lin a31c99e361 Merge pull request #14786 from Arturlang/fixes_float 
Fixes float()
 2021-06-04 12:13:36 -05:00
CitadelStationBot 9acd1ed386 Automatic changelog generation for PR #14788 [ci skip] 2021-06-04 10:29:45 -05:00
silicons 4b3e33bb8a Merge pull request #14788 from coderbus13/master 
Pubbystation toxins burn chamber fix
 2021-06-04 08:29:43 -07:00
Changelogs 3fccc79483 Automatic changelog compile [ci skip] 2021-06-04 01:10:04 +00:00
bunny232 720966f31e Misty~ 2021-06-03 19:10:46 -04:00
bunny232 e4c01b3f74 Woopsie, right vars are set now 2021-06-03 18:49:43 -04:00
bunny232 4b5b6a9063 Update MetaStation.dmm 2021-06-03 18:38:59 -04:00
coderbus13 2cfbee96ea Delete temp 2021-06-03 01:09:41 -05:00
coderbus13 9df9828666 Add files via upload 2021-06-03 01:08:36 -05:00
coderbus13 8ca433fadb Create temp 2021-06-03 01:08:20 -05:00
coderbus13 8dff4fa301 Delete _maps/map_files/PubbyStation directory 
all my homies hate webedit
 2021-06-03 01:06:35 -05:00
CitadelStationBot ef4ea8b0da Automatic changelog generation for PR #14772 [ci skip] 2021-06-02 21:50:36 -05:00
Lin c2c2825027 Merge pull request #14772 from Putnam3145/fix-sniper-bad 
Makes sniper zooming work
 2021-06-02 21:50:33 -05:00
CitadelStationBot 36284922da Automatic changelog generation for PR #14785 [ci skip] 2021-06-02 20:23:09 -05:00
Lin 24f7576b92 Merge pull request #14785 from MrJWhit/metastation-fix 
Metastation atmos fix
 2021-06-02 20:23:06 -05:00
Changelogs 8a4c6c4cf4 Automatic changelog compile [ci skip] 2021-06-03 01:12:16 +00:00
CitadelStationBot c869f9b53a Automatic changelog generation for PR #14784 [ci skip] 2021-06-02 19:44:57 -05:00
Lin 0ead4e0bbb Merge pull request #14784 from TripleShades/sigh-pubby 
Tiny Pubby Additions
 2021-06-02 19:44:55 -05:00
Lin 5876399d14 Merge pull request #14723 from bunny232/delta-ce-office-update 
Delta ce office rearrangement
 2021-06-02 19:41:45 -05:00
CitadelStationBot b341c184b5 Automatic changelog generation for PR #14782 [ci skip] 2021-06-02 19:41:25 -05:00