shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,548 Commits 5 Branches 0 Tags
567204416b6b740ba418dfdac49a0e2d53817f80
Commit Graph
15548 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58andGitHub 567204416b Merge branch 'master' into upstream-merge-36974 2018-04-10 07:48:12 +00:00
deathride58andGitHub f33d77a073 Merge pull request #6323 from Citadel-Station-13/upstream-merge-37065 
[MIRROR] Fixes escape pods not getting to their default destination
 2018-04-10 07:47:00 +00:00
deathride58andGitHub 9647de2806 Merge pull request #6328 from Citadel-Station-13/upstream-merge-36788 
[MIRROR] Fixed paperbin dropping and fingerprints
 2018-04-10 07:20:33 +00:00
deathride58andGitHub 4cea1feb1b Update vr_sleeper.dm 2018-04-10 03:16:28 -04:00
deathride58andGitHub 96191b8b6a Update emergency.dm 2018-04-10 03:15:27 -04:00
LetterJayandGitHub 7f2c0b9a82 Merge pull request #6303 from Citadel-Station-13/synctesting 
[READY FOR REVIEW/TESTMERGE] TG sync
 2018-04-09 17:52:49 -05:00
deathride58andGitHub e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
LetterJayandGitHub dab96582bd Merge pull request #6306 from Citadel-Station-13/upstream-merge-37002 
[MIRROR] Fixes slime latching
 2018-04-09 16:40:14 -05:00
LetterJayandGitHub d1067b4271 Merge pull request #6329 from Citadel-Station-13/upstream-merge-36571 
[MIRROR] Mark appearance_flags and sight as bitflags for VV
 2018-04-09 16:39:59 -05:00
LetterJayandGitHub 7d93dec924 Merge pull request #6327 from Citadel-Station-13/upstream-merge-36915 
[MIRROR] Detective Scanner Fixes
 2018-04-09 16:39:46 -05:00
LetterJayandGitHub 80e0be6d1e Merge pull request #6326 from Citadel-Station-13/upstream-merge-37072 
[MIRROR] Fix an error message grammer
 2018-04-09 16:39:28 -05:00
LetterJayandGitHub c2ff35d28f Merge pull request #6325 from Citadel-Station-13/upstream-merge-37063 
[MIRROR] Fixes swarming runtime
 2018-04-09 16:39:10 -05:00
LetterJayandGitHub 859cf53869 Merge pull request #6324 from Citadel-Station-13/upstream-merge-37059 
[MIRROR] Makes spacemove check location.
 2018-04-09 16:38:57 -05:00
LetterJayandGitHub 8433e7b154 Merge pull request #6322 from Citadel-Station-13/upstream-merge-37042 
[MIRROR] Fixes underlying area grabbing subtypes
 2018-04-09 16:38:32 -05:00
LetterJayandGitHub ba03df8c86 Merge pull request #6321 from Citadel-Station-13/upstream-merge-37053 
[MIRROR] Fixes overflow role latejoin
 2018-04-09 16:38:14 -05:00
LetterJayandGitHub 60a72311a7 Merge pull request #6320 from Citadel-Station-13/upstream-merge-37036 
[MIRROR] Fixes an heirloom trait-related runtime that gets spammed in the logs
 2018-04-09 16:37:54 -05:00
LetterJayandGitHub 6e89bdb737 Merge pull request #6316 from Citadel-Station-13/upstream-merge-37017 
[MIRROR] Adds an are you sure dialog when pressing delete note.
 2018-04-09 16:36:53 -05:00
LetterJayandGitHub 954f1b0655 Merge pull request #6315 from Citadel-Station-13/kevinz000-patch-3 
>wiped my flavortext accidently
 2018-04-09 16:36:27 -05:00
LetterJayandGitHub 294f1fdf45 Merge pull request #6314 from Citadel-Station-13/upstream-merge-37004 
[MIRROR] Adds new drink sprites for Stinger, Grasshopper, and Quadruple/Quintuple Sec by Mickyan
 2018-04-09 16:35:58 -05:00
LetterJayandGitHub a1f70e87d5 Merge pull request #6313 from Citadel-Station-13/upstream-merge-37033 
[MIRROR] Makes revheads always show on top of the check antags listing.
 2018-04-09 16:35:43 -05:00
LetterJayandGitHub 674ab59397 Merge pull request #6312 from Citadel-Station-13/upstream-merge-37038 
[MIRROR] Fixes a very common runtime involving incorrect proc signature on MakeSlippery overrides
 2018-04-09 16:35:28 -05:00
LetterJayandGitHub 944b74b95c Merge pull request #6311 from Citadel-Station-13/upstream-merge-36991 
[MIRROR] Wrench Supermatter Shard to the ground
 2018-04-09 16:35:10 -05:00
