cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-21 20:16:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,241 Commits 12 Branches 0 Tags
bcb174eafb0a0c9a76e52f3464d8384150aaeb7c
Commit Graph
3241 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
QuoteFox bcb174eafb Revert "Merge pull request #1057 from lukevale/master" 
This reverts commit 8f5ad4e860, reversing
changes made to bcc80b9800.
 2021-03-27 10:56:06 +00:00
QuoteFoxandGitHub 8f5ad4e860 Merge pull request #1057 from lukevale/master 
A quick fix to saving. Should now save properly.
 2021-03-26 13:41:32 +00:00
lukevale a0de61cd90 A quick fix to saving. Should now save properly. 2021-03-26 02:30:11 -05:00
QuoteFoxandGitHub bcc80b9800 Merge pull request #1056 from DragonTrance/apparition-antagonist 
screaming
 2021-03-26 06:02:16 +00:00
DragonTrance 99739f48fe screaming 2021-03-25 23:00:58 -07:00
QuoteFox bf7abb778d Revert "Revert "Merge pull request #1055 from DragonTrance/apparition-antagonist"" 
This reverts commit 04d01ed851.
 2021-03-26 06:00:13 +00:00
QuoteFox 04d01ed851 Revert "Merge pull request #1055 from DragonTrance/apparition-antagonist" 
This reverts commit 5488e82e13, reversing
changes made to fa04b528f9.
 2021-03-26 05:59:30 +00:00
QuoteFoxandGitHub 5488e82e13 Merge pull request #1055 from DragonTrance/apparition-antagonist 
Wendigo (Early/Testing Stages)
 2021-03-26 05:44:39 +00:00
DragonTrance 1e3c4b91d6 wendigo antag (admemery atm) 2021-03-25 22:29:29 -07:00
QuoteFoxandGitHub fa04b528f9 Merge pull request #1037 from quotefox/dependabot/pip/tools/mapmerge2/pillow-8.1.1 
Bump pillow from 7.1.0 to 8.1.1 in /tools/mapmerge2
 2021-03-26 02:45:43 +00:00
QuoteFoxandGitHub 05f4bbade5 Merge pull request #1030 from quotefox/dependabot/npm_and_yarn/tgui-next/elliptic-6.5.4 
Bump elliptic from 6.5.3 to 6.5.4 in /tgui-next
 2021-03-26 02:45:34 +00:00
QuoteFoxandGitHub e57ff2e49c Merge pull request #1054 from CapnMachaddish/Door-Sounds-2.1 
New door sounds, take 2
 2021-03-26 02:44:46 +00:00
QuoteFoxandGitHub d2db758f43 Merge pull request #1053 from lukevale/master 
Magic spookey gradient code. Somehow works.
 2021-03-26 02:43:53 +00:00
QuoteFoxandGitHub 5cc18fa8fb Merge pull request #1052 from ToonClyde/a-few-tweaks-for-medical 
Rotated doors and blast doors
 2021-03-26 02:43:46 +00:00
CapnMachaddish 786b05579c Doors and corners, kid... doors and corners. 2021-03-25 20:00:23 -05:00
lukevale 6c2ca26e86 final touches. 2021-03-25 16:56:29 -05:00
ToonClyde 6e02198762 rotated doors and blast doors 2021-03-25 14:49:08 -07:00
lukevale bbd60b8c0f the fixening or something 2021-03-25 15:01:31 -05:00
lukevale c5d8bb5fb3 Revert "Revert "Hair_gradients part one."" 
This reverts commit 90c1e4193e.
 2021-03-25 14:59:57 -05:00
lukevale f5cf7f6f5a Merge remote-tracking branch 'upstream/master' 2021-03-25 14:59:52 -05:00
lukevale a32444dae7 gradient part 2, the fix 2021-03-25 14:57:06 -05:00
QuoteFox 03e3d5abcc fixes 2021-03-25 15:06:40 +00:00
QuoteFox f2f4e771d9 fixes 2021-03-25 15:03:38 +00:00
QuoteFox afc61a2d57 more fixes 2021-03-25 14:42:16 +00:00
QuoteFox 90c1e4193e Revert "Hair_gradients part one." 
This reverts commit 703ae30ec1.
 2021-03-25 13:05:57 +00:00
