LetterJay
470d15fa2b
Update borer_event.dm
2017-09-13 07:13:45 -05:00
LetterJay
1471b6cac6
Merge branch 'master' into upstream-merge-30297
2017-09-13 06:41:37 -05:00
LetterJay
a960b63b0a
Merge branch 'master' into upstream-merge-30056
2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51
commit
2017-09-13 06:04:22 -05:00
LetterJay
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
LetterJay
0429a75e52
Merge pull request #2710 from Citadel-Station-13/upstream-merge-30592
...
[MIRROR] Fixed changeling augmented eyesight ability
2017-09-12 19:10:52 -05:00
LetterJay
dac6cc56e4
Merge branch 'master' into upstream-merge-30494
2017-09-12 02:40:24 -05:00
LetterJay
bf5094cf19
Update nuclearbomb.dm
2017-09-11 18:40:30 -05:00
msgerbs
d9abc21a9a
Fixed changeling augmented eyesight ability ( #30592 )
...
* Fix changeling augmented eyesight
Fix not being able to toggle changeling augmented eyesight off again.
* Fix augmented eyesight
Fix changeling's augmented eyesight ability.
* Fix changeling augmented vision
Fix changeling augmented vision, for real this time. Makes it properly grant night vision on purchase, remove granted effects on refund, and properly toggle on and off. Note, this changes it to x-ray vision, to replicate the way it has been working for well over a year.
2017-09-11 18:38:16 -05:00
LetterJay
16c7706618
Merge branch 'master' into upstream-merge-30117
2017-09-11 18:10:15 -05:00
LetterJay
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
LetterJay
240c5bdaad
Update game_mode.dm
2017-09-11 15:55:27 -05:00
LetterJay
59772e2afd
Update events.dm
2017-09-11 15:54:55 -05:00
LetterJay
16912124e5
Update ritual.dm
2017-09-11 15:54:38 -05:00
LetterJay
e767e20574
Update game_mode.dm
2017-09-11 15:49:54 -05:00
LetterJay
9bb9aaa17d
Update events.dm
2017-09-11 15:48:59 -05:00
LetterJay
6b671ffd06
Update ritual.dm
2017-09-11 15:48:24 -05:00
LetterJay
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
LetterJay
b008cdada0
oopsie woopsie
2017-09-11 13:47:33 -05:00
LetterJay
489b2c6deb
Update objective_items.dm
2017-09-11 13:08:35 -05:00
LetterJay
26c6f5cc14
Update pinpointer.dm
2017-09-11 13:07:35 -05:00
LetterJay
052fdb70ea
Update nuclearbomb.dm
2017-09-11 13:06:27 -05:00
LetterJay
6a47a7011a
Update nuclear.dm
2017-09-11 13:05:22 -05:00
LetterJay
48e71cfbd5
Update Malf_Modules.dm
2017-09-11 13:04:28 -05:00
KorPhaeron
d05fdb0eb0
Makes the station Z level into a list instead of a single define
2017-09-11 12:40:35 -05:00
kingofkosmos
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
LetterJay
c3fed32afb
Update prolonging_prism.dm
2017-09-10 15:17:25 -05:00
LetterJay
685c534d88
Merge pull request #2681 from Citadel-Station-13/upstream-merge-30524
...
[MIRROR] Removes a src.
2017-09-10 09:47:01 -05:00
CitadelStationBot
b363dc352f
[MIRROR] remove GLOB. ( #2683 )
...
* Merge pull request #30540 from p440/blobglob
remove GLOB.
* remove GLOB.
2017-09-10 09:07:18 -05:00
oranges
ee4052eb61
Merge pull request #30524 from ChangelingRain/srcremoval
...
Removes a src.
2017-09-10 06:02:06 -05:00
Jordan Brown
5b61c84df4
Merge pull request #30481 from YPOQ/shuntfix
...
Placing a robotics factory actually disables shunting
2017-09-08 21:25:28 -05:00
kingofkosmos
cf07ead653
Regularizes resisting out of containers
2017-09-08 09:58:34 -05:00
LetterJay
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
LetterJay
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
LetterJay
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
ShizCalev
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
tortellinitony
d73b82cf11
Gets rid of manual overlay manipulation
2017-09-06 23:39:08 -05:00
LetterJay
24a7aa5a9f
Merge branch 'master' into upstream-merge-30079
2017-09-06 09:24:23 -05:00
LetterJay
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
Poojawa
f0b01508bb
Removes swarmers from random events ( #2584 )
...
Greytide: Blue lightning meme is dead.
2017-09-04 02:47:56 -05:00
CitadelStationBot
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
LetterJay
3e0ead1204
Merge branch 'master' into upstream-merge-29105
2017-09-02 07:11:32 -05:00
LetterJay
88b452595f
Update antag_spawner.dm
2017-09-02 06:52:03 -05:00
CitadelStationBot
50b88388da
Crew monitoring rework part 1: crew pinpointers
2017-08-30 17:03:20 -05:00
kevinz000
039aea1724
Merge pull request #2541
2017-08-29 22:39:48 -07:00
kevinz000
7c7da67169
Merge pull request #2547
2017-08-29 22:39:03 -07:00
kevinz000
e7a3586ab4
Merge pull request #2464
2017-08-29 22:27:30 -07:00
kevinz000
a0758720ce
Merge branch 'master' into upstream-merge-30251
2017-08-29 22:06:28 -07:00
kevinz000
8530808d72
wew
2017-08-29 22:06:14 -07:00
kevinz000
1dc4e09682
Merge branch 'master' into upstream-merge-30250
2017-08-29 20:04:01 -07:00
