CitadelStationBot
099b6628fa
[MIRROR] Full jobs will no longer be shown as priority for latejoiners ( #2729 )
...
* Full jobs will no longer be shown as priority for latejoiners
* Update card.dm
2017-09-13 22:54:41 -05:00
CitadelStationBot
d64c23b7f9
[MIRROR] Fix syndicate toy C20r and L6 Saw not having riot darts ( #2740 )
...
* Fix syndicate toy C20r and L6 Saw not having riot darts (#30645 )
* Add riot darts back into toy C20r and L6 Saw
Riot darts were removed from the unrestricted variants of these guns, also changed these ruins to use the new /riot variant in order to maintain original functionality.
* Comments are good
Especially when inheritance makes everything weird.
* Fix syndicate toy C20r and L6 Saw not having riot darts
2017-09-13 20:57:54 -05:00
CitadelStationBot
34edb1b5e4
[MIRROR] Fixes the Orion Trail machine ( #2703 )
...
* Fixes the Orion Trail machine
* Update arcade.dm
2017-09-13 18:08:18 -05:00
CitadelStationBot
9d52a495b2
[MIRROR] Fix monastery shuttle + Pods ( #2599 )
...
* Fix monastery shuttle + Pods
* actually ports podfix
2017-09-13 17:58:25 -05:00
CitadelStationBot
083fc1a7b4
[MIRROR] Standardized power displays ( #2539 )
...
* Standardized power displays
* Update tgui.js
* Delete tgui.js.rej
2017-09-13 17:57:16 -05:00
LetterJay
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
LetterJay
4ee17d5167
Merge pull request #2698 from Citadel-Station-13/upstream-merge-30583
...
[MIRROR] Fixes initialize hints for a fair number of mobs and items
2017-09-12 23:31:28 -05:00
LetterJay
a549f3128a
Update atmos_control.dm
2017-09-12 03:02:15 -05:00
LetterJay
deca859284
Update atmos_alert.dm
2017-09-12 03:00:11 -05:00
LetterJay
505925d767
Update atmos_alert.dm
2017-09-12 02:59:58 -05:00
LetterJay
dac6cc56e4
Merge branch 'master' into upstream-merge-30494
2017-09-12 02:40:24 -05:00
LetterJay
01b0e754c2
Merge pull request #2679 from Citadel-Station-13/upstream-merge-30531
...
[MIRROR] Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
2017-09-12 02:35:17 -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
b5c007ffdf
Update vending.dm
2017-09-11 17:50:56 -05:00
LetterJay
ea82bf9bfa
Update suit_storage_unit.dm
2017-09-11 17:47:48 -05:00
LetterJay
6d88e3642b
Update suit_storage_unit.dm
2017-09-11 14:27:28 -05:00
LetterJay
02d7a04fb1
Update suit_storage_unit.dm
2017-09-11 14:06:01 -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
vuonojenmustaturska
053b283745
Fixes initialize hints for a fair number of mobs and items
2017-09-11 12:20:19 -05:00
kingofkosmos
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
Kerbin-Fiber
d158ec9528
Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
2017-09-10 03:43:09 -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
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
kingofkosmos
cf07ead653
Regularizes resisting out of containers
2017-09-08 09:58:34 -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
LetterJay
17db844180
another mirror rebase for the PRMirror being down
2017-09-06 17:32:49 -05:00
LetterJay
bae0563d47
initial commit
2017-09-05 16:17:50 -05:00
Poojawa
5f1d88ffeb
Revert "[MIRROR] Port material containers to datum components" ( #2597 )
...
* Revert "sprite fix on kitsune tails"
This reverts commit 44d5b21a43#2591 )"
This reverts commit 7f46280d6b#2590 [ci skip]"
This reverts commit 201e07033f#2590 )"
This reverts commit 5c98b9a13b#2587 )"
This reverts commit 92e055be97#2557 [ci skip]"
This reverts commit 241a10d88d#2557 )"
This reverts commit d959b7538a#2562 )"
This reverts commit 32300086d5
2017-09-04 09:07:40 -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
CitadelStationBot
50b88388da
Crew monitoring rework part 1: crew pinpointers
2017-08-30 17:03:20 -05:00
kevinz000
17142cc247
Merge pull request #2530
2017-08-29 22:39:57 -07:00
kevinz000
d4c23fdcd1
Merge pull request #2546
2017-08-29 22:39:06 -07:00
kevinz000
9cb65df70d
Merge pull request #2426
2017-08-29 22:27:21 -07:00
kevinz000
5c7b743cfa
Merge pull request #2405
2017-08-29 22:27:10 -07:00
kevinz000
408acdd66d
sync
2017-08-29 22:05:16 -07:00
kevinz000
61159d6361
Merge branch 'master' into upstream-merge-30256
2017-08-29 20:17:03 -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
CitadelStationBot
38284056df
Fix rare AI tracking bug
2017-08-29 17:06:37 -05:00
kevinz000
301a581e64
sync
2017-08-29 09:41:11 -07:00
LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
LetterJay
b39bd24aaa
Merge branch 'master' into upstream-merge-30218
2017-08-28 09:03:46 -05:00
LetterJay
472e39693f
Update allinone.dm
2017-08-28 09:02:35 -05:00
LetterJay
02ba44a8eb
Merge pull request #2505 from Citadel-Station-13/upstream-merge-30169
...
[MIRROR] Allows disabling shuttle purchases per map.
2017-08-28 08:56:33 -05:00
CitadelStationBot
a6cc400a4b
Fixes allinone tcomms machine
2017-08-28 02:20:51 -05:00
CitadelStationBot
94400c4d38
Allows disabling shuttle purchases per map.
2017-08-26 11:08:12 -05:00
