LetterJay
74a163db23
Merge pull request #2553 from Citadel-Station-13/upstream-merge-30252
...
[MIRROR] Server tools versioning and fix to displayed testmerges
2017-09-11 13:12:10 -05:00
LetterJay
17db844180
another mirror rebase for the PRMirror being down
2017-09-06 17:32:49 -05:00
LetterJay
00199af27d
Merge branch 'master' into upstream-merge-29866
2017-09-06 09:21:53 -05:00
Poojawa
5f1d88ffeb
Revert "[MIRROR] Port material containers to datum components" ( #2597 )
...
* Revert "sprite fix on kitsune tails"
This reverts commit 44d5b21a43#2591 )"
This reverts commit 7f46280d6b#2590 [ci skip]"
This reverts commit 201e07033f#2590 )"
This reverts commit 5c98b9a13b#2587 )"
This reverts commit 92e055be97#2557 [ci skip]"
This reverts commit 241a10d88d#2557 )"
This reverts commit d959b7538a#2562 )"
This reverts commit 32300086d5
2017-09-04 09:07:40 -05:00
CitadelStationBot
32300086d5
[MIRROR] Port material containers to datum components ( #2562 )
...
* Port material containers to datum components
* Fixes Rej
2017-09-04 04:08:42 -05:00
LetterJay
3e0ead1204
Merge branch 'master' into upstream-merge-29105
2017-09-02 07:11:32 -05:00
LetterJay
a6aa71e0b9
commit
2017-09-01 09:52:29 -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
kevinz000
039aea1724
Merge pull request #2541
2017-08-29 22:39:48 -07:00
kevinz000
f33f543d8a
Merge branch 'master' into upstream-merge-30254
2017-08-29 22:12:34 -07:00
kevinz000
1dc4e09682
Merge branch 'master' into upstream-merge-30250
2017-08-29 20:04:01 -07:00
LetterJay
b2114a7b81
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-08-29 21:19:22 -05:00
CitadelStationBot
3e1031d6b9
Adds a ghost verb to see all available ghost spawners
2017-08-29 17:45:50 -05:00
CitadelStationBot
1caba77431
Server tools versioning and fix to displayed testmerges
2017-08-29 17:16:17 -05:00
kevinz000
5f5065eb46
kek
2017-08-29 09:59:57 -07:00
CitadelStationBot
b753909958
Cult ghosts can no longer be potentially deconverted or debrained
2017-08-29 10:25:31 -05:00
CitadelStationBot
d55bac862e
Updates out of date documentation
2017-08-28 14:52:27 -05:00
LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
LetterJay
02ba44a8eb
Merge pull request #2505 from Citadel-Station-13/upstream-merge-30169
...
[MIRROR] Allows disabling shuttle purchases per map.
2017-08-28 08:56:33 -05:00
LetterJay
1457e388c2
Merge pull request #2494 from Citadel-Station-13/upstream-merge-30183
...
[MIRROR] Small devil fixes.
2017-08-28 08:45:16 -05:00
CitadelStationBot
4c4bd22578
[MIRROR] Some more tweaks to Geis ( #2487 )
...
fixes clockcult conversion being :b:roken, as well as some geis tweaks that you won't care about
2017-08-27 01:36:17 -07:00
CitadelStationBot
14ceaa39b4
Fixes component dupe checks not actually checking if there IS a dupe component ( #2501 )
2017-08-26 19:11:03 -07:00
kevinz000
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
CitadelStationBot
94400c4d38
Allows disabling shuttle purchases per map.
2017-08-26 11:08:12 -05:00
CitadelStationBot
e9180afe0a
Small devil fixes.
2017-08-26 11:07:16 -05:00
kevinz000
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
CitadelStationBot
3ef56206c1
Fixes component cleanup ( #2485 )
2017-08-24 18:31:54 -07:00
kevinz000
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
LetterJay
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
CitadelStationBot
b5e7f7f7fe
[MIRROR] Adds defines for mouse_opacity ( #2381 )
...
* Adds defines for mouse_opacity
* Delete misc.dm.rej
* Update misc.dm
2017-08-21 20:29:37 -07:00
LetterJay
dfd5c7465b
Merge pull request #2246 from Citadel-Station-13/upstream-merge-29647
...
[MIRROR] Fixes SendSignal()
2017-08-21 21:50:39 -05:00
LetterJay
259edee5a2
Update component.dm
2017-08-21 18:49:14 -05:00
LetterJay
17c0c4ba79
FUCK
2017-08-21 18:39:30 -05:00
LetterJay
39a69c2a28
Update component.dm
2017-08-21 16:50:29 -05:00
LetterJay
ab26b486b7
Update component.dm
2017-08-21 02:38:51 -05: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
5eea016593
You can now click on symptoms in the Pandemic to see their description and stats
2017-08-19 18:52:55 -05:00
CitadelStationBot
c17ca3001f
Diseases will properly make new symptoms instead of sharing the same for everyone
2017-08-19 18:41:34 -05:00
LetterJay
46e7d7a9c4
Merge branch 'master' into upstream-merge-29647
2017-08-19 12:25:49 -05:00
CitadelStationBot
45d6ece7a8
Adds a warning to the traitor panel for the last headrev
2017-08-18 18:57:53 -05:00
LetterJay
85a10be496
Merge pull request #2221 from Citadel-Station-13/upstream-merge-29523
...
[MIRROR] Makes GetComponent() faster using typecache magic
2017-08-18 14:16:44 -05:00
LetterJay
2c33ef3ab0
Update component.dm
2017-08-18 13:56:47 -05:00
CitadelStationBot
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
LetterJay
0ffaf66d1f
Merge branch 'master' into upstream-merge-29690
2017-08-15 19:18:22 -05:00
LetterJay
ab27b63cf9
Merge branch 'master' into upstream-merge-29611
2017-08-15 18:55:12 -05:00
CitadelStationBot
3d83b55cf6
Annihilates the colons!
2017-08-15 10:49:55 -05:00
LetterJay
69bf7e42cf
Merge branch 'master' into upstream-merge-29288
2017-08-14 18:35:28 -05:00
