shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,885 Commits 5 Branches 0 Tags
b0c94deff3e15a76743afef26c58f309d44a81b2
Commit Graph
12885 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub 76fab4fccf Revert "[MIRROR] Fix old usages of trait introduced by the trait merge" 2018-01-24 23:14:51 -06:00
LetterJay 41adb46c2a fixes travis 2018-01-24 21:51:02 -06:00
CitadelStationBot 81af4a330c Automatic changelog generation for PR #5095 [ci skip] 2018-01-24 21:45:53 -06:00
LetterJayandGitHub d73cd1d35f Merge pull request #5095 from Citadel-Station-13/upstream-merge-34752 
[MIRROR] Clown traitors can buy clown bombs now
 2018-01-24 21:45:51 -06:00
LetterJayandGitHub 5c32347a9f Merge pull request #5094 from Citadel-Station-13/upstream-merge-34912 
[MIRROR] Forces test run to run with a set random seed
 2018-01-24 21:45:41 -06:00
LetterJayandGitHub a090f2823d Merge pull request #5093 from Citadel-Station-13/upstream-merge-34827 
[MIRROR] Spawns a pen-uplink if you don't have one /w pen pref.
 2018-01-24 21:45:29 -06:00
CitadelStationBot ca47abdedb Automatic changelog generation for PR #5092 [ci skip] 2018-01-24 21:45:18 -06:00
LetterJayandGitHub 50c3debdcf Merge pull request #5092 from Citadel-Station-13/upstream-merge-34383 
[MIRROR] You can now defib monkeys
 2018-01-24 21:45:16 -06:00
LetterJayandGitHub 7fcce308b6 Merge pull request #5084 from Citadel-Station-13/upstream-merge-34894 
[MIRROR] Fix old usages of trait introduced by the trait merge
 2018-01-24 21:44:59 -06:00
CitadelStationBot 4b414fe8c7 Automatic changelog generation for PR #5091 [ci skip] 2018-01-24 21:44:23 -06:00
LetterJayandGitHub 1dffa54809 Merge pull request #5091 from Citadel-Station-13/upstream-merge-34623 
[MIRROR] Makes templates able to use PlaceOnTop
 2018-01-24 21:44:21 -06:00
LetterJayandGitHub cd17afba45 Update preferences.dm 2018-01-24 21:44:00 -06:00
LetterJayandGitHub c30127d0d5 Merge pull request #5089 from Citadel-Station-13/upstream-merge-34841 
[MIRROR] Fixes derelict area issues
 2018-01-24 21:43:24 -06:00
LetterJayandGitHub 0c43d1ef92 Merge pull request #5088 from Citadel-Station-13/upstream-merge-34838 
[MIRROR] Fixes poly's ghost SM spam
 2018-01-24 21:43:07 -06:00
LetterJayandGitHub c2df8bbacc Merge pull request #5087 from Citadel-Station-13/upstream-merge-34848 
[MIRROR] Adds new landmark icons
 2018-01-24 21:42:12 -06:00
LetterJayandGitHub eb7a4c005e Merge pull request #5086 from Citadel-Station-13/upstream-merge-34815 
[MIRROR] Adds snow baseturf editors to op base
 2018-01-24 21:41:57 -06:00
LetterJayandGitHub 2c40834c5a Merge pull request #5085 from Citadel-Station-13/upstream-merge-34699 
[MIRROR] Rename /datum/config_entry/var/value to config_entry_value
 2018-01-24 21:41:33 -06:00
CitadelStationBot 189c846999 Clown traitors can buy clown bombs now 2018-01-24 21:23:37 -06:00
imsxzandCitadelStationBot e9cdf72439 less than 100 2018-01-24 21:23:37 -06:00
LetterJayandGitHub 7a8fbb08c6 Merge branch 'master' into upstream-merge-34894 2018-01-24 21:17:35 -06:00
LetterJayandGitHub 8ea6f372ed Update medicine_reagents.dm 2018-01-24 20:50:21 -06:00
LetterJayandGitHub 8c50fffdfb Merge pull request #5083 from Citadel-Station-13/upstream-merge-34895 
[MIRROR] #34889 Fixes possible issue with set_labels
 2018-01-24 20:49:44 -06:00
CitadelStationBot d531f63fa9 Automatic changelog generation for PR #5081 [ci skip] 2018-01-24 20:48:17 -06:00
LetterJayandGitHub cf02adf419 Merge pull request #5081 from Citadel-Station-13/upstream-merge-34744 
[MIRROR] shuttles will now throw you if you don't buckle in
 2018-01-24 20:48:15 -06:00
CitadelStationBot a9bc274e9a Automatic changelog generation for PR #5080 [ci skip] 2018-01-24 20:48:05 -06:00
LetterJayandGitHub b89007ade5 Merge pull request #5080 from Citadel-Station-13/upstream-merge-34746 
[MIRROR] Makes the autolathe repeat it's animation while it's still printing.
 2018-01-24 20:48:03 -06:00
