 LetterJay
|
4d7c4e6da9
|
Merge branch 'master' into upstream-merge-30554
|
2017-09-12 01:20:05 -05:00 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
fcbebe6423
|
Update life.dm
|
2017-09-12 01:03:11 -05:00 |
|
|
LetterJay
|
2ae18cd35e
|
Update life.dm
|
2017-09-12 00:52:07 -05:00 |
|
|
LetterJay
|
d045103744
|
Update life.dm
|
2017-09-12 00:48:22 -05:00 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
1cea5d6e4b
|
Update one_click_antag.dm
|
2017-09-11 23:41:45 -05:00 |
|
|
LetterJay
|
f60d57520b
|
Merge branch 'master' into upstream-merge-29839
|
2017-09-11 23:22:39 -05:00 |
|
|
LetterJay
|
0431fa3cb6
|
Merge branch 'master' into upstream-merge-30544
|
2017-09-11 23:21:00 -05:00 |
|
|
LetterJay
|
6c9609a7ee
|
Merge branch 'master' into upstream-merge-30580
|
2017-09-11 23:19:07 -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 |
|
|
LetterJay
|
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 |
|
|
Poojawa
|
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 |
|
|
LetterJay
|
ce518ee45e
|
Update closets.dm
|
2017-09-11 18:56:10 -05:00 |
|
|
LetterJay
|
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 |
|
|
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
|
beed20c130
|
Update life.dm
|
2017-09-11 18:52:14 -05:00 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
5c42666355
|
Merge pull request #2707 from Citadel-Station-13/upstream-merge-30590
[MIRROR] Fixes Punpun (again)
|
2017-09-11 18:45:06 -05:00 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
bf5094cf19
|
Update nuclearbomb.dm
|
2017-09-11 18:40:30 -05:00 |
|
|
LetterJay
|
e5cc2c1e4e
|
Update one_click_antag.dm
|
2017-09-11 18:28:09 -05:00 |
|
|
LetterJay
|
c03fb31b1c
|
Update sql_message_system.dm
|
2017-09-11 18:27:47 -05:00 |
|
|
LetterJay
|
5fafa90538
|
Update secrets.dm
|
2017-09-11 18:27:20 -05:00 |
|
|
LetterJay
|
584bb8dc64
|
Update holder2.dm
|
2017-09-11 18:27:04 -05:00 |
|
|
LetterJay
|
15c4d34b55
|
Update create_turf.dm
|
2017-09-11 18:26:50 -05:00 |
|
|
LetterJay
|
98f6cf208b
|
Update create_object.dm
|
2017-09-11 18:26:36 -05:00 |
|
|
LetterJay
|
bb463cef48
|
Update create_mob.dm
|
2017-09-11 18:26:13 -05:00 |
|
|
LetterJay
|
16c7706618
|
Merge branch 'master' into upstream-merge-30117
|
2017-09-11 18:10:15 -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
|
935ae98f4a
|
Merge branch 'master' into upstream-merge-29839
|
2017-09-11 18:03:51 -05:00 |
|
|
LetterJay
|
bfe633540a
|
Update human_movement.dm
|
2017-09-11 17:55:35 -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
|
6816b83a6d
|
Merge pull request #2673 from Citadel-Station-13/upstream-merge-30509
[MIRROR] num2text the Instances number
|
2017-09-11 17:53:54 -05:00 |
|
|
LetterJay
|
578846ba4b
|
Merge branch 'master' into upstream-merge-30519
|
2017-09-11 17:53:13 -05:00 |
|
|
LetterJay
|
c3a1c08206
|
Update smartfridge.dm
|
2017-09-11 17:51:49 -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
|
9adcc174b3
|
Update shuttle.dm
|
2017-09-11 17:09:44 -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
|
1c757deb5b
|
Merge pull request #2650 from Citadel-Station-13/upstream-merge-30420
[MIRROR] TGUI interfaces to various smartfridges
|
2017-09-11 15:22:49 -05:00 |
|
|
LetterJay
|
6b25a0e42b
|
Merge pull request #2647 from Citadel-Station-13/upstream-merge-30465
[MIRROR] Fixes shuttle name on ramming.
|
2017-09-11 15:22:36 -05:00 |
|
|
LetterJay
|
77090bf3c1
|
Merge pull request #2641 from Citadel-Station-13/upstream-merge-30463
[MIRROR] Gives admins the ability to show a read only vv window to a player
|
2017-09-11 15:22:26 -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 |
|