shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,067 Commits 5 Branches 0 Tags
773a94dea69b51777991afeb5d7cfd79cf6daa41
Commit Graph

12455 Commits

Author SHA1 Message Date
LetterJay
337e9ca937 Merge pull request #715 from Citadel-Station-13/upstream-merge-26769 
[MIRROR] Fixes proximity sensors not tracking correctly
 2017-05-02 18:45:21 -05:00
LetterJay
91cb42cf60 Merge pull request #699 from Citadel-Station-13/upstream-merge-26556 
[MIRROR] Saline-glucose changes
 2017-05-02 18:44:53 -05:00
CitadelStationBot
ce302f4fe7 Trophy case hotfixes 2017-05-02 14:37:11 -05:00
LetterJay
8a5c180dd3 Update recipes_misc.dm 2017-05-02 13:41:10 -05:00
CitadelStationBot
7baccb8b85 Removes vestigial list from minds. 2017-05-02 12:47:20 -05:00
LetterJay
a57190b9c5 Merge pull request #694 from Citadel-Station-13/upstream-merge-26708 
[MIRROR] Ore redemption machine cleanup
 2017-05-02 12:26:28 -05:00
LetterJay
1eb0617037 Merge pull request #692 from Citadel-Station-13/upstream-merge-26738 
[MIRROR] Small fixes to spatial gateways
 2017-05-02 12:24:53 -05:00
LetterJay
fe5e1db512 Merge pull request #718 from Citadel-Station-13/upstream-merge-26765 
[MIRROR] Makes golems able to transfer into empty shells
 2017-05-02 12:24:24 -05:00
LetterJay
4ecbec1406 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26720 2017-05-02 11:36:27 -05:00
LetterJay
6310292531 woo 2017-05-02 11:19:14 -05:00
LetterJay
c62fc3886a Merge pull request #671 from Citadel-Station-13/upstream-merge-26715 
[MIRROR] [FUN REMOVAL] Makes fire not able to become ice.
 2017-05-02 11:18:05 -05:00
LetterJay
818940cbc3 Merge pull request #645 from Citadel-Station-13/upstream-merge-26598 
[MIRROR] Cult Construct Non-Balance Update
 2017-05-02 11:16:12 -05:00
LetterJay
b4782e24af Merge pull request #636 from Citadel-Station-13/upstream-merge-26594 
[MIRROR] Blood Cult removals and tweaks
 2017-05-02 11:15:14 -05:00
LetterJay
2bef665038 Merge pull request #613 from Citadel-Station-13/upstream-merge-26563 
[MIRROR] Renames generic armor and athletic shorts
 2017-05-02 11:14:47 -05:00
LetterJay
159f7f8d90 Merge pull request #602 from Citadel-Station-13/upstream-merge-26373 
[MIRROR] Fixes being unable to empty an emagged cloning pod via manual ejection.
 2017-05-02 11:14:14 -05:00
LetterJay
8af590f075 Merge pull request #591 from Citadel-Station-13/upstream-merge-26601 
[MIRROR] When jumpsuits take severe damage, their suit sensors break.
 2017-05-02 11:10:13 -05:00
CitadelStationBot
25f1b24f62 Makes golems able to transfer into empty shells 2017-05-02 10:00:33 -05:00
CitadelStationBot
d422b9bb39 The alien hivemind uses a mob's real_name 2017-05-02 09:57:25 -05:00
CitadelStationBot
6d6d01f105 Species-locked inventory slots are now indicated. 2017-05-02 09:56:21 -05:00
CitadelStationBot
913a0c7c7f Fixes proximity sensors not tracking correctly 2017-05-02 09:55:15 -05:00
LetterJay
587043f1e8 pls 2017-05-02 09:44:19 -05:00
LetterJay
fd6df15f93 Merge branch 'master' into upstream-merge-26131 2017-05-02 09:19:49 -05:00
LetterJay
c6e0c95f42 heh. 2017-05-02 09:17:52 -05:00
LetterJay
fd251eb56a oops 2017-05-02 08:43:10 -05:00
LetterJay
f7fe20887a manual merge 2017-05-02 08:40:10 -05:00
LetterJay
3b8484b52b Merge pull request #579 from Citadel-Station-13/upstream-merge-26129 
[MIRROR] Unorphans the blackbox
 2017-05-02 05:13:49 -05:00