LetterJayandGitHub 114a1fe049 Merge pull request #5078 from Citadel-Station-13/upstream-merge-34776 
[MIRROR] Corrects mapGeneratorModule generate() args
 2018-01-24 20:47:17 -06:00
LetterJayandGitHub 2d754ec8ca Merge pull request #5077 from Citadel-Station-13/upstream-merge-34801 
[MIRROR] Fixes compatability issues with some third-party-java-based™ DMM viewers
 2018-01-24 20:46:59 -06:00
LetterJayandGitHub 793b4be13f Merge pull request #5066 from Citadel-Station-13/upstream-merge-34773 
[MIRROR] Shifts vars off /mob to the correct subtype
 2018-01-24 20:46:46 -06:00
CitadelStationBot 1b4be98682 Automatic changelog generation for PR #5067 [ci skip] 2018-01-24 20:46:29 -06:00
LetterJayandGitHub 7ec4e826c3 Merge pull request #5067 from Citadel-Station-13/upstream-merge-34690 
[MIRROR] New Cocktail: The Nar'Sour
 2018-01-24 20:46:27 -06:00
LetterJayandGitHub dd31c777a5 Merge pull request #5068 from Citadel-Station-13/upstream-merge-34807 
[MIRROR] Fixes the kitchen spike turning people upside down forever
 2018-01-24 20:46:16 -06:00
CitadelStationBot 1c399150e2 Automatic changelog generation for PR #5076 [ci skip] 2018-01-24 20:45:53 -06:00
LetterJayandGitHub 0bf04c6aa6 Merge pull request #5076 from Citadel-Station-13/upstream-merge-34579 
[MIRROR] Adds Ketrazine, a powerful combat stimulant with severe side-effects which can be synthesized by the crew
 2018-01-24 20:45:51 -06:00
LetterJayandGitHub 8f62c0823a Merge pull request #5075 from Citadel-Station-13/upstream-merge-34800 
[MIRROR] martial art sanity check
 2018-01-24 20:45:33 -06:00
LetterJayandGitHub f0b83ee23d Merge pull request #5074 from Citadel-Station-13/upstream-merge-34611 
[MIRROR] One can no longer use cogscarab as a form of Eminence priority.
 2018-01-24 20:45:16 -06:00
LetterJayandGitHub 205afc5dc8 Merge pull request #5073 from Citadel-Station-13/upstream-merge-34818 
[MIRROR] Plasma cutter now has a tool sound
 2018-01-24 20:44:59 -06:00
CitadelStationBot 8332834652 Automatic changelog generation for PR #5072 [ci skip] 2018-01-24 20:44:45 -06:00
LetterJayandGitHub d573e67ff6 Merge pull request #5072 from Citadel-Station-13/upstream-merge-34487 
[MIRROR] Costumes for nuclear operatives
 2018-01-24 20:44:43 -06:00
CitadelStationBot 8ddea31807 Automatic changelog generation for PR #5071 [ci skip] 2018-01-24 20:44:32 -06:00
LetterJayandGitHub cbaca56dbf Merge pull request #5071 from Citadel-Station-13/upstream-merge-34458 
[MIRROR] Refactors and nerfs Fleshmend
 2018-01-24 20:44:30 -06:00
CitadelStationBot 8af82a912a Automatic changelog generation for PR #5070 [ci skip] 2018-01-24 20:44:18 -06:00
LetterJayandGitHub ad50662c94 Merge pull request #5070 from Citadel-Station-13/upstream-merge-34285 
[MIRROR] Gives clockwork marauders a reasonable cost/cooldown
 2018-01-24 20:44:15 -06:00
CitadelStationBot d005abe103 Forces test run to run with a set random seed 2018-01-24 19:28:18 -06:00
Jordan BrownandCitadelStationBot a8bd042742 Forces test run to run with a set random seed (#34912) 2018-01-24 19:28:18 -06:00
CitadelStationBot b1e7dfdac3 Spawns a pen-uplink if you don't have one /w pen pref. 2018-01-24 18:45:21 -06:00
ExcessiveUseOfCobblestoneandCitadelStationBot 596aea6bbb Spawns a pen-uplink if you don't have one /w pen pref. (#34827) 
* Update mind.dm

* ok togopal i guess you could call that a webedit

* AHHHHHH

* xhuis

* I only had 1 cup of coffee today ok

* dost thou hast storage?

* cb

* we did it... we finally did it.
 2018-01-24 18:45:21 -06:00
CitadelStationBot 8403f6f0eb You can now defib monkeys 2018-01-24 18:40:05 -06:00
MoreRobustThanYouandCitadelStationBot 35be96ed64 You can now defib monkeys (#34383) 
* You can now defib non-human carbons

* WOOPS

* Woops.
 2018-01-24 18:40:05 -06:00
CitadelStationBot 70bec77e8e Makes templates able to use PlaceOnTop 2018-01-24 18:18:31 -06:00