 KathrinBailey
|
05c74c731b
|
Ports TG pew files
|
2019-11-17 14:20:44 +00:00 |
|
|
Putnam
|
ba091b3a27
|
limited midround wizard summon events possibilities
|
2019-11-17 05:56:19 -08:00 |
|
|
Ghommie
|
641ddebed1
|
Ports "Uses defines for turf atmos"
|
2019-11-17 03:19:35 +01:00 |
|
|
lolman360
|
4d71f95b16
|
Merge branch 'master' into HeadCorgi
|
2019-11-17 12:24:04 +11:00 |
|
|
lolman360
|
aed866339f
|
pickup pickup pickup pickup 100% pickup
|
2019-11-17 12:00:17 +11:00 |
|
|
Putnam
|
73109f0858
|
Makes dynamic nukeops population scaling more like secret
|
2019-11-16 11:26:22 -08:00 |
|
|
Ghommie
|
613605e0d0
|
Unborking id consoles.
|
2019-11-16 17:49:12 +01:00 |
|
|
Putnam
|
f1205b4ab2
|
Makes meteor not repeatable.
|
2019-11-16 08:27:36 -08:00 |
|
|
DeltaFire15
|
9f8547d42d
|
Another sync (#4)
AAAAAAAAA
|
2019-11-16 16:12:12 +01:00 |
|
|
Seris02
|
b146fd14f3
|
actually adds the winter coats
|
2019-11-16 18:25:05 +08:00 |
|
|
YakumoChen
|
5c89447cf9
|
Update plushes.dm
|
2019-11-16 09:56:57 +00:00 |
|
|
kevinz000
|
21775ad3ee
|
Merge pull request #9813 from Ghommie/Ghommie-cit355
Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]"
|
2019-11-16 01:24:58 -07:00 |
|
|
kevinz000
|
66f8b5f404
|
Merge pull request #9769 from Ghommie/Ghommie-cit336
ID console fixes and other tweaks.
|
2019-11-16 01:17:23 -07:00 |
|
|
Lin
|
6aa6eaafe6
|
Merge branch 'master' into abductor-update
|
2019-11-15 23:24:51 +00:00 |
|
|
GrayRachnid
|
3edaf75722
|
Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons.
|
2019-11-15 16:58:45 -05:00 |
|
|
Ghommie
|
78c967fa20
|
A
|
2019-11-15 18:42:04 +01:00 |
|
|
Ghommie
|
2b104a7698
|
Ports "Fixes MMIs not being able to use mecha equipment"
|
2019-11-15 18:40:45 +01:00 |
|
|
Putnam
|
f3c4897b48
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
|
2019-11-14 22:31:48 -08:00 |
|
|
Putnam
|
009c0b46d5
|
Added some more blocking rules (whoops)
|
2019-11-14 22:28:42 -08:00 |
|
|
lolman360
|
57bd0f5fb8
|
Revert "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDROIIIIIIIIIIIIIIIIDS"
This reverts commit bc6c617c27.
|
2019-11-15 16:42:34 +11:00 |
|
|
lolman360
|
bc6c617c27
|
DDDDDDDDDDDDDDDDDDDDDDDDDDDDDROIIIIIIIIIIIIIIIIDS
|
2019-11-15 16:42:26 +11:00 |
|
|
Ghommie
|
c20bc123ab
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336
|
2019-11-15 01:10:39 +01:00 |
|
|
Ghommie
|
f401e622c3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
|
2019-11-15 01:01:08 +01:00 |
|
|
Ghommie
|
5bb6247a6d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit349
|
2019-11-15 00:57:38 +01:00 |
|
|
kevinz000
|
02e8a73265
|
Merge pull request #9737 from Ghommie/Ghommie-cit326
Ports techweb backend refactor & co.
|
2019-11-14 16:45:09 -07:00 |
|
|
kevinz000
|
d5a245945c
|
Merge pull request #9742 from Seris02/gpsthing
makes gps show location on examine
|
2019-11-14 16:44:40 -07:00 |
|
|
kevinz000
|
178aedc5cc
|
Merge pull request #9754 from Ghommie/Ghommie-cit330
porting "global to static"
|
2019-11-14 16:38:27 -07:00 |
|
|
Ghommie
|
6484eea339
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-11-15 00:36:50 +01:00 |
|
|
kevinz000
|
ca99a8285c
|
Merge pull request #9803 from Ghommie/Ghommie-cit350
Ports Improved beach away mission and some fluff mapping items.
|
2019-11-14 16:36:19 -07:00 |
|
|
kevinz000
|
d6f540faf7
|
Merge pull request #9796 from Ghommie/Ghommie-cit347
Unmodularize airlocks.
|
2019-11-14 16:24:56 -07:00 |
|
|
kevinz000
|
bd650e53da
|
Merge pull request #9795 from Ghommie/Ghommie-cit346
Unmodularize areas.
|
2019-11-14 16:24:36 -07:00 |
|
|
kevinz000
|
8c247a566a
|
Merge pull request #9783 from Ghommie/Ghommie-cit343
Fixing Aux base camera RCD door settings and toggle window type actions.
|
2019-11-14 16:22:08 -07:00 |
|
|
kevinz000
|
b8f59abe34
|
Merge pull request #9780 from Hatterhat/fastredbutton
the one PR about making big red buttons detonate syndibombs faster
|
2019-11-14 16:15:10 -07:00 |
|
|
kevinz000
|
4c89b8c33f
|
Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
|
2019-11-14 16:00:45 -07:00 |
|
|
kevinz000
|
6909857e04
|
Merge pull request #9632 from Ghommie/Ghommie-cit281
Porting multi-z support updates.
|
2019-11-14 15:58:53 -07:00 |
|
|
kevinz000
|
2f4562a63b
|
Merge pull request #9656 from Ghommie/Ghommie-cit290
Purging a lot of space indention in favor of tabs.
|
2019-11-14 15:55:04 -07:00 |
|
|
kevinz000
|
318c03cc28
|
Merge pull request #9683 from Ghommie/Ghommie-cit303
Dullahans fixes and QoL.
|
2019-11-14 15:52:11 -07:00 |
|
|
kevinz000
|
8f08e1017e
|
Merge pull request #9688 from Ghommie/Ghommie-cit306
Fixing gibspawner runtimes and improving them, how gruesome...
|
2019-11-14 15:51:20 -07:00 |
|
|
kevinz000
|
d8e89b235f
|
Merge pull request #9689 from Ghommie/Ghommie-cit307
How many times I have encountered this sort of issue in the past and how much of a meme it was...
|
2019-11-14 15:50:52 -07:00 |
|
|
kevinz000
|
af0962088c
|
Merge pull request #9453 from Ghommie/Ghommie-cit226
Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
|
2019-11-14 15:47:18 -07:00 |
|
|
kevinz000
|
dfa2296758
|
Merge pull request #9430 from Ghommie/Ghommie-cit220
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
|
2019-11-14 15:44:59 -07:00 |
|
|
Ghommie
|
98bc6d6c60
|
Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]"
|
2019-11-14 23:33:37 +01:00 |
|
|
Ghommie
|
358db4f390
|
Dreamchecker compatibility changes, part 2.
|
2019-11-14 14:54:12 +01:00 |
|
|
Putnam
|
3a6dce54ac
|
i'm like 90% sure this is what it's supposed to be.
|
2019-11-14 05:53:58 -08:00 |
|
|
Ghommie
|
322c90fab2
|
Mistake I have done when copypasting.
|
2019-11-14 13:32:57 +01:00 |
|
|
Putnam
|
304ce37d6c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
|
2019-11-14 02:23:48 -08:00 |
|
|
kevinz000
|
487f98bf68
|
Merge pull request #9775 from Ghommie/Ghommie-cit340
ports "Adds superlube to the clown ruin", "Replaces the slime extract in the clown biodome with a superlube sprayer." and buffs clown PDAs
|
2019-11-14 01:40:16 -07:00 |
|
|
kevinz000
|
3015ec5c04
|
Merge pull request #9764 from Ghommie/Ghommie-cit335
Dreamchecker compatibility changes, part 1.
|
2019-11-14 01:37:41 -07:00 |
|
|
BlackMajor
|
0c33757b14
|
Fixes a few bugs
|
2019-11-14 18:54:57 +13:00 |
|
|
BlackMajor
|
ce94da9ed3
|
Merge branch 'master' into Yote
|
2019-11-14 17:37:57 +13:00 |
|