AnturK
|
ea6e1356ba
|
Fixes create antag wizard
|
2017-09-23 11:12:29 -05:00 |
|
LetterJay
|
8c6c57ff32
|
Merge pull request #2885 from Citadel-Station-13/upstream-merge-30896
[MIRROR] Removes old debug text
|
2017-09-22 00:03:30 -04:00 |
|
oranges
|
41277ff110
|
Removes old debug text
|
2017-09-21 06:30:11 -05:00 |
|
deathride58
|
0d653c9f44
|
im unrobust
|
2017-09-20 22:39:58 -04:00 |
|
deathride58
|
860fe663b5
|
axes runtime's unstoppable horniness
|
2017-09-20 22:20:44 -04:00 |
|
pubby
|
a01f3213f5
|
Traitorbro gamemode
|
2017-09-17 18:03:12 -05:00 |
|
LetterJay
|
1471b6cac6
|
Merge branch 'master' into upstream-merge-30297
|
2017-09-13 06:41:37 -05:00 |
|
LetterJay
|
a960b63b0a
|
Merge branch 'master' into upstream-merge-30056
|
2017-09-13 06:08:59 -05:00 |
|
LetterJay
|
c2a41c9b51
|
commit
|
2017-09-13 06:04:22 -05:00 |
|
LetterJay
|
cd0997aa1e
|
Merge branch 'master' into upstream-merge-30297
|
2017-09-12 23:36:35 -05:00 |
|
KorPhaeron
|
d05fdb0eb0
|
Makes the station Z level into a list instead of a single define
|
2017-09-11 12:40:35 -05:00 |
|
Leo
|
44e62d8016
|
Uplink lock codes now pick from the phonetic alphabet global list (#30538)
* Uplink lock codes now pick from the phonetic alphabet global list
* Update virus_cart.dm
|
2017-09-10 14:17:16 -05:00 |
|
LetterJay
|
3e0ead1204
|
Merge branch 'master' into upstream-merge-29105
|
2017-09-02 07:11:32 -05:00 |
|
Jordan Brown
|
528b7a86b8
|
Merge pull request #30292 from Xhuis/revert-30289-RevertAntag
Rearranges the antagonist panel: now with 150 more hours of testing
|
2017-08-31 14:39:42 -05:00 |
|
LetterJay
|
188193eb61
|
here we go again (#2456)
|
2017-08-24 19:24:25 -07:00 |
|
CitadelStationBot
|
196c9d0597
|
Adds tracking amount of time spent playing departments 2: The fall of the Assistants.
|
2017-08-20 06:01:24 -05:00 |
|
CitadelStationBot
|
45d6ece7a8
|
Adds a warning to the traitor panel for the last headrev
|
2017-08-18 18:57:53 -05:00 |
|
CitadelStationBot
|
3d83b55cf6
|
Annihilates the colons!
|
2017-08-15 10:49:55 -05:00 |
|
ktccd
|
c0cc428216
|
Makes mindtransfers respect arousal
Clients arousal preferences are now taken into account when transferring
minds.
|
2017-08-08 19:45:06 +02:00 |
|
CitadelStationBot
|
ef715b7837
|
Removes all checks for subsystem existence (#2252)
|
2017-08-04 08:41:52 -07:00 |
|
kevinz000
|
bbcad2fa58
|
Proper mirror PR for the disease refactor because I fucked up the first one. (#2026)
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"
This reverts commit 44742cb115.
* Delete shuttle_loan.dm.rej
* Delete life.dm.rej
* Update life.dm
* Delete life.dm.rej
* compile
|
2017-07-31 23:41:22 -07:00 |
|
LetterJay
|
35fba1933e
|
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
[MIRROR] Made some object lists less terrible to read
|
2017-07-31 03:43:03 -05:00 |
|
ktccd
|
c52f7a0475
|
Delayed objective (#2140)
Delayed objective [Latejoiners can now be selected as traitor targets]
|
2017-07-27 05:27:58 -07:00 |
|
CitadelStationBot
|
b998e14a5b
|
Map Spellcheck
|
2017-07-24 21:16:46 -05:00 |
|
CitadelStationBot
|
a72962c300
|
Made some object lists less terrible to read
|
2017-07-18 09:44:43 -05:00 |
|
kevinz000
|
44742cb115
|
im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)
* Revert "Automatic changelog generation for PR #2021 [ci skip]"
This reverts commit 9d0cd37dd3.
* Revert "Disease Refactor (#2021)"
This reverts commit f2ac487927.
|
2017-07-15 11:41:36 -07:00 |
|
CitadelStationBot
|
f2ac487927
|
Disease Refactor (#2021)
|
2017-07-15 11:40:49 -07:00 |
|
Poojawa
|
b1b4826c0c
|
July 5th TG sync (#1883)
July 5th TG sync
|
2017-07-05 22:14:19 -05:00 |
|
LetterJay
|
d04001c09d
|
another huge sync
|
2017-06-21 18:00:00 -05:00 |
|
CitadelStationBot
|
ef336bb4ad
|
Fixes a documentation typo
|
2017-06-15 20:48:37 -05:00 |
|
CitadelStationBot
|
1658e48bc1
|
[READY] Gang Points Refactor - Now stored in the gang datum
|
2017-06-08 14:46:07 -05:00 |
|
CitadelStationBot
|
e8663bee81
|
Refactors the latejoin list
|
2017-06-04 15:08:35 -05:00 |
|
CitadelStationBot
|
618d893388
|
wat (#1380)
|
2017-06-04 09:09:15 -07:00 |
|
CitadelStationBot
|
dbc902ef29
|
Fixes martial arts resetting on cloning. (#1338)
|
2017-06-02 21:21:47 -07:00 |
|
CitadelStationBot
|
25df88509a
|
Reorganizes martial arts and stores them in the MIND.
|
2017-05-22 07:13:10 -05:00 |
|
CitadelStationBot
|
f624071766
|
[MIRROR] Ninja Refactor (#1037)
* Ninja Refactor
* Update antagonists.dm
* Delete antagonists.dm.rej
* Update antagonists.dm
* Update mind.dm
* Update mind.dm
* whatever, I fixed that cunt
|
2017-05-21 00:39:26 -05:00 |
|
CitadelStationBot
|
62c22a5243
|
Fixes uplink pens not showing in traitor menu
|
2017-05-18 16:38:05 -05:00 |
|
CitadelStationBot
|
c6a671a11b
|
[MIRROR] Devil refactor+small revamp (#887)
* Devil refactor+small revamp
* Delete mind.dm.rej
* clean up rej
* Delete admin_investigate.dm.rej
* Delete mapping.dm.rej
* compile fix
|
2017-05-18 09:06:01 -05:00 |
|
CitadelStationBot
|
257cf986c5
|
Repaths C4 (#808)
* Repaths C4
* Delete tgstation.2.1.3.dmm.rej
* Add files via upload
* update CitadelStation-1.2.1.dmm
|
2017-05-18 00:37:20 -05:00 |
|
LetterJay
|
1948b007d1
|
fix roundstart/rej cleanup
|
2017-05-17 05:08:51 -05:00 |
|
LetterJay
|
bdbedd33f4
|
Merge branch 'master' into upstream-merge-26776
|
2017-05-17 05:14:18 -04:00 |
|
LetterJay
|
4710beca0e
|
Merge pull request #807 from Citadel-Station-13/upstream-merge-26631
[MIRROR] 2017 Cult Overhaul P1: Cult Master and Datum Cult
|
2017-05-16 17:13:30 -04:00 |
|
LetterJay
|
00b17f1649
|
maybe
|
2017-05-14 00:28:07 -05:00 |
|
LetterJay
|
52fa1f314f
|
Merge branch 'master' into upstream-merge-26760
|
2017-05-14 01:02:26 -04:00 |
|
CitadelStationBot
|
f85a44ed52
|
2017 Cult Overhaul P1: Cult Master and Datum Cult
|
2017-05-06 11:56:16 -05:00 |
|
LetterJay
|
5d0f7eafaa
|
Merge pull request #719 from Citadel-Station-13/upstream-merge-26771
[MIRROR] Removes vestigial list from minds.
|
2017-05-05 09:40:28 -05:00 |
|
CitadelStationBot
|
56d5e12263
|
Moves languages to a holder datum, gives mind its own language holder
|
2017-05-05 08:13:04 -05:00 |
|
CitadelStationBot
|
6a365857d1
|
Should fix all of the cult/clockcult issues
|
2017-05-02 20:44:34 -05:00 |
|
CitadelStationBot
|
7baccb8b85
|
Removes vestigial list from minds.
|
2017-05-02 12:47:20 -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 |
|