 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
|
c42304737a
|
Update implantchair.dm
|
2017-09-11 17:47:55 -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 |
|
|
LetterJay
|
80dbaae65a
|
fuck
|
2017-09-11 14:37:55 -05:00 |
|
|
LetterJay
|
a05bbfc90a
|
Update weaponry.dm
|
2017-09-11 14:07:11 -05:00 |
|
|
LetterJay
|
c03e216016
|
Update implantchair.dm
|
2017-09-11 14:05:58 -05:00 |
|
|
LetterJay
|
447937477e
|
more oopsies
|
2017-09-11 13:50:49 -05:00 |
|
|
Ashe Higgs
|
af5ffcc83a
|
Adds departmental banners
|
2017-09-11 13:37:58 -05:00 |
|
|
LetterJay
|
e5aed03bcb
|
all of my HATE
|
2017-09-10 15:20:58 -05:00 |
|
|
LetterJay
|
50587ea679
|
Update tools.dm
|
2017-09-10 15:18:30 -05:00 |
|
|
LetterJay
|
3dbfac920a
|
Update weaponry.dm
|
2017-09-10 11:48:28 -05:00 |
|
|
LetterJay
|
33f35fe4d2
|
Update tools.dm
|
2017-09-10 11:46:34 -05:00 |
|
|
Armhulen
|
0dfe72d77e
|
chainsaws rebalance, but working this time :)
|
2017-09-08 10:00:47 -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 |
|
|
ShizCalev
|
d8a3b87719
|
Fixes brains counting towards highlander killstreaks
|
2017-09-07 05:14:39 -05:00 |
|
|
tortellinitony
|
d73b82cf11
|
Gets rid of manual overlay manipulation
|
2017-09-06 23:39:08 -05:00 |
|
|
LetterJay
|
24a7aa5a9f
|
Merge branch 'master' into upstream-merge-30079
|
2017-09-06 09:24:23 -05:00 |
|
|
LetterJay
|
cf46abecb3
|
Merge pull request #2436 from Citadel-Station-13/upstream-merge-30004
[MIRROR] Moved emagged var to obj/item parent.
|
2017-09-06 09:15:11 -05:00 |
|
|
Poojawa
|
3ba2f650dd
|
Adds Paradise Sofas (#2623)
* Adds Paradise Sofas
* Actually enable them to be constructed
* Coding standards, sheesh
* am path guder
|
2017-09-06 07:54:23 -05:00 |
|
|
LetterJay
|
2bfc7872fa
|
cleanup
|
2017-09-02 07:06:37 -05:00 |
|
|
kevinz000
|
f70fd6a980
|
Merge pull request #2536
|
2017-08-29 22:39:54 -07:00 |
|
|
kevinz000
|
7239a44ef1
|
Merge pull request #2545
|
2017-08-29 22:39:08 -07:00 |
|
|
kevinz000
|
7c7da67169
|
Merge pull request #2547
|
2017-08-29 22:39:03 -07:00 |
|
|
kevinz000
|
9cb65df70d
|
Merge pull request #2426
|
2017-08-29 22:27:21 -07:00 |
|
|
kevinz000
|
4b32cf2e0f
|
Merge pull request #2415
|
2017-08-29 22:27:15 -07:00 |
|
|
kevinz000
|
5c7b743cfa
|
Merge pull request #2405
|
2017-08-29 22:27:10 -07:00 |
|
|
kevinz000
|
a0758720ce
|
Merge branch 'master' into upstream-merge-30251
|
2017-08-29 22:06:28 -07:00 |
|
|
kevinz000
|
408acdd66d
|
sync
|
2017-08-29 22:05:16 -07:00 |
|
|
kevinz000
|
9b71e967d2
|
Merge branch 'master' into upstream-merge-29964
|
2017-08-29 21:07:01 -07:00 |
|
|
kevinz000
|
343b508774
|
Merge branch 'master' into upstream-merge-30175
|
2017-08-29 20:14:56 -07:00 |
|
|
kevinz000
|
9572f4b298
|
Merge branch 'master' into upstream-merge-30098
|
2017-08-29 20:04:55 -07:00 |
|
|
LetterJay
|
b2114a7b81
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2017-08-29 21:19:22 -05:00 |
|
|
CitadelStationBot
|
5f3775388c
|
Gives cult blades updated item and inhand sprites
|
2017-08-29 17:08:43 -05:00 |
|
|
CitadelStationBot
|
6f013d3d47
|
Stealth Option for RadioactiveMicro
|
2017-08-29 17:05:32 -05:00 |
|
|
kevinz000
|
f45f5bbf3d
|
quadruple wew
|
2017-08-29 10:02:18 -07:00 |
|
|
kevinz000
|
5591afc9ce
|
double wew
|
2017-08-29 09:53:11 -07:00 |
|
|
kevinz000
|
301a581e64
|
sync
|
2017-08-29 09:41:11 -07:00 |
|
|
CitadelStationBot
|
54c68decde
|
Fixes clowns blowing shit up not being logged 50% of the time
|
2017-08-29 09:32:06 -05:00 |
|
|
LetterJay
|
292f5d5d35
|
Update boxes.dm
|
2017-08-29 01:46:21 -05:00 |
|
|
CitadelStationBot
|
f191f5c827
|
Fixes ingredients-box sprite.
|
2017-08-28 14:39:03 -05:00 |
|
|
LetterJay
|
6c76ae2395
|
clean up
|
2017-08-28 10:34:31 -05:00 |
|
|
LetterJay
|
3a8cf01e65
|
Merge pull request #2520 from Citadel-Station-13/upstream-merge-30231
[MIRROR] Adds logging cause of microbomb activation in admin logs
|
2017-08-28 08:57:36 -05:00 |
|
|
LetterJay
|
a17ed054d6
|
Merge pull request #2503 from Citadel-Station-13/upstream-merge-30172
[MIRROR] Maintains that weird entire-tcomms-setup-in-one-machine thing
|
2017-08-28 08:56:11 -05:00 |
|
|
LetterJay
|
2fe2912fa3
|
Merge pull request #2496 from Citadel-Station-13/upstream-merge-30173
[MIRROR] Traitor, a traitor is a traitor.
|
2017-08-28 08:46:53 -05:00 |
|
|
CitadelStationBot
|
bdf2fff8d9
|
Adds logging cause of microbomb activation in admin logs
|
2017-08-28 02:19:59 -05:00 |
|
|
kevinz000
|
3254fcf535
|
goddamnit_again (#2511)
|
2017-08-26 18:43:57 -07:00 |
|