 CitadelStationBot
|
b19b680467
|
Fixes the recycler gibbing brainmobs
|
2017-05-13 18:01:09 -05:00 |
|
|
LetterJayandGitHub
|
22aef374e2
|
Merge branch 'master' into upstream-merge-26140
|
2017-05-13 01:28:34 -04:00 |
|
|
LetterJay
|
f5e8a7e4e4
|
rej merges
|
2017-05-12 23:57:11 -05:00 |
|
|
LetterJayandGitHub
|
a1c04dd314
|
Merge pull request #898 from LetterJay/master
Adds a hunter hat to the game/clothesmate
|
2017-05-12 16:24:17 -04:00 |
|
|
CitadelStationBotandkevinz000
|
779ba7ac89
|
Fixes a GC error with holocalls (#903)
|
2017-05-11 18:26:52 -07:00 |
|
|
LetterJay
|
43dd22425b
|
Citadel hat DMI/DM
Cleans up pointless files
|
2017-05-10 17:33:13 -05:00 |
|
|
kevinz000
|
2e0dd27978
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813
|
2017-05-07 22:28:00 -07:00 |
|
|
LetterJayandGitHub
|
2efe90055f
|
Revert "[MIRROR] Fixes say verbs not working"
|
2017-05-07 19:41:33 -04:00 |
|
|
kevinz000andGitHub
|
035dd93158
|
Merge pull request #756 from Citadel-Station-13/upstream-merge-26848
[MIRROR] Adds spewium toxin in traitor kits
|
2017-05-06 21:43:08 -07:00 |
|
|
kevinz000andGitHub
|
0e718e32cc
|
Merge pull request #760 from Citadel-Station-13/upstream-merge-26804
[MIRROR] Nuke op TC consoles can donate all TCs at once, and other small changes.
|
2017-05-06 21:23:46 -07:00 |
|
|
kevinz000andGitHub
|
91955ccb05
|
Delete Sleeper.dm.rej
|
2017-05-06 21:04:22 -07:00 |
|
|
kevinz000andGitHub
|
6880e7c373
|
Update Sleeper.dm
|
2017-05-06 21:03:17 -07:00 |
|
|
kevinz000andGitHub
|
329190d660
|
Merge pull request #809 from Citadel-Station-13/upstream-merge-26933
[MIRROR] Makes medbay vending machines buildable
|
2017-05-06 14:22:08 -07:00 |
|
|
kevinz000andGitHub
|
28f6096503
|
Merge pull request #788 from Citadel-Station-13/upstream-merge-26911
[MIRROR] Improves vending machine user feedback
|
2017-05-06 13:59:05 -07:00 |
|
|
CitadelStationBot
|
30f7e170a3
|
Makes medbay vending machines buildable
|
2017-05-06 13:52:12 -05:00 |
|
|
kevinz000andGitHub
|
62b8f929bb
|
Merge pull request #746 from Citadel-Station-13/upstream-merge-26794
[MIRROR] Turrets no longer target invisible creatures
|
2017-05-06 11:39:01 -07:00 |
|
|
CitadelStationBot
|
0fb29b2650
|
Improves vending machine user feedback
|
2017-05-05 18:10:01 -05:00 |
|
|
LetterJay
|
c489186c3f
|
message code
|
2017-05-05 10:38:03 -05:00 |
|
|
LetterJay
|
acf8cb1597
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26876
|
2017-05-05 10:26:02 -05:00 |
|
|
LetterJay
|
1bb43eb7ae
|
woo
|
2017-05-05 10:21:53 -05:00 |
|
|
LetterJayandGitHub
|
caaf0fc2ee
|
Merge pull request #698 from Citadel-Station-13/upstream-merge-25743
[MIRROR] Holocalls
|
2017-05-05 10:19:28 -05:00 |
|
|
LetterJay
|
20f3280c96
|
this one time i ate boiled peanuts
|
2017-05-05 09:52:47 -05:00 |
|
|
CitadelStationBot
|
56d5e12263
|
Moves languages to a holder datum, gives mind its own language holder
|
2017-05-05 08:13:04 -05:00 |
|
|
CitadelStationBot
|
f7d45f3010
|
Fixes say verbs not working
|
2017-05-04 18:41:04 -05:00 |
|
|
CitadelStationBot
|
4140cffc98
|
Nuke op TC consoles can donate all TCs at once, and other small changes.
|
2017-05-04 18:08:14 -05:00 |
|
|
CitadelStationBot
|
46d7976488
|
Adds spewium toxin in traitor kits
|
2017-05-04 17:53:42 -05:00 |
|
|
CitadelStationBot
|
a54b541635
|
Turrets no longer target invisible creatures
|
2017-05-04 06:07:09 -05:00 |
|
|
CitadelStationBot
|
33a93a611b
|
Curator Update
|
2017-05-03 22:22:12 -05:00 |
|
|
CitadelStationBot
|
fed69ce0ca
|
Fixes sleepers.
|
2017-05-03 00:00:08 -05:00 |
|
|
LetterJay
|
4ecbec1406
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26720
|
2017-05-02 11:36:27 -05:00 |
|
|
LetterJay
|
6310292531
|
woo
|
2017-05-02 11:19:14 -05:00 |
|
|
LetterJayandGitHub
|
159f7f8d90
|
Merge pull request #602 from Citadel-Station-13/upstream-merge-26373
[MIRROR] Fixes being unable to empty an emagged cloning pod via manual ejection.
|
2017-05-02 11:14:14 -05:00 |
|
|
LetterJayandGitHub
|
8af590f075
|
Merge pull request #591 from Citadel-Station-13/upstream-merge-26601
[MIRROR] When jumpsuits take severe damage, their suit sensors break.
|
2017-05-02 11:10:13 -05:00 |
|
|
LetterJayandGitHub
|
3b8484b52b
|
Merge pull request #579 from Citadel-Station-13/upstream-merge-26129
[MIRROR] Unorphans the blackbox
|
2017-05-02 05:13:49 -05:00 |
|
|
CitadelStationBot
|
036109de58
|
Changes a bunch of hrefs to the proper defines
|
2017-05-02 02:20:07 -05:00 |
|
|
CitadelStationBot
|
cc0a9b87fb
|
Changes /obj/machinery to have atom/movable occupants
|
2017-05-01 15:58:52 -05:00 |
|
|
CitadelStationBot
|
36dfc5a4db
|
Holocalls
|
2017-05-01 12:53:40 -05:00 |
|
|
LetterJay
|
1842665af6
|
idjeet
|
2017-05-01 08:38:03 -05:00 |
|
|
LetterJayandGitHub
|
3d6845675a
|
Merge pull request #679 from Citadel-Station-13/upstream-merge-26709
[MIRROR] Readds deepstorage w/ tweaks AND adds water bottles to vending machines
|
2017-05-01 08:10:13 -05:00 |
|
|
LetterJayandGitHub
|
442fef549e
|
Merge pull request #664 from Citadel-Station-13/upstream-merge-26698
[MIRROR] Message monitor fix + spawn kill
|
2017-05-01 08:02:54 -05:00 |
|
|
LetterJayandGitHub
|
647a9967ba
|
Merge pull request #656 from Citadel-Station-13/upstream-merge-26538
[MIRROR] Bank Machine now uses the radio rather than announcements
|
2017-05-01 08:00:41 -05:00 |
|
|
LetterJayandGitHub
|
e9dc5bcd95
|
Merge pull request #643 from Citadel-Station-13/upstream-merge-26643
[MIRROR] Makes dance machine GBP requirements track-based instead of hardcoded
|
2017-05-01 07:56:37 -05:00 |
|
|
LetterJayandGitHub
|
f2af0cac91
|
Merge pull request #635 from Citadel-Station-13/upstream-merge-26602
[MIRROR] Makes it less painful to add songs to the disco machine
|
2017-05-01 07:43:27 -05:00 |
|
|
LetterJayandGitHub
|
5b45983c4c
|
Merge pull request #629 from Citadel-Station-13/upstream-merge-26654
[MIRROR] Rechargers no longer flash the charged animation before charging
|
2017-05-01 07:41:53 -05:00 |
|
|
CitadelStationBot
|
7a4f1496e9
|
Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted
|
2017-05-01 07:24:45 -05:00 |
|
|
CitadelStationBot
|
87e306851d
|
Readds deepstorage w/ tweaks AND adds water bottles to vending machines
|
2017-05-01 07:24:41 -05:00 |
|
|
CitadelStationBot
|
b2a5a9fad5
|
Message monitor fix + spawn kill
|
2017-04-30 11:22:17 -05:00 |
|
|
CitadelStationBot
|
e775ce3f35
|
Bank Machine now uses the radio rather than announcements
|
2017-04-29 16:58:04 -05:00 |
|
|
LetterJayandGitHub
|
06bfa8770e
|
Merge branch 'master' into upstream-merge-26129
|
2017-04-29 11:45:37 -05:00 |
|
|
LetterJay
|
991fb8335c
|
manual merge
|
2017-04-29 11:42:28 -05:00 |
|