shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,778 Commits 5 Branches 0 Tags
134201d185d4f18fa66fffca1c8a786fe99dfd7e
Commit Graph

844 Commits

Author SHA1 Message Date
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
Jordan Brown
a111679821 Merge pull request #33801 from AutomaticFrenzy/patch/download 
Fix download objective always greentexting
 2017-12-24 15:02:57 -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
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
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
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
Leo
a536831bbb Merge pull request #33586 from Xhuis/power_alerts 
Disables clockcult power alerts to ghosts when it's not clockcult
 2017-12-17 07:36:10 -06:00
Robustin
e71fa098ae Shield balance (#33553) 
Rebalances Marauder shields
 2017-12-17 04:11:24 -06:00
Ashe Higgs
cde0266c99 Removes the visible messages from vitality matrices (#33549) 2017-12-17 04:11:09 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
deathride58
c4b7b940d2 Merge pull request #4345 from Citadel-Station-13/upstream-merge-33475 
[MIRROR] Antag spawner fixes
 2017-12-15 04:20:27 +00:00
vuonojenmustaturska
fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
deathride58
37851fe771 Update antag_spawner.dm 2017-12-14 14:36:19 -05:00
vuonojenmustaturska
7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
oranges
a17af0530d Merge pull request #33475 from AnturK/ineedtocleanuptheselater 
Antag spawner fixes
 2017-12-12 20:02:55 -06:00
Robustin
685bf8b48c Both cult revive runes will now replace braindead/AFK cultists (#33206) 
* "Revive" AFKs

* "Revives" inactive clock cultists

* AFK boot notice

* Missing parenthesis

* Revive targets correct mob

* Poll fix

* Fixes inactive revive mob

* Suicide Counter
 2017-12-12 13:48:18 -06:00
swindly
1a15772c3a Makes swarmers check for mobs in objects (#33425) 2017-12-11 20:38:28 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
AnturK
6bfca33a78 Roundend report refactor 2017-12-11 10:58:23 -06:00
deathride58
57ab98d8bc Merge pull request #4315 from Citadel-Station-13/upstream-merge-33152 
[MIRROR] Airlock Construction Update
 2017-12-10 23:49:51 +00:00