LetterJay
a8e6de5795 manual merge 2017-05-02 05:06:13 -05:00
CitadelStationBot
aa45f555e3 Makes the cult Talisman of Horrors ranged 2017-05-02 04:57:29 -05:00
LetterJay
4a6ffec412 rej cleanup 2017-05-02 04:56:46 -05:00
LetterJay
7ab8ee8cae Merge pull request #581 from Citadel-Station-13/upstream-merge-26524 
[MIRROR] Admin proc calls are now serialized per admin
 2017-05-02 04:51:43 -05:00
LetterJay
d3850bde68 Merge pull request #691 from Citadel-Station-13/upstream-merge-26740 
[MIRROR] Port SM shards to initialize
 2017-05-02 03:04:54 -05:00
LetterJay
9036e8c63a Merge pull request #690 from Citadel-Station-13/upstream-merge-26739 
[MIRROR] You can no longer queue up ahelps by queing up prompts
 2017-05-02 03:04:37 -05:00
LetterJay
e4bb3ebfb7 Merge pull request #689 from Citadel-Station-13/upstream-merge-25603 
[MIRROR] Gaining Vanguard will remove existing stuns
 2017-05-02 03:04:25 -05:00
LetterJay
7d697b153b Merge pull request #686 from Citadel-Station-13/upstream-merge-26737 
[MIRROR] Makes surplus crates less likely to contain implants
 2017-05-02 03:04:09 -05:00
LetterJay
a6263621e7 Merge pull request #688 from Citadel-Station-13/upstream-merge-26729 
[MIRROR] Gang Pen Is now Stealthy
 2017-05-02 03:03:43 -05:00
CitadelStationBot
fa888cc521 Fixes drakes continuing to swoop when killed (#713) 2017-05-02 02:49:41 -05:00
CitadelStationBot
036109de58 Changes a bunch of hrefs to the proper defines 2017-05-02 02:20:07 -05:00
CitadelStationBot
22f6aecdf7 Fixes cult and clockcult icons 2017-05-01 21:03:40 -05:00
CitadelStationBot
3fff6d4a1d Fixes cult datum giving the action button to the mind instead of mob 2017-05-01 20:27:03 -05:00
CitadelStationBot
d29de62d69 Plants now react with turfs on squash() 2017-05-01 17:34:34 -05:00
CitadelStationBot
b45d4ba668 Makes admin sound announcement use the right span 2017-05-01 17:32:29 -05:00
CitadelStationBot
ea3ee7accc Adds persistent trophy cases 2017-05-01 17:31:24 -05:00
CitadelStationBot
8758791278 Fixes Biogenerator 2017-05-01 17:28:18 -05:00
CitadelStationBot
cc0a9b87fb Changes /obj/machinery to have atom/movable occupants 2017-05-01 15:58:52 -05:00
LetterJay
64fd72f1cf Update artefact.dm 2017-05-01 15:31:51 -05:00
LetterJay
b57a4aa6b4 Merge branch 'master' into upstream-merge-26386 2017-05-01 15:27:25 -05:00
LetterJay
161891e51b conflict res 2017-05-01 15:26:17 -05:00
CitadelStationBot
00164a49a7 Subsystem change for the SM and TEG and slight QoL 2017-05-01 13:06:07 -05:00
CitadelStationBot
3e80105ffb Saline-glucose changes 2017-05-01 12:55:45 -05:00
CitadelStationBot
36dfc5a4db Holocalls 2017-05-01 12:53:40 -05:00