Commit Graph

2764 Commits

Author SHA1 Message Date
LetterJay
1ec7cfaba0 Create tgui.js 2017-06-10 14:11:20 -05:00
LetterJay
7e8746d436 Create config.py 2017-06-10 10:07:47 -05:00
LetterJay
50b56ef4c9 Update minibot.py 2017-06-10 10:07:32 -05:00
LetterJay
f7b4e983ae Update nudge.py 2017-06-10 10:06:49 -05:00
CitadelStationBot
1de6608bb4 Automatic changelog generation for PR #1500 [ci skip] 2017-06-10 09:52:06 -05:00
LetterJay
38d66ab06a Merge pull request #1500 from Citadel-Station-13/upstream-merge-28165
[MIRROR] Adds Medal Commendations!
2017-06-10 09:52:05 -05:00
LetterJay
47687a6d1a cleanup 2017-06-10 09:42:08 -05:00
LetterJay
eac4854adf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-28165 2017-06-10 09:38:21 -05:00
LetterJay
522b6d917f updates 2017-06-10 09:36:39 -05:00
LetterJay
700004e309 Update lockbox.dm 2017-06-10 09:24:03 -05:00
LetterJay
82c34cca96 update master 2017-06-10 09:09:53 -05:00
CitadelStationBot
8a1c8f70b5 Automatic changelog generation for PR #1445 [ci skip] 2017-06-10 09:01:26 -05:00
LetterJay
7189249f66 Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115
[MIRROR] A large and unasked for  repath and improvement of accessories (formerly ties, but actually armbands and medals)
2017-06-10 09:01:25 -05:00
LetterJay
8a628cf13f Delete ties.dm 2017-06-10 09:00:08 -05:00
LetterJay
4b59b3b717 Merge pull request #1510 from deathride58/fixoof
Fixes oof.ogg
2017-06-10 08:53:47 -05:00
LetterJay
005589362d Merge pull request #1313 from Citadel-Station-13/upstream-merge-27890
[MIRROR] Fixes faulty query and logic
2017-06-10 08:50:23 -05:00
LetterJay
79794685c3 Merge branch 'master' into upstream-merge-27890 2017-06-10 08:02:27 -05:00
LetterJay
ee2ca2d4ba Merge pull request #1512 from Citadel-Station-13/upstream-merge-28239
[MIRROR] Fixes communications consoles
2017-06-10 07:59:05 -05:00
CitadelStationBot
a583375bea Automatic changelog generation for PR #1513 [ci skip] 2017-06-10 07:58:39 -05:00
LetterJay
1bd5b2d3ab Merge pull request #1513 from Citadel-Station-13/upstream-merge-28240
[MIRROR] Makes dismembered heads and brains respect NOCLONE
2017-06-10 07:58:38 -05:00
LetterJay
01c9923050 Merge pull request #1514 from Citadel-Station-13/upstream-merge-28233
[MIRROR] Adds /image/proc/copy_overlays
2017-06-10 07:58:19 -05:00
LetterJay
ce5880599e Merge pull request #1515 from Citadel-Station-13/upstream-merge-28251
[MIRROR] Changes Amanitin log message
2017-06-10 07:57:54 -05:00
CitadelStationBot
c474c3bb6e Automatic changelog generation for PR #1516 [ci skip] 2017-06-10 07:57:36 -05:00
LetterJay
a1e1a95a9a Merge pull request #1516 from Citadel-Station-13/upstream-merge-28258
[MIRROR] Polishes the glass tables
2017-06-10 07:57:35 -05:00
CitadelStationBot
d8e6b4acc2 Polishes the glass tables 2017-06-10 02:02:40 -05:00
CitadelStationBot
b1b39093e9 Changes Amanitin log message 2017-06-09 20:27:10 -05:00
CitadelStationBot
9a8778b16f Adds /image/proc/copy_overlays 2017-06-09 20:11:51 -05:00
CitadelStationBot
b2cc05b6b5 Makes dismembered heads and brains respect NOCLONE 2017-06-09 20:08:45 -05:00
CitadelStationBot
7658deae09 Fixes communications consoles 2017-06-09 20:08:42 -05:00
deathride58
3c0ceae3a4 fixes oof.ogg 2017-06-09 20:24:19 -04:00
deathride58
f91ac1dfb0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into fixoof 2017-06-09 20:21:24 -04:00
CitadelStationBot
f5d219bc6b Automatic changelog generation for PR #1487 [ci skip] 2017-06-09 15:55:32 -05:00
LetterJay
12ea900051 Merge pull request #1487 from Citadel-Station-13/upstream-merge-28189
[MIRROR] Fixes #8044, being able to hold defib paddles while dead, by removing NODROP from them
2017-06-09 15:55:30 -05:00
LetterJay
7fa05ca854 Merge pull request #1489 from Citadel-Station-13/upstream-merge-27960
[MIRROR] [READY] Gang Points Refactor - Now stored in the gang datum
2017-06-09 09:37:58 -05:00
LetterJay
6a819ed7a4 Merge pull request #1493 from Citadel-Station-13/upstream-merge-28190
[MIRROR] [Meta] atmosia pump layer fix
2017-06-09 09:36:21 -05:00
LetterJay
0bd03c7fd3 Merge pull request #1504 from Citadel-Station-13/upstream-merge-28209
[MIRROR] Moves borer completion to gamemode
2017-06-09 09:36:00 -05:00
LetterJay
37c5f4858d Merge pull request #1503 from Citadel-Station-13/upstream-merge-28224
[MIRROR] Fix related CID/IPs on player panel
2017-06-09 09:35:29 -05:00
LetterJay
910fcb01bd Merge pull request #1316 from Citadel-Station-13/upstream-merge-27869
[MIRROR] [Omega] Fixes checkered plating
2017-06-09 09:13:46 -05:00
LetterJay
06be53ffeb Merge pull request #1405 from Citadel-Station-13/upstream-merge-28049
[MIRROR] Only human and silicon servants can help recite multi-invoker scriptures
2017-06-09 09:13:18 -05:00
LetterJay
3f66d97005 Merge pull request #1402 from cebutris/oof
oof
2017-06-09 09:12:49 -05:00
CitadelStationBot
e90145c490 Automatic changelog generation for PR #1327 [ci skip] 2017-06-09 09:10:09 -05:00
LetterJay
c3ebcf9d69 Merge pull request #1327 from Citadel-Station-13/upstream-merge-27891
[MIRROR] Fixes black carpet recipe and sprite
2017-06-09 09:10:08 -05:00
LetterJay
9babd38dc5 Merge pull request #1502 from Citadel-Station-13/upstream-merge-28219
[MIRROR] Gang - Purchasing the improvised shotgun actually spawns a gun.
2017-06-09 09:08:16 -05:00
LetterJay
950e82e895 Merge pull request #1497 from Citadel-Station-13/upstream-merge-28192
[MIRROR] [Delta] Ridin' Dirty
2017-06-09 09:07:59 -05:00
LetterJay
662a647711 Merge pull request #1501 from Citadel-Station-13/upstream-merge-28203
[MIRROR] Fixes clockwork armor bitflags
2017-06-09 09:07:27 -05:00
CitadelStationBot
109c1e2ecb Automatic changelog generation for PR #1498 [ci skip] 2017-06-09 09:06:59 -05:00
LetterJay
36997bdb80 Merge pull request #1498 from Citadel-Station-13/upstream-merge-28204
[MIRROR] Security record crime details is now a single line input box
2017-06-09 09:06:58 -05:00
LetterJay
d92a596b73 Merge pull request #1496 from Citadel-Station-13/upstream-merge-28198
[MIRROR] You can no longer mount borgs while stunned.
2017-06-09 09:06:39 -05:00
LetterJay
98d948e2d4 Merge pull request #1495 from Citadel-Station-13/upstream-merge-28197
[MIRROR] Diseases can now only spread to mobs with an atmos line of sight
2017-06-09 09:05:49 -05:00
LetterJay
7fe60c0012 Merge pull request #1494 from Citadel-Station-13/upstream-merge-28194
[MIRROR] Fixes deadmin player panel runtime
2017-06-09 09:05:32 -05:00