cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-02-09 07:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,151 Commits 12 Branches 0 Tags
09feaedbbfcf173b2403f4b2d19a09490d2d783b
Commit Graph

3151 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
09feaedbbf Bump pillow from 7.1.0 to 8.1.1 in /tools/mapmerge2 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 7.1.0 to 8.1.1.
- [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/7.1.0...8.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-19 03:43:48 +00:00
QuoteFox
42b1d15981 Revert "Merge pull request #1035 from DragonTrance/various-fixes" 
This reverts commit 8436f16c54, reversing
changes made to f512b6d42e.
 2021-03-17 23:45:38 +00:00
QuoteFox
8436f16c54 Merge pull request #1035 from DragonTrance/various-fixes 
fixes various bugs and runtimes
 2021-03-17 21:30:54 +00:00
DragonTrance
9860480e91 fixes various bugs and runtimes 2021-03-17 12:31:18 -07:00
QuoteFox
f512b6d42e Merge pull request #1034 from CapnMachaddish/noodle-science-2.2 
More snake parts
 2021-03-15 06:36:11 +00:00
Ulysses MacHaddish
61f20c4b7d tiny tweak 2021-03-15 00:39:14 -05:00
CapnMachaddish
c335ade119 once more unto the breach 2021-03-15 00:36:50 -05:00
QuoteFox
2f7e61c472 Merge pull request #1032 from ToonClyde/gecko-tail 
Gecko tail and markings
 2021-03-15 01:53:11 +00:00
QuoteFox
bfae4b49ca Merge pull request #1031 from DragonTrance/tibby 
smol gentleman organs always hide under clothing
 2021-03-15 01:52:55 +00:00
ToonClyde
c2508d9c26 Gecko tail and markings 2021-03-13 00:10:15 -07:00
DragonTrance
ef819d7bae comment 2021-03-11 22:07:51 -07:00
DragonTrance
2c781e48f1 size 4 => size 3 2021-03-11 22:06:56 -07:00
DragonTrance
ed6bbed38f smol organs always hide under clothing 2021-03-11 21:59:02 -07:00
QuoteFox
322c33785b Merge pull request #1029 from DragonTrance/fix-circuit-examine 
fixes circuit examining
 2021-03-11 15:55:13 +00:00
QuoteFox
d2e5ced155 Merge pull request #1025 from quotefox/dependabot/npm_and_yarn/tgui/elliptic-6.5.4 
Bump elliptic from 6.5.3 to 6.5.4 in /tgui
 2021-03-11 15:53:56 +00:00
Dahlular
99d5bdf985 Merge pull request #1028 from DragonTrance/blacklist-events 
Events now have map blacklists
 2021-03-11 06:28:07 -07:00
DragonTrance
4376ab5a5e fixes circuit examining 2021-03-10 18:05:36 -07:00
DragonTrance
4655b5c62d Update _event.dm 2021-03-10 13:32:21 -07:00
Dahlular
c8d0be0778 Merge pull request #1027 from CapnMachaddish/FUCK 
Removes 'bot (securitron and medibot) voice modules from Integrated Circuitry
 2021-03-09 22:41:43 -07:00
CapnMachaddish
16110c2305 I never liked these anyway 2021-03-09 23:22:35 -06:00
QuoteFox
3347005847 Merge pull request #1023 from DragonTrance/loadout-stufffff 
More loadout-related content
 2021-03-09 23:31:38 +00:00
DragonTrance
a219de1042 Update uniform.dm 2021-03-09 16:28:45 -07:00
QuoteFox
741284dcf3 Merge pull request #1024 from DragonTrance/ree-mice 
Gives felinids like and dislike foods
 2021-03-09 21:22:02 +00:00
dependabot[bot]
c27a07ca3f Bump elliptic from 6.5.3 to 6.5.4 in /tgui 
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-09 18:37:24 +00:00
DragonTrance
5461e54191 felinids have liked and disliked foods now 2021-03-09 10:21:27 -07:00
DragonTrance
ae9b09a118 more loadout preferences 2021-03-09 09:50:07 -07:00
QuoteFox
9e9664e7a3 Merge pull request #1021 from DragonTrance/loadout-equip 
Loadout equipment override job outfit
 2021-03-09 12:12:34 +00:00
QuoteFox
b11f446be0 Merge pull request #1020 from DragonTrance/loadout-appears-in-character-setup 
the thing we never knew we needed so badly
 2021-03-09 12:12:18 +00:00
QuoteFox
a9c9045a77 Merge pull request #1019 from DragonTrance/antag-preferences-stuff 
More antag preference options
 2021-03-09 12:12:02 +00:00
Dahlular
cda6cfb448 Merge pull request #1022 from Chemlight/Centcom-but-with-more-room 
Update Centcom
 2021-03-08 21:06:51 -07:00
Chemlight
0f0b81101c Update Centcom 
Gave Centcom an office area, with a admin room along with some dorms for visitors (staff members).  Along with a new docking area to CC instead of the recovery boat.
 2021-03-08 20:00:12 -08:00
DragonTrance
49bbcefba8 try this again 2021-03-08 15:20:23 -07:00
DragonTrance
a2a11ce30b Revert "loadouts override job outfits" 
This reverts commit 6d9c5213fe.
 2021-03-08 14:14:53 -07:00
DragonTrance
6d9c5213fe loadouts override job outfits 2021-03-08 11:22:07 -07:00
DragonTrance
893b5e1af4 Update preferences_setup.dm 2021-03-08 10:19:44 -07:00
DragonTrance
a1c64cba48 quickly change antag prefs across characters 2021-03-07 16:58:59 -07:00
Dahlular
0ae6fa6924 Merge pull request #1018 from CapnMachaddish/noodle-science 
An actual fucking cobra hood
 2021-03-06 18:10:23 -07:00
CapnMachaddish
35c47d3f84 Some tiny fixes to my synth parts. 
I should have done this in a separate PR but fuck it.
 2021-03-06 19:04:53 -06:00
CapnMachaddish
69570fe511 Snek 
I totally don't have a cobra fetish, of course not!
 2021-03-06 19:04:24 -06:00
QuoteFox
54666600f6 Merge pull request #1015 from DragonTrance/traitor-preferences 
Separate Antagonist Preferences for Characters
 2021-03-05 13:23:38 +00:00
QuoteFox
17cfc0f5a3 Merge pull request #1016 from DragonTrance/separate-dragon-blood-abilities 
Separates dragon's blood abilities and makes it more common
 2021-03-05 13:23:28 +00:00
QuoteFox
389d83ba99 Merge pull request #1017 from DragonTrance/flags 
Mob biotype optimization
 2021-03-05 13:23:13 +00:00
QuoteFox
9d008add70 Merge pull request #1014 from lyricalpaws/master 
Various lavaland related changes
 2021-03-05 13:23:02 +00:00
QuoteFox
a16c5652c9 Merge pull request #1013 from DragonTrance/food-tray 
Food Trays hold more and fixes Donk Pocket Boxes
 2021-03-05 13:22:36 +00:00
Chloe
a1d566f57d Update transformation.dm 2021-03-04 23:43:56 +00:00
DragonTrance
301f829fe1 Update _disease.dm 2021-03-04 06:12:36 -07:00
DragonTrance
77eac2405a conflict 2021-03-03 11:18:30 -07:00
DragonTrance
063712017b Update nanites.dm 2021-03-03 11:10:38 -07:00
DragonTrance
4b931c5e92 mob_biotypes are now flags instead of lists 2021-03-03 11:08:36 -07:00
DragonTrance
87ea0bb72f dragon's blood tweaking 2021-03-02 20:30:26 -07:00