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
|
6310292531
|
woo
|
2017-05-02 11:19:14 -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
|
fd6df15f93
|
Merge branch 'master' into upstream-merge-26131
|
2017-05-02 09:19:49 -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
|
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 |
|
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
|
faaf0c17ba
|
Small fixes to spatial gateways
|
2017-05-01 11:39:13 -05:00 |
|
CitadelStationBot
|
242cc65eac
|
Gang Pen Is now Stealthy
|
2017-05-01 11:05:28 -05:00 |
|
LetterJay
|
7261d61983
|
Merge pull request #672 from Citadel-Station-13/upstream-merge-26717
[MIRROR] Moves antag datums to the mind
|
2017-05-01 08:09:22 -05:00 |
|
LetterJay
|
3955c7da7d
|
Merge pull request #651 from Citadel-Station-13/upstream-merge-26681
[MIRROR] You can no longer spam-spawn scarabs via Ratvar
|
2017-05-01 07:59:16 -05:00 |
|
LetterJay
|
817b259192
|
Merge pull request #648 from kevinz000/patch-2
Gives help intent groin functionality to wicker dolls
|
2017-05-01 07:58:09 -05:00 |
|
LetterJay
|
954b035868
|
Merge pull request #644 from Citadel-Station-13/upstream-merge-26651
[MIRROR] Replaces Double Agents with Internal Affairs
|
2017-05-01 07:56:17 -05:00 |
|
LetterJay
|
5cab328632
|
Merge pull request #638 from Citadel-Station-13/upstream-merge-26536
[MIRROR] Nerfs and buffs The Traps
|
2017-05-01 07:44:15 -05:00 |
|
LetterJay
|
56b3d36521
|
Merge pull request #632 from Citadel-Station-13/upstream-merge-26611
[MIRROR] Replaces Mending Motor with Mending Mantra
|
2017-05-01 07:42:51 -05:00 |
|
CitadelStationBot
|
9be1a5db4f
|
Moves antag datums to the mind
|
2017-04-30 14:32:15 -05:00 |
|
CitadelStationBot
|
e7f9e6652f
|
You can no longer spam-spawn scarabs via Ratvar
|
2017-04-29 15:44:47 -05:00 |
|
LetterJay
|
06bfa8770e
|
Merge branch 'master' into upstream-merge-26129
|
2017-04-29 11:45:37 -05:00 |
|
LetterJay
|
991fb8335c
|
manual merge
|
2017-04-29 11:42:28 -05:00 |
|
kevinz000
|
9b46470c57
|
Update artefact.dm
|
2017-04-29 02:34:43 -07:00 |
|
CitadelStationBot
|
bd4c8dc6c3
|
Replaces Double Agents with Internal Affairs
|
2017-04-28 21:08:24 -05:00 |
|
CitadelStationBot
|
e1883354ba
|
Nerfs and buffs The Traps
|
2017-04-28 21:03:57 -05:00 |
|
CitadelStationBot
|
fb924f1f8d
|
Blood Cult removals and tweaks
|
2017-04-28 21:01:48 -05:00 |
|
CitadelStationBot
|
3fa6f63608
|
Replaces Mending Motor with Mending Mantra
|
2017-04-28 20:57:31 -05:00 |
|
CitadelStationBot
|
6aa436c874
|
Whisper() now has the same args as Say()
|
2017-04-28 20:53:20 -05:00 |
|
LetterJay
|
a39b40d879
|
Merge pull request #578 from Citadel-Station-13/upstream-merge-25981
[MIRROR] Initialize Refactor
|
2017-04-28 09:29:00 -05:00 |
|
LetterJay
|
d34b65da86
|
Merge pull request #610 from Citadel-Station-13/upstream-merge-26612
[MIRROR] Even admin-called shuttles will be affected by alert level
|
2017-04-28 08:19:09 -05:00 |
|
LetterJay
|
eeef152079
|
Merge pull request #619 from Citadel-Station-13/upstream-merge-26630
[MIRROR] Abductor fixes and tweaks
|
2017-04-28 08:17:39 -05:00 |
|
CitadelStationBot
|
caaf42815a
|
Changes some << to to_chat
|
2017-04-28 06:14:47 -05:00 |
|
CitadelStationBot
|
aa5fec0bd8
|
Abductor fixes and tweaks
|
2017-04-28 06:13:42 -05:00 |
|
CitadelStationBot
|
57a0e05679
|
Even admin-called shuttles will be affected by alert level
|
2017-04-27 16:55:12 -05:00 |
|
CitadelStationBot
|
bcab389ca2
|
New() goes in the trash, we've gotta Initialize()
|
2017-04-26 17:15:48 -05:00 |
|
CitadelStationBot
|
08a01aa11b
|
Refactors roundstart checks slightly
|
2017-04-26 17:06:29 -05:00 |
|
CitadelStationBot
|
bde5d6253a
|
Unorphans the blackbox
|
2017-04-26 17:05:23 -05:00 |
|
CitadelStationBot
|
cea81a3357
|
Initialize Refactor
|
2017-04-26 16:03:17 -05:00 |
|
CitadelStationBot
|
84321916a5
|
Refactors ears into organs (#513)
* Refactors ear damage into ear organs
* Update human.dm
* Update species.dm
* Delete species.dm.rej
* Update tgstation.dme
* Delete tgstation.dme.rej
* Delete human.dm.rej
* Update tongue.dm
* Delete surgery.dmi
* upload fixed surgery.dmi
|
2017-04-26 09:52:35 -05:00 |
|
CitadelStationBot
|
a905c15dad
|
Replaces /image with /mutable_appearance (#556)
* Replaces /image with /mutable_appearance, where appropriate
* Update miscellaneous.dm
* Delete miscellaneous.dm.rej
* Delete pet.dm.rej
* Update pet.dm
* Update species.dm
* Update miscellaneous.dm
* Update species.dm
* Update miscellaneous.dm
* Delete species.dm.rej
* Update species.dm
pretty sure I got all the indentation correct THIS time, ffs
* Update species.dm
* Update species.dm
fucking tabs man, fucking tabs.
|
2017-04-26 08:18:35 -05:00 |
|
CitadelStationBot
|
13ab996a1e
|
Rod Form now costs 3 points
|
2017-04-25 23:13:42 -05:00 |
|
LetterJay
|
6dc70fc02f
|
Merge pull request #526 from Citadel-Station-13/upstream-merge-26289
[MIRROR] Changed alternate appearances to /datum/atom_hud s
|
2017-04-25 21:39:14 -05:00 |
|
CitadelStationBot
|
fb61c31470
|
Small abductors refactor
|
2017-04-25 03:59:08 -05:00 |
|
CitadelStationBot
|
de50b582ae
|
Braining/debraining fixes
|
2017-04-23 14:48:31 -05:00 |
|
CitadelStationBot
|
387caa518f
|
Changed alternate appearances to /datum/atom_hud s
|
2017-04-23 13:26:08 -05:00 |
|
CitadelStationBot
|
73d4469db5
|
Cult stuff now initializes
|
2017-04-19 04:40:07 -05:00 |
|
LetterJay
|
6e54eb217c
|
Merge pull request #433 from Citadel-Station-13/upstream-merge-26276
[MIRROR] Removes rogue GLOB from message
|
2017-04-18 01:12:11 -05:00 |
|
LetterJay
|
723da20d18
|
Merge pull request #432 from Citadel-Station-13/upstream-merge-26275
[MIRROR] Cultists can no longer delay the shuttle after Nar'sie is summoned
|
2017-04-18 01:12:02 -05:00 |
|
CitadelStationBot
|
bfcae4eb99
|
Removes rogue GLOB from message
|
2017-04-17 09:45:38 -05:00 |
|
CitadelStationBot
|
19647e1c61
|
Cultists can no longer delay the shuttle after Nar'sie is summoned
|
2017-04-17 09:45:34 -05:00 |
|
CitadelStationBot
|
dd76874f1c
|
Moves tesla_ignore from var on /mob/living to secondary flag
|
2017-04-17 09:45:30 -05:00 |
|