shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,818 Commits 5 Branches 0 Tags
57e6eb7b1e6a9c413512772495e624b691885995
Commit Graph
13818 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58andGitHub 57e6eb7b1e Merge pull request #5527 from Citadel-Station-13/upstream-merge-35696 
[MIRROR] Fixes wizard RPG loot from making circuit analyzers useless
 2018-02-16 14:15:12 +00:00
CitadelStationBot 1dc271f40e Automatic changelog generation for PR #5490 [ci skip] 2018-02-16 07:58:16 -06:00
LetterJayandGitHub dd5c717152 Merge pull request #5490 from cebutris/ssword 
Adds stunsword modification kits to the security vendor
 2018-02-16 07:58:14 -06:00
LetterJayandGitHub a2d0aa25a6 Merge pull request #5520 from Citadel-Station-13/upstream-merge-35656 
[MIRROR] Fixes a runtime in NTNet scanner
 2018-02-16 07:55:42 -06:00
LetterJayandGitHub ad8bab3fc1 Merge pull request #5519 from Citadel-Station-13/upstream-merge-35484 
[MIRROR] Converting more auto_custom antagonists.
 2018-02-16 07:55:29 -06:00
CitadelStationBot f6f8d98264 Automatic changelog generation for PR #5518 [ci skip] 2018-02-16 07:55:22 -06:00
LetterJayandGitHub 798ba717fa Merge pull request #5518 from Citadel-Station-13/upstream-merge-35679 
[MIRROR] Removes on_mob_turn, on_mob_move and intercept_user_move, speeding up movement
 2018-02-16 07:55:19 -06:00
CitadelStationBot ae50244e2e Automatic changelog generation for PR #5517 [ci skip] 2018-02-16 07:55:11 -06:00
LetterJayandGitHub 58a9e32af3 Merge pull request #5517 from Citadel-Station-13/upstream-merge-35662 
[MIRROR] Meteor shield emag feedback and typo fix
 2018-02-16 07:55:09 -06:00
CitadelStationBot 6227668842 Fixes wizard RPG loot from making circuit analyzers useless 2018-02-16 07:52:59 -06:00
Jordan BrownandCitadelStationBot d6b493f2ec Merge pull request #35696 from Xhuis/circuit_rpg_loot 
Fixes wizard RPG loot from making circuit analyzers useless
 2018-02-16 07:52:59 -06:00
