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
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
914cc38a2d
Merge pull request #2676 from Citadel-Station-13/upstream-merge-30515
...
[MIRROR] Added warnings for ultrasafe and safe security modes
2017-09-11 17:54:18 -05:00
LetterJay
c42304737a
Update implantchair.dm
2017-09-11 17:47:55 -05:00
LetterJay
ea82bf9bfa
Update suit_storage_unit.dm
2017-09-11 17:47:48 -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
6d88e3642b
Update suit_storage_unit.dm
2017-09-11 14:27:28 -05:00
LetterJay
a05bbfc90a
Update weaponry.dm
2017-09-11 14:07:11 -05:00
LetterJay
02d7a04fb1
Update suit_storage_unit.dm
2017-09-11 14:06:01 -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
LetterJay
b008cdada0
oopsie woopsie
2017-09-11 13:47:33 -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
LetterJay
c3fed32afb
Update prolonging_prism.dm
2017-09-10 15:17:25 -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
LetterJay
72bd5e18f4
Merge pull request #2682 from Citadel-Station-13/upstream-merge-30518
...
[MIRROR] Ladders cant be moved by the singularity
2017-09-10 09:47:20 -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
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
oranges
ee4052eb61
Merge pull request #30524 from ChangelingRain/srcremoval
...
Removes a src.
2017-09-10 06:02:06 -05:00
AnturK
317958fb5c
Fixes more CanPass misuse ( #30493 )
...
* Fixes more CanPass misuse
* Let's not give wrong impression
* spans
2017-09-09 19:41:02 -05:00
Jordan Brown
eaeaae7bef
Added warnings for ultrasafe and safe security modes ( #30515 )
2017-09-09 19:39:52 -05:00
LetterJay
41a3fd8467
Merge pull request #2672 from Citadel-Station-13/upstream-merge-30481
...
[MIRROR] Placing a robotics factory actually disables shunting
2017-09-09 01:05:54 -05:00
LetterJay
ba3f92fa17
Merge pull request #2671 from Citadel-Station-13/upstream-merge-30504
...
[MIRROR] Windoors open when emagged again
2017-09-09 01:05:30 -05:00
LetterJay
a3e5bfc496
Merge pull request #2669 from Citadel-Station-13/upstream-merge-30489
...
[MIRROR] Makes computers lose their light when their screens break
2017-09-09 01:05:09 -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
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
Jordan Brown
d60a6729d3
Merge pull request #30504 from YPOQ/windooremagfix
...
Windoors open when emagged again
2017-09-08 21:22:16 -05:00
oranges
25a5325e24
Merge pull request #30489 from Cyberboss/CompLightFix
...
Makes computers lose their light when their screens break
2017-09-08 21:01:39 -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
LetterJay
82cfa67581
Merge pull request #2644 from Citadel-Station-13/upstream-merge-30233
...
[MIRROR] Adds a message when trying to move while buckled
2017-09-07 15:53:38 -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
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
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
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
ShizCalev
d8a3b87719
Fixes brains counting towards highlander killstreaks
2017-09-07 05:14:39 -05:00
