LetterJay
|
17db844180
|
another mirror rebase for the PRMirror being down
|
2017-09-06 17:32:49 -05:00 |
|
LetterJay
|
24a7aa5a9f
|
Merge branch 'master' into upstream-merge-30079
|
2017-09-06 09:24:23 -05:00 |
|
LetterJay
|
b2d7ee0e51
|
Merge pull request #2537 from Citadel-Station-13/upstream-merge-30248
[MIRROR] Changes sql version to check for schema being ahead
|
2017-09-06 09:23:02 -05:00 |
|
LetterJay
|
cf46abecb3
|
Merge pull request #2436 from Citadel-Station-13/upstream-merge-30004
[MIRROR] Moved emagged var to obj/item parent.
|
2017-09-06 09:15:11 -05:00 |
|
LetterJay
|
2d469c62ef
|
Merge pull request #2617 from Citadel-Station-13/BadMirrorResolve
Bad mirror resolve
|
2017-09-06 08:59:20 -05:00 |
|
Poojawa
|
3ba2f650dd
|
Adds Paradise Sofas (#2623)
* Adds Paradise Sofas
* Actually enable them to be constructed
* Coding standards, sheesh
* am path guder
|
2017-09-06 07:54:23 -05:00 |
|
LetterJay
|
af409af9cf
|
additional files
|
2017-09-05 16:29:25 -05:00 |
|
LetterJay
|
bae0563d47
|
initial commit
|
2017-09-05 16:17:50 -05:00 |
|
LetterJay
|
737c8446c1
|
Merge pull request #2592 from Citadel-Station-13/ProperDisable
Disables the swarmer events for now
|
2017-09-05 15:57:19 -05:00 |
|
Poojawa
|
5f1d88ffeb
|
Revert "[MIRROR] Port material containers to datum components" (#2597)
* Revert "sprite fix on kitsune tails"
This reverts commit 44d5b21a43.
* Revert "Update vg_clothing_packs.dm (#2591)"
This reverts commit 7f46280d6b.
* Revert "Automatic changelog generation for PR #2590 [ci skip]"
This reverts commit 201e07033f.
* Revert "[MIRROR] Gives the detective a mass spectrometer (#2590)"
This reverts commit 5c98b9a13b.
* Revert "Quick sync (#2587)"
This reverts commit 92e055be97.
* Revert "Automatic changelog generation for PR #2557 [ci skip]"
This reverts commit 241a10d88d.
* Revert "Decreases hacked ai module cost (#2557)"
This reverts commit d959b7538a.
* Revert "[MIRROR] Port material containers to datum components (#2562)"
This reverts commit 32300086d5.
|
2017-09-04 09:07:40 -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 |
|
CitadelStationBot
|
5c98b9a13b
|
[MIRROR] Gives the detective a mass spectrometer (#2590)
* Gives the detective a mass spectrometer
* Actually adds it
|
2017-09-04 04:39:07 -05:00 |
|
LetterJay
|
92e055be97
|
Quick sync (#2587)
* sync since the mirror was down
* fucking byond
* can't forget these
|
2017-09-04 04:38:49 -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 |
|
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
|
2bfc7872fa
|
cleanup
|
2017-09-02 07:06:37 -05:00 |
|
LetterJay
|
88b452595f
|
Update antag_spawner.dm
|
2017-09-02 06:52:03 -05:00 |
|
LetterJay
|
78ed8f0913
|
Fixes mecha drill not working on windoors.
|
2017-09-02 05:35:36 -05:00 |
|
LetterJay
|
d8679dbfcf
|
Prevents hallucinations revealing people's identity
|
2017-09-02 05:33:55 -05:00 |
|
LetterJay
|
e310435892
|
UI objects should PIXEL_SCALE
|
2017-09-02 05:26:22 -05:00 |
|
CitadelStationBot
|
e70b6ceb33
|
Chasms will alert mobs below them when they form
|
2017-08-30 17:06:38 -05:00 |
|
kevinz000
|
17142cc247
|
Merge pull request #2530
|
2017-08-29 22:39:57 -07:00 |
|
kevinz000
|
f70fd6a980
|
Merge pull request #2536
|
2017-08-29 22:39:54 -07:00 |
|
kevinz000
|
039aea1724
|
Merge pull request #2541
|
2017-08-29 22:39:48 -07:00 |
|
kevinz000
|
00362331d3
|
Merge pull request #2543
|
2017-08-29 22:39:43 -07:00 |
|
kevinz000
|
7239a44ef1
|
Merge pull request #2545
|
2017-08-29 22:39:08 -07:00 |
|
kevinz000
|
d4c23fdcd1
|
Merge pull request #2546
|
2017-08-29 22:39:06 -07:00 |
|
kevinz000
|
7c7da67169
|
Merge pull request #2547
|
2017-08-29 22:39:03 -07:00 |
|
kevinz000
|
44c3aecb3b
|
Merge pull request #2549
|
2017-08-29 22:38:57 -07:00 |
|
kevinz000
|
f982cd1d5a
|
Merge pull request #2550
|
2017-08-29 22:38:54 -07:00 |
|
kevinz000
|
e7a3586ab4
|
Merge pull request #2464
|
2017-08-29 22:27:30 -07:00 |
|
kevinz000
|
0f37872fb5
|
Merge pull request #2463
|
2017-08-29 22:27:27 -07:00 |
|
kevinz000
|
2cce781728
|
Merge pull request #2430
|
2017-08-29 22:27:24 -07:00 |
|
kevinz000
|
9cb65df70d
|
Merge pull request #2426
|
2017-08-29 22:27:21 -07:00 |
|
kevinz000
|
4b32cf2e0f
|
Merge pull request #2415
|
2017-08-29 22:27:15 -07:00 |
|
kevinz000
|
5c7b743cfa
|
Merge pull request #2405
|
2017-08-29 22:27:10 -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
|
408acdd66d
|
sync
|
2017-08-29 22:05:16 -07:00 |
|
kevinz000
|
175224c5de
|
Merge branch 'master' into upstream-merge-29859
|
2017-08-29 21:14:45 -07:00 |
|
kevinz000
|
b9c58a2914
|
wew
|
2017-08-29 21:14:33 -07:00 |
|
kevinz000
|
9b71e967d2
|
Merge branch 'master' into upstream-merge-29964
|
2017-08-29 21:07:01 -07:00 |
|
kevinz000
|
61159d6361
|
Merge branch 'master' into upstream-merge-30256
|
2017-08-29 20:17:03 -07:00 |
|
kevinz000
|
632fd9771a
|
Merge branch 'master' into upstream-merge-30221
|
2017-08-29 20:16:47 -07:00 |
|
kevinz000
|
eebe84681f
|
sync
|
2017-08-29 20:16:25 -07:00 |
|
kevinz000
|
705427f05d
|
Merge branch 'master' into upstream-merge-30218
|
2017-08-29 20:15:47 -07:00 |
|
kevinz000
|
2b5d584c67
|
sync
|
2017-08-29 20:15:33 -07:00 |
|
kevinz000
|
343b508774
|
Merge branch 'master' into upstream-merge-30175
|
2017-08-29 20:14:56 -07:00 |
|