LetterJayandGitHub 5e7c47c9eb Merge pull request #6310 from Citadel-Station-13/upstream-merge-36430 
[MIRROR] Bird and Chasm phobias
 2018-04-09 16:34:46 -05:00
Tad HardestyandCitadelStationBot 126c610ccd Mark appearance_flags and sight as bitflags for VV 2018-04-09 14:15:24 -05:00
CitadelStationBot e328c08587 Fixed paperbin dropping and fingerprints 2018-04-09 14:14:13 -05:00
Davidj361andCitadelStationBot 075a879343 Fixed paperbin dropping and fingerprints (#36788) 
* Removed parent call to stop the paperbin from dropping from being carried when getting a pen or paper.

* Found a better fix

* Better operator

* Fixed fingerprints not being created upon paper bin interaction

* Review change
 2018-04-09 14:14:13 -05:00
CitadelStationBot 0a0caf9b91 Detective Scanner Fixes 2018-04-09 13:05:30 -05:00
Davidj361andCitadelStationBot a25b8ec1be Detective Scanner Fixes (#36915) 
* Fixed notes for detective's printed report

* Added alt-click functionality to clear logs for detective scanner

* Added a right click option to detective scanner to display logs without printing them

* Made the display function as an action button.

* Review changes done

* review changes

* review changes and a bad player message fix
 2018-04-09 13:05:30 -05:00
CitadelStationBot 8e3bdaf432 Fix an error message grammer 2018-04-09 12:48:58 -05:00
Jordan BrownandCitadelStationBot f2717989c9 Fix an error message grammer 2018-04-09 12:48:58 -05:00
AnturKandCitadelStationBot bdf2f65a8f Fixes swarming runtime 2018-04-09 11:06:28 -05:00
CitadelStationBot 41bca1cd3c Makes spacemove check location. 2018-04-09 11:06:17 -05:00
AnturKandCitadelStationBot daeca4892e Makes spacemove check location. 2018-04-09 11:06:17 -05:00
Emmett GainesandCitadelStationBot fd8a80d6cb Fixes escape pods not getting to their default destination 2018-04-09 05:24:55 -05:00
CitadelStationBot 7ad9babb25 Fixes underlying area grabbing subtypes 2018-04-09 05:22:42 -05:00
vuonojenmustaturskaandCitadelStationBot 0372a042ad Merge pull request #37042 from ninjanomnom/just-the-area-I-needed 
Fixes underlying area grabbing subtypes
 2018-04-09 05:22:42 -05:00
LetterJayandGitHub 6fb9142fd1 Update vr_sleeper.dm 2018-04-09 05:17:48 -05:00
CitadelStationBot 74c66dfa79 Fixes overflow role latejoin 2018-04-09 05:10:15 -05:00
KorPhaeronandCitadelStationBot 46b7b95897 Finishes overflow roles (#37053) 2018-04-09 05:10:14 -05:00
CitadelStationBot dfc0e195a9 Fixes an heirloom trait-related runtime that gets spammed in the logs 2018-04-09 04:52:40 -05:00
vuonojenmustaturskaandCitadelStationBot 2c275be1c1 Fixes an heirloom trait-related runtime that gets spammed in the logs (#37036) 
* honk

* return

* Update negative.dm

* Update _trait.dm
 2018-04-09 04:52:40 -05:00
CitadelStationBot 62a1773409 Adds an are you sure dialog when pressing delete note. 2018-04-08 23:40:37 -05:00
Dax DupontandCitadelStationBot 37b8772f1c Adds an are you sure dialog when pressing delete note. (#37017) 
* Adds an are you sure dialog when pressing delete note.

* The true is out there
 2018-04-08 23:40:36 -05:00
kevinz000andGitHub 820f4e7998 Update preferences.dm 2018-04-08 19:40:57 -07:00
kevinz000andGitHub cd38bccf01 why 2018-04-08 19:40:28 -07:00
kevinz000andGitHub 83f1332229 >wiped my flavortext accidently 2018-04-08 19:39:06 -07:00
Ashe HiggsandCitadelStationBot 682db30746 Adds new drink sprites for Stinger, Grasshopper, and Quadruple/Quintuple Sec by Mickyan 2018-04-08 19:26:38 -05:00
CitadelStationBot 8665a453fc Makes revheads always show on top of the check antags listing. 2018-04-08 19:23:24 -05:00
AnturKandCitadelStationBot a3f873e4b2 Makes revheads always show on top of the check antags listing. (#37033) 2018-04-08 19:23:24 -05:00
CitadelStationBot a2c1219f6f Fixes a very common runtime involving incorrect proc signature on MakeSlippery overrides 2018-04-08 19:22:14 -05:00