shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,116 Commits 5 Branches 0 Tags
231da023ec9c073f1644172794de8ef2dc43017e
Commit Graph

1062 Commits

Author SHA1 Message Date
LetterJay
67ef791794 Merge pull request #4535 from Citadel-Station-13/upstream-merge-33821 
[MIRROR] Fixes deleting handcuffs
 2017-12-27 03:05:33 -06:00
Jordan Brown
4499ff2fad Merge pull request #33834 from Xhuis/drone_hats 
Drones now spawn with seasonal hats depending on active holidays [VERY Important PR]
 2017-12-26 18:38:42 -06:00
LetterJay
290c1e0868 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916 2017-12-26 08:24:20 -06:00
LetterJay
e4f39a97c3 Merge pull request #4472 from Citadel-Station-13/upstream-merge-33634 
[MIRROR] (probably?) Fixes being able to create two Eminences at a time + other Eminence issues
 2017-12-26 05:29:42 -06:00
ShizCalev
3ea4e84719 Fixes deleting handcuffs (#33821) 
* Fixes deleting handcuffs

* cleanup
 2017-12-26 00:13:13 -06:00
LetterJay
50672ecf93 Merge pull request #4512 from Citadel-Station-13/upstream-merge-33752 
[MIRROR] Fixes eminence login
 2017-12-25 21:29:21 -06:00
LetterJay
91e87bf801 Merge pull request #4482 from Citadel-Station-13/upstream-merge-33584 
[MIRROR] Tiles blessed by holy water now block servant warp-in/Eminence snooping
 2017-12-25 21:27:17 -06:00
Emmett Gaines
9d0a4722e5 turns the baseturf var into a part time list (#33705) 2017-12-25 19:11:06 -06:00
LetterJay
ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06:00
LetterJay
fff9f49738 Merge pull request #4516 from Citadel-Station-13/upstream-merge-33801 
[MIRROR] Fix download objective always greentexting
 2017-12-24 17:00:18 -06:00
LetterJay
144737d97d Merge pull request #4514 from Citadel-Station-13/upstream-merge-33784 
[MIRROR] Fix file path to aimalf.ogg
 2017-12-24 16:57:07 -06:00
LetterJay
e7f926c153 Update _eminence.dm 2017-12-24 16:54:01 -06:00
Jordan Brown
164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -06:00
Jordan Brown
a111679821 Merge pull request #33801 from AutomaticFrenzy/patch/download 
Fix download objective always greentexting
 2017-12-24 15:02:57 -06:00
LetterJay
d6c1c7ecc9 Merge branch 'master' into upstream-merge-33634 2017-12-24 02:39:35 -06:00
LetterJay
b0671ed78a Update eminence_spire.dm 2017-12-24 02:38:47 -06:00
LetterJay
aec1142ca1 Update _eminence.dm 2017-12-24 02:38:37 -06:00
Jordan Brown
7bcf4d466a Merge pull request #33784 from octareenroon91/patch-56 
Fix file path to aimalf.ogg
 2017-12-23 08:31:23 -06:00
Jordan Brown
2a80a2d6fb Merge pull request #33728 from kevinz000/patch-408 
Fixes biodegrading handcuffs
 2017-12-23 08:27:09 -06:00
AnturK
34b749d2ca Fixes eminence login 2017-12-23 08:14:44 -06:00
Ashe Higgs
c5485faee7 Tiles blessed by holy water now block servant warp-in/Eminence snooping (#33584) 
* Blessing tiles blocks servant warp

* Removes the color

* Prevents the message from showing on the same turf
 2017-12-21 06:37:06 -06:00
LetterJay
57646f2e08 Merge pull request #4412 from Citadel-Station-13/upstream-merge-33549 
[MIRROR] Removes the visible messages from crossing vitality matrices
 2017-12-21 05:01:32 -06:00
LetterJay
56ecc13289 Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246 
[MIRROR] Roundend report refactor
 2017-12-21 03:22:31 -06:00
Ashe Higgs
a3323c1b95 (probably?) Fixes being able to create two Eminences at a time + other Eminence issues 2017-12-21 00:01:50 -06:00
deathride58
cf80b8a573 Merge pull request #4453 from Citadel-Station-13/upstream-merge-33651 
[MIRROR] Changelings learn languages from people they absorb
 2017-12-21 03:30:22 +00:00
LetterJay
84f51a8cbb antag team 2017-12-20 13:24:06 -06:00
LetterJay
00d3b8f1b7 a lot of shit synced in this one commit. 2017-12-20 02:53:51 -06:00
LetterJay
92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
LetterJay
5bd61908a3 Update game_mode.dm 2017-12-19 23:53:36 -06:00
LetterJay
4d5c32ae56 Update game_mode.dm 2017-12-19 22:11:04 -06:00
LetterJay
9d90a2bf5b Update pinpointer.dm 2017-12-19 19:30:54 -06:00
LetterJay
c545ef06cd Update nuclearbomb.dm 2017-12-19 19:30:23 -06:00
LetterJay
951a540882 Update nuclear.dm 2017-12-19 19:29:27 -06:00
LetterJay
992984388b Update game_mode.dm 2017-12-19 19:29:04 -06:00
LetterJay
5983d7b13d Update antag_spawner.dm 2017-12-19 19:27:36 -06:00
LetterJay
dfa53390df Update nuclear.dm 2017-12-19 19:12:26 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
LetterJay
a0a4acbc2c Update nuclear.dm 2017-12-19 17:33:55 -06:00
LetterJay
7d193a5303 Update wizard.dm 2017-12-19 15:35:57 -06:00
LetterJay
a30de42820 Update traitor.dm 2017-12-19 15:35:45 -06:00
LetterJay
2d65e0df49 Update nuclear.dm 2017-12-19 15:35:29 -06:00
LetterJay
61c7080c34 Update game_mode.dm 2017-12-19 15:34:59 -06:00
LetterJay
cb8c6cd5e2 Update changeling.dm 2017-12-19 15:34:38 -06:00
LetterJay
98d752fe21 Update traitor_bro.dm 2017-12-19 15:34:27 -06:00
Leo
4e5671960d Merge pull request #33651 from coiax/absorb-language 
Changelings learn languages from people they absorb
 2017-12-19 07:55:57 -06:00
XDTM
6b4099805f [Ready] Adds abductor Mind Interface Devices, and a gland HUD (#33209) 
* Adds abductor Mind Interface Devices, and a gland HUD

* .
 2017-12-18 20:29:37 -06:00
LetterJay
4a835b47ce Merge pull request #4417 from Citadel-Station-13/upstream-merge-33586 
[MIRROR] Disables clockcult power alerts to ghosts when it's not clockcult
 2017-12-18 15:25:46 -06:00
LetterJay
97a321bc82 Merge pull request #4414 from Citadel-Station-13/upstream-merge-33553 
[MIRROR] Rebalances Marauder shields
 2017-12-18 15:21:07 -06:00
XDTM
3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -06:00
LetterJay
3895eb9eac Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519 
[MIRROR] Finishes the forceMove port
 2017-12-17 20:28:07 -06:00