shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,061 Commits 5 Branches 0 Tags
44aa6c6be6101b021abcdae032adcbdba723eee6
Commit Graph

3605 Commits

Author SHA1 Message Date
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
0431fa3cb6 Merge branch 'master' into upstream-merge-30544 2017-09-11 23:21:00 -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
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
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
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
LetterJay
80dbaae65a fuck 2017-09-11 14:37:55 -05:00
AnturK
1553e26fe2 I missed that in last fix. (#30590) 2017-09-11 14:37:22 -05:00
LetterJay
6d88e3642b Update suit_storage_unit.dm 2017-09-11 14:27:28 -05:00
LetterJay
726b86f3a4 Update on_move.dm 2017-09-11 14:18:28 -05:00
LetterJay
d731e6342c fix it. FIX IT. 2017-09-11 14:15:57 -05:00
LetterJay
24dd22aff5 Update components.dm 2017-09-11 14:10:27 -05:00
LetterJay
a05bbfc90a Update weaponry.dm 2017-09-11 14:07:11 -05:00
LetterJay
02d7a04fb1 Update suit_storage_unit.dm 2017-09-11 14:06:01 -05:00
LetterJay
c03e216016 Update implantchair.dm 2017-09-11 14:05:58 -05:00
LetterJay
14aefe2e64 commit 2017-09-11 14:01:42 -05:00
LetterJay
2f10e78ba7 Update on_move.dm 2017-09-11 13:56:28 -05:00
LetterJay
9e0cb0fa7c Update datumvars.dm 2017-09-11 13:53:18 -05:00
LetterJay
447937477e more oopsies 2017-09-11 13:50:49 -05:00
LetterJay
b008cdada0 oopsie woopsie 2017-09-11 13:47:33 -05:00
Ashe Higgs
af5ffcc83a Adds departmental banners 2017-09-11 13:37:58 -05:00
LetterJay
01a5e4bddf Merge pull request #2600 from Citadel-Station-13/Lisp 
disables the lisp that lizard tongues have
 2017-09-11 13:16:15 -05:00
LetterJay
532d8bd0a6 Merge pull request #2558 from Citadel-Station-13/upstream-merge-30268 
[MIRROR] Adds db connectivity check to jobban cache building
 2017-09-11 13:12:38 -05:00
LetterJay
74a163db23 Merge pull request #2553 from Citadel-Station-13/upstream-merge-30252 
[MIRROR] Server tools versioning and fix to displayed testmerges
 2017-09-11 13:12:10 -05:00