bf5094cf19
Update nuclearbomb.dm
2017-09-11 18:40:30 -05:00
16c7706618
Merge branch 'master' into upstream-merge-30117
2017-09-11 18:10:15 -05:00
6cc0ea6af0
Merge pull request #2659 from Citadel-Station-13/upstream-merge-30412
...
[MIRROR] Regularizes resisting out of containers
2017-09-11 18:05:52 -05:00
c46c442896
Merge pull request #2635 from Citadel-Station-13/upstream-merge-30454
...
[MIRROR] Gets rid of manual overlay manipulation
2017-09-11 15:21:43 -05:00
b008cdada0
oopsie woopsie
2017-09-11 13:47:33 -05:00
489b2c6deb
Update objective_items.dm
2017-09-11 13:08:35 -05:00
26c6f5cc14
Update pinpointer.dm
2017-09-11 13:07:35 -05:00
052fdb70ea
Update nuclearbomb.dm
2017-09-11 13:06:27 -05:00
6a47a7011a
Update nuclear.dm
2017-09-11 13:05:22 -05:00
48e71cfbd5
Update Malf_Modules.dm
2017-09-11 13:04:28 -05:00
c3fed32afb
Update prolonging_prism.dm
2017-09-10 15:17:25 -05:00
685c534d88
Merge pull request #2681 from Citadel-Station-13/upstream-merge-30524
...
[MIRROR] Removes a src.
2017-09-10 09:47:01 -05:00
b363dc352f
[MIRROR] remove GLOB. ( #2683 )
...
* Merge pull request #30540 from p440/blobglob
remove GLOB.
* remove GLOB.
2017-09-10 09:07:18 -05:00
ee4052eb61
Merge pull request #30524 from ChangelingRain/srcremoval
...
Removes a src.
2017-09-10 06:02:06 -05:00
5b61c84df4
Merge pull request #30481 from YPOQ/shuntfix
...
Placing a robotics factory actually disables shunting
2017-09-08 21:25:28 -05:00
cf07ead653
Regularizes resisting out of containers
2017-09-08 09:58:34 -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
d73b82cf11
Gets rid of manual overlay manipulation
2017-09-06 23:39:08 -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
50b88388da
Crew monitoring rework part 1: crew pinpointers
2017-08-30 17:03:20 -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
LetterJay