LetterJay
1d19ee6bbf
Merge pull request #2566 from Citadel-Station-13/upstream-merge-30117
...
[MIRROR] Crew monitoring rework part 1: crew pinpointers
2017-09-11 22:41:24 -05:00
LetterJay
e2f9ec4f18
Merge pull request #2686 from Citadel-Station-13/upstream-merge-30538
...
[MIRROR] Uplink lock codes now pick from the phonetic alphabet global list
2017-09-11 18:54:53 -05:00
LetterJay
16c7706618
Merge branch 'master' into upstream-merge-30117
2017-09-11 18:10:15 -05:00
LetterJay
e6cc0673aa
Merge branch 'master' into upstream-merge-30399
2017-09-11 18:07: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
c42304737a
Update implantchair.dm
2017-09-11 17:47:55 -05:00
LetterJay
01920e5fea
Merge pull request #2661 from Citadel-Station-13/upstream-merge-30220
...
[MIRROR] Adds Archaeology Component
2017-09-11 15:22:59 -05:00
LetterJay
ecdb35bb1a
Merge pull request #2636 from Citadel-Station-13/upstream-merge-30396
...
[MIRROR] Fixes brains counting towards highlander killstreaks
2017-09-11 15:22:02 -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
80dbaae65a
fuck
2017-09-11 14:37:55 -05:00
LetterJay
a05bbfc90a
Update weaponry.dm
2017-09-11 14:07:11 -05:00
LetterJay
c03e216016
Update implantchair.dm
2017-09-11 14:05:58 -05:00
LetterJay
447937477e
more oopsies
2017-09-11 13:50:49 -05:00
Ashe Higgs
af5ffcc83a
Adds departmental banners
2017-09-11 13:37:58 -05:00
LetterJay
e5aed03bcb
all of my HATE
2017-09-10 15:20:58 -05:00
LetterJay
50587ea679
Update tools.dm
2017-09-10 15:18:30 -05:00
Leo
44e62d8016
Uplink lock codes now pick from the phonetic alphabet global list ( #30538 )
...
* Uplink lock codes now pick from the phonetic alphabet global list
* Update virus_cart.dm
2017-09-10 14:17:16 -05:00
LetterJay
3dbfac920a
Update weaponry.dm
2017-09-10 11:48:28 -05:00
LetterJay
33f35fe4d2
Update tools.dm
2017-09-10 11:46:34 -05:00
KorPhaeron
55f9874a08
Ladders cant be moved by the singularity ( #30518 )
...
It'd be weird to have the top part of a ladder moved five tiles and then still lead to the ladder underneath its old location. Just destroys it instead.
2017-09-10 06:06:17 -05:00
LetterJay
780faec591
Merge pull request #2652 from Citadel-Station-13/upstream-merge-30202
...
[MIRROR] You can now drag things up and down ladders
2017-09-09 00:59:58 -05:00
ExcessiveUseOfCobblestone
33f36fd0de
Adds Archaeology Component
2017-09-08 10:02:01 -05:00
Armhulen
0dfe72d77e
chainsaws rebalance, but working this time :)
2017-09-08 10:00:47 -05:00
kingofkosmos
cf07ead653
Regularizes resisting out of containers
2017-09-08 09:58:34 -05:00
LetterJay
d5c4f6e62d
Merge pull request #2649 from Citadel-Station-13/upstream-merge-30451
...
[MIRROR] Disablers and ions wont burn plasma statues statues
2017-09-07 15:55:04 -05:00
KorPhaeron
b9bbd348df
You can now drag things up and down ladders ( #30202 )
...
* Can drag things up and down ladders
* Somehow left out this line
* Icon update, auto_connect
* Uses the proper pulling proc
2017-09-07 12:48:43 -05:00
KorPhaeron
b172025e96
Disablers and ions wont burn statues
2017-09-07 10:34:44 -05:00
kingofkosmos
dd27a1850a
Adds a message when trying to move while buckled
2017-09-07 10:12:32 -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
d8a3b87719
Fixes brains counting towards highlander killstreaks
2017-09-07 05:14:39 -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
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
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
2bfc7872fa
cleanup
2017-09-02 07:06:37 -05:00
CitadelStationBot
50b88388da
Crew monitoring rework part 1: crew pinpointers
2017-08-30 17:03:20 -05:00
kevinz000
f70fd6a980
Merge pull request #2536
2017-08-29 22:39:54 -07:00
kevinz000
7239a44ef1
Merge pull request #2545
2017-08-29 22:39:08 -07:00
kevinz000
7c7da67169
Merge pull request #2547
2017-08-29 22:39:03 -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
408acdd66d
sync
2017-08-29 22:05:16 -07:00
kevinz000
9b71e967d2
Merge branch 'master' into upstream-merge-29964
2017-08-29 21:07:01 -07:00
