5b61c84df4
Merge pull request #30481 from YPOQ/shuntfix
...
Placing a robotics factory actually disables shunting
2017-09-08 21:25:28 -05:00
8d854a53d8
Merge pull request #2637 from Citadel-Station-13/upstream-merge-30426
...
[MIRROR] Fixes swarmers breaking the SM's containment
2017-09-07 10:21:57 -05:00
31102d0ec4
Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262
...
[MIRROR] Soft crit, except not terrible
2017-09-07 10:01:35 -05:00
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
7fb4426011
Fixes swarmers breaking the SM's containment ( #30426 )
...
* Fixes swamers breaking the SM
* Switched checks to use get_area
2017-09-07 05:17:51 -05:00
24a7aa5a9f
Merge branch 'master' into upstream-merge-30079
2017-09-06 09:24:23 -05:00
2f95892d6b
I feel like it's more appropriate to disable them via vars instead of flatout commenting the entire dm file out. I also feel like it may be better to take another look at these instead of removing them outright anyway.
2017-09-04 05:27:32 -05:00
f0b01508bb
Removes swarmers from random events ( #2584 )
...
Greytide: Blue lightning meme is dead.
2017-09-04 02:47:56 -05:00
e353091c47
[MIRROR] Fixes shield blobs not blocking atmos ( #2575 )
...
* Fixes shield blobs not blocking atmos
* atmosia blocking
2017-09-04 02:47:09 -05:00
3e0ead1204
Merge branch 'master' into upstream-merge-29105
2017-09-02 07:11:32 -05:00
88b452595f
Update antag_spawner.dm
2017-09-02 06:52:03 -05:00
039aea1724
Merge pull request #2541
2017-08-29 22:39:48 -07:00
7c7da67169
Merge pull request #2547
2017-08-29 22:39:03 -07:00
e7a3586ab4
Merge pull request #2464
2017-08-29 22:27:30 -07:00
a0758720ce
Merge branch 'master' into upstream-merge-30251
2017-08-29 22:06:28 -07:00
8530808d72
wew
2017-08-29 22:06:14 -07:00
1dc4e09682
Merge branch 'master' into upstream-merge-30250
2017-08-29 20:04:01 -07:00
5f3775388c
Gives cult blades updated item and inhand sprites
2017-08-29 17:08:43 -05:00
5591afc9ce
double wew
2017-08-29 09:53:11 -07:00
e4ae2c8021
wew
2017-08-29 09:44:30 -07:00
b753909958
Cult ghosts can no longer be potentially deconverted or debrained
2017-08-29 10:25:31 -05:00
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
27750d91d6
Merge pull request #2529 from Citadel-Station-13/upstream-merge-30214
...
[MIRROR] Removes the suppose-to-be unused shuttle wall path
2017-08-28 09:01:47 -05:00
12ff0e7406
Removes the suppose-to-be unused shuttle wall path
2017-08-28 02:20:45 -05:00
2d4bd6f6f0
Fixes survival_pods being a valid_territory for gangs sprays & dominations/blob takeovers/cult summons/ect
2017-08-28 02:20:30 -05:00
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
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
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
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
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
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
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
2241f5ecfb
Update cult_items.dm
2017-08-21 23:32:21 -05:00
cef534face
Update mutations.dm
2017-08-21 23:31:55 -05:00
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
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
f2f1474123
Merge pull request #2322 from Citadel-Station-13/upstream-merge-29747
...
[MIRROR] Removes a great amount of machinery copypasta with circuitboards.
2017-08-21 20:32:10 -05:00
772299445e
Makes the Ark of the Clockwork Justicar much more fancy
2017-08-20 19:55:15 -05:00
ae9e4495f9
Merge branch 'master' into upstream-merge-29747
2017-08-20 09:53:17 -05:00
196c9d0597
Adds tracking amount of time spent playing departments 2: The fall of the Assistants.
2017-08-20 06:01:24 -05:00
95cbe66a3a
Merge pull request #2362 from Citadel-Station-13/upstream-merge-29870
...
[MIRROR] Fixes a typo in the blobbernaut spawn text
2017-08-18 13:41:37 -05:00
8a7c0e657f
Update powers.dm
2017-08-18 11:20:36 -05:00
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
4bd5e318c2
Blobs can now sense loving cuddles!
2017-08-16 18:00:54 -05:00
0ffaf66d1f
Merge branch 'master' into upstream-merge-29690
2017-08-15 19:18:22 -05:00
ab27b63cf9
Merge branch 'master' into upstream-merge-29611
2017-08-15 18:55:12 -05:00
31b501aa1a
Merge branch 'master' into upstream-merge-29885
2017-08-14 19:41:45 -05:00
5fd3a8355c
Fixes the Resurrect Cultist rune not working
2017-08-14 16:05:33 -05:00
e986657b16
Makes mulligan antag check for gamemode required players
2017-08-14 06:25:03 -05:00
7fe8dd208d
[s] Clean up some inputs
2017-08-14 02:44:24 -05:00
Jordan Brown