 LetterJayandGitHub
|
caca1d1794
|
Merge pull request #2690 from Citadel-Station-13/upstream-merge-30553
[MIRROR] Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume!
|
2017-09-12 01:22:11 -05:00 |
|
|
CitadelStationBot
|
dee34c6e7e
|
Automatic changelog generation for PR #2691 [ci skip]
|
2017-09-12 01:21:10 -05:00 |
|
|
LetterJayandGitHub
|
a5a8f8faba
|
Merge pull request #2691 from Citadel-Station-13/upstream-merge-30530
[MIRROR] Adds Gondoland and the rare Gondolas
|
2017-09-12 01:21:09 -05:00 |
|
|
LetterJayandGitHub
|
7deeac86eb
|
Merge pull request #2670 from Citadel-Station-13/upstream-merge-29839
[MIRROR] [s] Adds a security token to all admin hrefs
|
2017-09-12 01:17:56 -05:00 |
|
|
LetterJayandGitHub
|
3e62306f0a
|
Merge pull request #2685 from Citadel-Station-13/upstream-merge-30580
[MIRROR] Fixes breathing from softcrit (hopefully)
|
2017-09-12 01:09:54 -05:00 |
|
|
LetterJayandGitHub
|
fcbebe6423
|
Update life.dm
|
2017-09-12 01:03:11 -05:00 |
|
|
LetterJayandGitHub
|
2ae18cd35e
|
Update life.dm
|
2017-09-12 00:52:07 -05:00 |
|
|
LetterJayandGitHub
|
d045103744
|
Update life.dm
|
2017-09-12 00:48:22 -05:00 |
|
|
LetterJayandGitHub
|
44aa6c6be6
|
Merge pull request #2689 from Citadel-Station-13/upstream-merge-30544
[MIRROR] Fixes lockers alt-click
|
2017-09-12 00:41:15 -05:00 |
|
|
LetterJayandGitHub
|
1cea5d6e4b
|
Update one_click_antag.dm
|
2017-09-11 23:41:45 -05:00 |
|
|
LetterJayandGitHub
|
f60d57520b
|
Merge branch 'master' into upstream-merge-29839
|
2017-09-11 23:22:39 -05:00 |
|
|
LetterJayandGitHub
|
a315554d4d
|
Merge pull request #2716 from Citadel-Station-13/MSOFadingNotes
Ports MSO's fading note system
|
2017-09-11 23:21:47 -05:00 |
|
|
LetterJayandGitHub
|
0431fa3cb6
|
Merge branch 'master' into upstream-merge-30544
|
2017-09-11 23:21:00 -05:00 |
|
|
LetterJayandGitHub
|
6c9609a7ee
|
Merge branch 'master' into upstream-merge-30580
|
2017-09-11 23:19:07 -05:00 |
|
|
LetterJayandGitHub
|
a26473839b
|
Merge pull request #2713 from Citadel-Station-13/upstream-merge-30448
[MIRROR] Gives the webhook processor the ability to self update
|
2017-09-11 23:09:01 -05:00 |
|
|
LetterJay
|
c3ef612490
|
Ports MSO's fading note system
|
2017-09-11 23:07:30 -05:00 |
|
|
LetterJay
|
5822e04980
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2017-09-11 22:47:45 -05:00 |
|
|
LetterJay
|
39687189b6
|
donation
|
2017-09-11 22:47:27 -05:00 |
|
|
CitadelStationBot
|
1257a2035d
|
Automatic changelog generation for PR #2566 [ci skip]
|
2017-09-11 22:41:25 -05:00 |
|
|
LetterJayandGitHub
|
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 |
|
|
LetterJayandGitHub
|
9f52791492
|
Update github_webhook_processor.php
|
2017-09-11 22:28:26 -05:00 |
|
|
Jordan BrownandCitadelStationBot
|
4383f5e70f
|
Gives the webhook processor the ability to self update
|
2017-09-11 21:00:12 -05:00 |
|
|
CitadelStationBot
|
a2ead1b017
|
Automatic changelog generation for PR #2695 [ci skip]
|
2017-09-11 20:22:24 -05:00 |
|
|
PoojawaandGitHub
|
2629d3b87d
|
Adds horse, cow tails, Sergal ears/tails also (#2695)
* Adds horse, sergal, cow tails
* Slight tweaks before bed
* sprite tweaks
|
2017-09-11 20:22:21 -05:00 |
|
|
LetterJayandGitHub
|
ce518ee45e
|
Update closets.dm
|
2017-09-11 18:56:10 -05:00 |
|
|
LetterJayandGitHub
|
34d7f79cd3
|
Merge pull request #2687 from Citadel-Station-13/upstream-merge-30542
[MIRROR] Changes golem shell attackby istype chain to use an assoc list instead of an istype chain
|
2017-09-11 18:55:32 -05:00 |
|
|
LetterJayandGitHub
|
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 |
|
|
LetterJayandGitHub
|
beed20c130
|
Update life.dm
|
2017-09-11 18:52:14 -05:00 |
|
|
LetterJayandGitHub
|
360e7b60cf
|
Merge pull request #2668 from Citadel-Station-13/upstream-merge-30242
[MIRROR] New blackbox sprites
|
2017-09-11 18:47:25 -05:00 |
|
|
LetterJayandGitHub
|
e6c9911ae2
|
Merge pull request #2660 from Citadel-Station-13/upstream-merge-30399
[MIRROR] chainsaws rebalance, but working this time :)
|
2017-09-11 18:47:14 -05:00 |
|
|
CitadelStationBot
|
3760051074
|
Automatic changelog generation for PR #2678 [ci skip]
|
2017-09-11 18:45:24 -05:00 |
|
|
LetterJayandGitHub
|
5c9ba3593a
|
Merge pull request #2678 from Citadel-Station-13/upstream-merge-30482
[MIRROR] People in soft crit will leave blood trails when dragging themselves/Will take less damage in soft crit
|
2017-09-11 18:45:22 -05:00 |
|
|
LetterJayandGitHub
|
5c42666355
|
Merge pull request #2707 from Citadel-Station-13/upstream-merge-30590
[MIRROR] Fixes Punpun (again)
|
2017-09-11 18:45:06 -05:00 |
|
|
LetterJayandGitHub
|
b73b6a967a
|
Merge pull request #2680 from Citadel-Station-13/upstream-merge-30519
[MIRROR] In which smartfridge ui_data is called only when needed, and a minor display bug involving drying racks is fixed
|
2017-09-11 18:44:40 -05:00 |
|
|
LetterJayandGitHub
|
bf5094cf19
|
Update nuclearbomb.dm
|
2017-09-11 18:40:30 -05:00 |
|
|
LetterJayandGitHub
|
7d4c6a8445
|
Update config.txt
|
2017-09-11 18:28:39 -05:00 |
|
|
LetterJayandGitHub
|
e5cc2c1e4e
|
Update one_click_antag.dm
|
2017-09-11 18:28:09 -05:00 |
|
|
LetterJayandGitHub
|
c03fb31b1c
|
Update sql_message_system.dm
|
2017-09-11 18:27:47 -05:00 |
|
|
LetterJayandGitHub
|
5fafa90538
|
Update secrets.dm
|
2017-09-11 18:27:20 -05:00 |
|
|
LetterJayandGitHub
|
584bb8dc64
|
Update holder2.dm
|
2017-09-11 18:27:04 -05:00 |
|
|
LetterJayandGitHub
|
15c4d34b55
|
Update create_turf.dm
|
2017-09-11 18:26:50 -05:00 |
|
|
LetterJayandGitHub
|
98f6cf208b
|
Update create_object.dm
|
2017-09-11 18:26:36 -05:00 |
|
|
LetterJayandGitHub
|
bb463cef48
|
Update create_mob.dm
|
2017-09-11 18:26:13 -05:00 |
|
|
LetterJayandGitHub
|
16c7706618
|
Merge branch 'master' into upstream-merge-30117
|
2017-09-11 18:10:15 -05:00 |
|
|
LetterJayandGitHub
|
933d9f5f69
|
Delete tgstation.dme.rej
|
2017-09-11 18:09:03 -05:00 |
|
|
LetterJayandGitHub
|
e6cc0673aa
|
Merge branch 'master' into upstream-merge-30399
|
2017-09-11 18:07:15 -05:00 |
|
|
LetterJayandGitHub
|
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 |
|
|
LetterJayandGitHub
|
935ae98f4a
|
Merge branch 'master' into upstream-merge-29839
|
2017-09-11 18:03:51 -05:00 |
|
|
LetterJayandGitHub
|
bfe633540a
|
Update human_movement.dm
|
2017-09-11 17:55:35 -05:00 |
|
|
LetterJayandGitHub
|
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 |
|