14ce7c8118
Merge pull request #4101 from Citadel-Station-13/upstream-merge-32994
...
[MIRROR] Updates some item drops to use drop_location()
2017-11-25 05:53:16 +00:00
2762e3b530
Fixes Lord Singuloth hungering for more than he should
2017-11-24 13:00:42 -06:00
12aa356f10
Updates some item drops to use drop_location()
2017-11-24 12:59:33 -06:00
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
ddddac262e
Fixes blobbernaut spawning ( #32954 )
...
* Fixes blobbernaut spawning
* There is no mob yet, we can't poll for it
2017-11-21 22:27:49 -06:00
0feca054da
cleans up whitespace in traitor_bro.dm
2017-11-21 14:58:43 -05:00
973be1b494
Update traitor_bro.dm
2017-11-21 14:56:41 -05:00
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
2e210d08e1
Merge pull request #3639 from deathride58/IHAVENOIDEAWHATTHEFUCKIMDOING
...
[READY] Redtext bug fix + Endround objective check cleanup
2017-11-21 05:53:00 +00:00
d2b251d23c
Merge pull request #4041 from Citadel-Station-13/upstream-merge-32844
...
[MIRROR] Cleans up unused code
2017-11-21 04:15:11 +00:00
70c7996986
Fixes abductor teams getting assigned to same pod ( #32859 )
...
* Fixes abductors getting assigned to same team
* Remove explicit null return
2017-11-20 19:36:10 -06:00
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
c2864b3b8b
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into IHAVENOIDEAWHATTHEFUCKIMDOING
2017-11-20 00:21:38 -05:00
47b9cc2051
Fixes suicidal blobbernauts ( #32851 )
...
* Fixes suicidal blobbernauts
* Removes notransform
2017-11-18 18:37:50 -06:00
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
eea00b4d85
Update wizard.dm
2017-11-17 23:29:09 -05:00
a0d70d8823
Update traitor.dm
2017-11-17 23:28:09 -05:00
7b244b40fb
Update changeling.dm
2017-11-17 23:25:20 -05:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
286442cf4a
Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183
...
[MIRROR] Ling datum antag standarization.
2017-11-15 15:00:46 -06:00
a8d73f8ec2
Merge pull request #3948 from Citadel-Station-13/upstream-merge-32726
...
[MIRROR] Removes some attackby crowbar checks on nuclear bombs and camera assemblies
2017-11-15 10:51:04 -06:00
163ef812fb
Merge pull request #3945 from Citadel-Station-13/upstream-merge-32702
...
[MIRROR] Minor speedups to movement: First Blood Part 2
2017-11-15 10:41:16 -06:00
1939e96bb6
Merge branch 'master' into upstream-merge-32183
2017-11-15 10:22:40 -06:00
4d1ea753c3
Removes some attackby crowbar checks on nuclear bombs and camera assemblies ( #32726 )
2017-11-14 17:44:49 -06:00
528255833f
Merge pull request #3935 from Citadel-Station-13/upstream-merge-32684
...
[MIRROR] Fix the station integrity report to read the correct Z
2017-11-14 15:54:44 -06:00
8136148303
Minor speedups to movement: First Blood Part 2
2017-11-14 15:00:45 -06:00
aa8581d430
Fix the station integrity report to read the correct Z
...
Fixes a bug where the integrity of CentCom was being taken instead,
coming out at about 85% no matter what happened during the round. Also
removes the gang territory calculation now that it isn't used anywhere.
2017-11-14 12:45:47 -06:00
bd0cbee581
Cult pop scaling refactor ( #32598 )
2017-11-14 07:44:28 -06:00
0d65074f44
Merge pull request #3899 from Citadel-Station-13/upstream-merge-32635
...
[MIRROR] Fixes fleeing the station message accuracy
2017-11-13 11:44:16 -06:00
14944d8711
Merge branch 'master' into upstream-merge-32183
2017-11-12 23:09:55 -06:00
3ea8808201
Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161
...
[MIRROR] 512 forward compatibility merge
2017-11-12 23:06:55 -06:00
8814c55bfb
Merge pull request #32635 from AnturK/cowardsallofthem
...
Fixes fleeing the station message accuracy
2017-11-12 11:40:57 -06:00
7eccc3b2db
Merge pull request #3875 from Citadel-Station-13/upstream-merge-32445
...
[MIRROR] ok now i kinda tested the ark examine
2017-11-12 08:19:30 -06:00
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
e28a6eb82a
Merge pull request #3890 from Citadel-Station-13/upstream-merge-32578
...
[MIRROR] Fixes AIs being unable to place robotics factories
2017-11-11 15:56:22 -06:00
5cf5625568
Update airlock_maker.dm
2017-11-11 15:54:38 -06:00
6993018d9f
Merge pull request #32578 from YPOQ/factoryfix
...
Fixes AIs being unable to place robotics factories
2017-11-11 14:31:54 -06:00
bd88488c39
Updates the clockwork slab description ( #32610 )
...
* Updates the clockwork slab description
* Adds period to the end of clockwork slab description
2017-11-11 14:31:21 -06:00
a3ba99a7e8
Merge pull request #3869 from Citadel-Station-13/upstream-merge-32531
...
[MIRROR] Fixes word crimes
2017-11-11 12:37:43 -06:00
ecf49cd0a0
ok now i kinda tested the ark examine ( #32445 )
...
* No, I did NOT test the Ark examine.
* Update countdown.dm
* Update ark_of_the_clockwork_justicar.dm
* Update ark_of_the_clockwork_justicar.dm
* OK JOAN FIXED
* Update ark_of_the_clockwork_justicar.dm
2017-11-09 20:57:39 -06:00
3fa561c3b1
fixes spelling and stuff ( #32531 )
2017-11-09 11:04:50 -06:00
e6031b0d5c
Process_Spacemove proc improvement
2017-11-08 19:51:57 -06:00
db65ced87d
Merge pull request #3848 from Citadel-Station-13/upstream-merge-32446
...
[MIRROR] Xenobio blobbernauts can no longer walk on blob tiles
2017-11-08 01:45:28 -06:00
4b7970f4f7
Xenobio blobbernauts can no longer walk on blob tiles ( #32446 )
2017-11-07 10:30:21 -06:00
577d1b7d20
Marauder balancing pass ( #32448 )
2017-11-07 09:57:26 -06:00
3115e59b7e
Merge pull request #3827 from Citadel-Station-13/upstream-merge-32133
...
[MIRROR] Blobbernauts and spores are no longer killed by blob victory
2017-11-07 04:43:17 -06:00
0256aa8881
Merge pull request #3826 from Citadel-Station-13/upstream-merge-32359
...
[MIRROR] fixes cult hardsuit size
2017-11-07 04:43:02 -06:00
e420734e3a
Merge pull request #3819 from Citadel-Station-13/upstream-merge-32397
...
[MIRROR] Fixes Ark examine
2017-11-07 04:40:48 -06:00
f45515eaee
Update transform.dm
2017-11-07 03:28:38 -06:00
deathride58