QuoteFox 29b3f0293e more fixes 2021-03-25 12:58:27 +00:00
QuoteFox 7e11e97ace flashy stuff 2021-03-25 12:48:46 +00:00
QuoteFox d22ef34523 fixes 2021-03-25 12:12:48 +00:00
QuoteFox a1644811ac Ported Map; Lambda Station 2021-03-25 12:06:32 +00:00
QuoteFoxandGitHub e698a8a30c Merge pull request #1051 from lukevale/master 
Hair Gradients. The headache.
 2021-03-25 10:58:54 +00:00
lukevale 703ae30ec1 Hair_gradients part one. 2021-03-25 04:58:38 -05:00
QuoteFoxandGitHub b949054b1f Merge pull request #1048 from CapnMachaddish/anti-wazard-gear 
Anti wazard gear
 2021-03-24 22:08:03 +00:00
QuoteFoxandGitHub c962b73e2f Merge pull request #1050 from lyricalpaws/master 
More changes to medical
 2021-03-24 15:28:13 +00:00
Chloe Carver-Brown 9a4962c5e3 bonk 2021-03-24 14:27:09 +00:00
QuoteFoxandGitHub effd382a90 Merge pull request #1049 from lyricalpaws/master 
Small changes to the psych office
 2021-03-24 12:54:48 +00:00
Chloe Carver-Brown 655afd0dfe minor change to psych office 2021-03-24 12:46:49 +00:00
ChloeandGitHub 5b7f9c4633 Merge pull request #11 from quotefox/master 
update
 2021-03-24 12:06:30 +00:00
QuoteFox 8e15edf08a cigs no longer make a mountain of ash when put out. 2021-03-24 11:53:01 +00:00
QuoteFox f0e7fa69b7 Fixed stat panel resetting theme on relog. 2021-03-24 10:43:29 +00:00
QuoteFox 41c03378fc revert reverb (broken) 
revert reverb bro
 2021-03-23 20:37:15 +00:00
CapnMachaddish 06a38d57a2 Now available from your local interdimensional dragon shopkeeper 2021-03-23 14:25:11 -05:00
CapnMachaddish 72a3bc12a6 gloves 2021-03-23 14:05:05 -05:00
QuoteFox 92f281373d Revert "Merge pull request #1045 from CapnMachaddish/door-sounds-2.0" 
This reverts commit 43a0ce2b0a, reversing
changes made to 9594a65526.
 2021-03-23 18:56:27 +00:00
QuoteFox 35d4666715 Revert "Sounds, New Announcer, announce uses local reverb" 
This reverts commit f2da13b759.
 2021-03-23 18:55:58 +00:00
QuoteFox 04339e805c Revert "airlock cycling." 
This reverts commit 1cebaa753e.
 2021-03-23 18:55:55 +00:00
QuoteFox e77f3ee585 Revert "slight tweak" 
This reverts commit b56a7f817c.
 2021-03-23 18:55:48 +00:00
QuoteFoxandGitHub c4ced3d443 Merge pull request #1044 from Chemlight/Centcom-fixes 
Update Centcom
 2021-03-23 18:14:12 +00:00
QuoteFoxandGitHub fa3e559b78 Merge pull request #1046 from lyricalpaws/master 
Adds psychologist role, changes Box med a bit
 2021-03-23 18:13:40 +00:00
QuoteFoxandGitHub d320536b97 Merge pull request #1047 from CapnMachaddish/door-sounds-2.0 
slight tweak
 2021-03-23 17:53:43 +00:00
CapnMachaddish b56a7f817c slight tweak 2021-03-23 12:52:02 -05:00