CitadelStationBot 37d865160f Fixes a runtime in NTNet scanner 2018-02-16 00:46:33 -06:00
ACCountandCitadelStationBot 93364c3af6 Fixes a runtime in NTNet scanner (#35656) 2018-02-16 00:46:33 -06:00
CitadelStationBot a7e6310977 Converting more auto_custom antagonists. 2018-02-16 00:45:20 -06:00
AnturKandCitadelStationBot 993f15a415 Converting more auto_custom antagonists. (#35484) 
* Thinning out auto_custom uses.

* Not sure what i was thinking.

* Not sure what happened here.

* Fixes

* Forgot i'm doing this so i can remove this

* C

* Valentine antag datums

* This is what i get for adding it manually.
 2018-02-16 00:45:20 -06:00
CitadelStationBot 84efd78749 Removes on_mob_turn, on_mob_move and intercept_user_move, speeding up movement 2018-02-16 00:41:04 -06:00
vuonojenmustaturskaandCitadelStationBot 6dfa89fab7 Removes on_mob_turn, on_mob_move and intercept_user_move, speeding up movement (#35679) 
* honk

* qdel memes
 2018-02-16 00:41:04 -06:00
CitadelStationBot 303cb5a0ce Meteor shield emag feedback and typo fix 2018-02-16 00:39:51 -06:00
81DentonandCitadelStationBot 42979ee771 dr. satellite I'm EMAG (#35662) 2018-02-16 00:39:51 -06:00
CitadelStationBot 757df53aa3 Automatic changelog generation for PR #5485 [ci skip] 2018-02-15 23:56:37 -06:00
deathride58andGitHub c1b3253b8d Merge pull request #5485 from Poojawa/cryopods 
Cryopods from Oracle Station
 2018-02-16 05:56:34 +00:00
LetterJayandGitHub 14d387fa04 Merge pull request #5513 from Citadel-Station-13/upstream-merge-35542 
[MIRROR] Cleans up some duplicate canusetopic warnings
 2018-02-15 22:17:54 -06:00
LetterJayandGitHub 65ee13fdb9 Merge pull request #5514 from Citadel-Station-13/upstream-merge-35693 
[MIRROR] Fix world/Error() trying to read config before it loads
 2018-02-15 22:17:42 -06:00
CitadelStationBot a99dbd6441 Fix world/Error() trying to read config before it loads 2018-02-15 21:59:41 -06:00
orangesandCitadelStationBot bf5c2ca887 Merge pull request #35693 from tgstation/Cyberboss-patch-2 
Fix world/Error() trying to read config before it loads
 2018-02-15 21:59:41 -06:00
deathride58andGitHub f664c21aee Merge pull request #5502 from Citadel-Station-13/upstream-merge-35586 
[MIRROR] Cleans up remnant traitor cyborg code and AI hacking.
 2018-02-16 03:04:35 +00:00
CitadelStationBot bd647e019a Cleans up some duplicate canusetopic warnings 2018-02-15 20:35:03 -06:00
orangesandCitadelStationBot 5dc3549801 Merge pull request #35542 from ShizCalev/free-spam-removal 
Cleans up some duplicate canusetopic warnings
 2018-02-15 20:35:03 -06:00
CitadelStationBot 86f27dd5e8 Automatic changelog generation for PR #5512 [ci skip] 2018-02-15 19:32:43 -06:00
deathride58andGitHub 18f4d78449 Merge pull request #5512 from Citadel-Station-13/upstream-merge-35680 
[MIRROR] Fixes SCP-294 losing its top sometimes
 2018-02-16 01:32:41 +00:00
deathride58andGitHub 05ab5f7c0c Merge pull request #5510 from Citadel-Station-13/upstream-merge-35552 
[MIRROR] [s]Fixes writing bugs/exploits
 2018-02-16 01:32:23 +00:00
CitadelStationBot ef99b4a031 Automatic changelog generation for PR #5509 [ci skip] 2018-02-15 19:32:00 -06:00
deathride58andGitHub 64dc40d293 Merge pull request #5509 from Citadel-Station-13/upstream-merge-35606 
[MIRROR] Apples now taste like apples
 2018-02-16 01:31:58 +00:00
CitadelStationBot d64e86b1a9 Automatic changelog generation for PR #5508 [ci skip] 2018-02-15 19:31:26 -06:00
deathride58andGitHub 4c2db869ef Merge pull request #5508 from Citadel-Station-13/upstream-merge-35131 
[MIRROR] Adds sounds and some small QoL improvements to the circuit imprinter, and allows them to recycle empty assemblies
 2018-02-16 01:31:24 +00:00
CitadelStationBot 8a801f1e18 Automatic changelog generation for PR #5505 [ci skip] 2018-02-15 19:29:17 -06:00
deathride58andGitHub d7c06fec6f Merge pull request #5505 from Citadel-Station-13/upstream-merge-35342 
[MIRROR] Adds Cryostatis Shotgun Darts
 2018-02-16 01:29:14 +00:00
deathride58andGitHub a6ac0df5c4 Merge pull request #5504 from Citadel-Station-13/upstream-merge-35651 
[MIRROR] Gives eggbox an inhand image, cleans up heartbox inhands
 2018-02-16 01:28:54 +00:00
deathride58andGitHub ee004e3359 Merge pull request #5503 from Citadel-Station-13/upstream-merge-35655 
[MIRROR] fixes firedoor layer for the last god damn time
 2018-02-16 01:28:35 +00:00
deathride58andGitHub e873fce53f Update laws.dm 2018-02-15 20:28:05 -05:00
deathride58andGitHub 91a2c04f0d Update law.dm 2018-02-15 20:27:36 -05:00
deathride58andGitHub 05a0ce13a1 Merge pull request #5501 from Citadel-Station-13/upstream-merge-35611 
[MIRROR] Spellcheck: Fixed a typo on an eldritch god's pronunciation
 2018-02-16 01:27:09 +00:00
deathride58andGitHub 2e6efc58aa Merge pull request #5500 from Citadel-Station-13/upstream-merge-35635 
[MIRROR] Fixes the name on the cook's culinary school training
 2018-02-16 01:26:56 +00:00
deathride58andGitHub aa5fed9369 Merge pull request #5499 from Citadel-Station-13/upstream-merge-35654 
[MIRROR] Fixes turret faction on snowdin map
 2018-02-16 01:26:23 +00:00
deathride58andGitHub 64ec78b5de Merge pull request #5498 from Citadel-Station-13/upstream-merge-35636 
[MIRROR] Spellchecks announcement's grammar
 2018-02-16 01:26:09 +00:00
deathride58andGitHub cd28894a2f Merge pull request #5497 from Citadel-Station-13/upstream-merge-35644 
[MIRROR] Fix GLOB setup runtimes not affecting the counter
 2018-02-16 01:24:33 +00:00
CitadelStationBot 39a9a0c9b1 Automatic changelog generation for PR #5495 [ci skip] 2018-02-15 19:12:09 -06:00
deathride58andGitHub efa1f99f9d Merge pull request #5495 from Citadel-Station-13/upstream-merge-35548 
[MIRROR] Slime Radio Potion
 2018-02-16 01:12:07 +00:00
deathride58andGitHub 13dbb82e06 Merge pull request #5494 from Citadel-Station-13/upstream-merge-35561 
[MIRROR] Fixes rnd console runtimes
 2018-02-16 01:11:25 +00:00
CitadelStationBot 068605798a Automatic changelog generation for PR #5493 [ci skip] 2018-02-15 19:10:49 -06:00