shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,700 Commits 5 Branches 0 Tags
4e4e07e8bb17cc89a89ce9b18e278870c7802d2e
Commit Graph

6255 Commits

Author SHA1 Message Date
ShizCalev
4e4e07e8bb Fixes mindswap book runtime (#37881) 2018-05-19 05:32:45 -05:00
LetterJay
bfcaceb4e1 Merge pull request #6785 from Citadel-Station-13/upstream-merge-37838 
[MIRROR] Query debug logging
 2018-05-17 22:50:19 -05:00
Jordan Brown
a61457cd47 Merge pull request #37838 from Jordie0608/ithoughtaboutmakingthissendanemailbutidontwanttodrownmyinbox 
Query debug logging
 2018-05-17 21:38:41 -05:00
ShizCalev
abc57b0e53 Capitalized Current Quirks (#37877) 2018-05-17 20:54:23 -05:00
deathride58
649314c455 Merge pull request #6682 from Citadel-Station-13/upstream-merge-37429 
[MIRROR] Update DMAPI to version 3.2.1.0
 2018-05-17 18:14:54 +00:00
deathride58
146f953966 Merge pull request #6694 from Citadel-Station-13/upstream-merge-37423 
[MIRROR] [s] Hallucinations 4.0
 2018-05-17 18:12:57 +00:00
deathride58
97b72c0289 Merge pull request #6758 from Citadel-Station-13/upstream-merge-37853 
[MIRROR] Fixes wrong circuits
 2018-05-17 18:12:16 +00:00
deathride58
cee67a7706 Merge pull request #6760 from Citadel-Station-13/upstream-merge-37602 
[MIRROR] [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping
 2018-05-17 18:11:24 +00:00
deathride58
5398828bb9 Merge pull request #6762 from Citadel-Station-13/upstream-merge-37860 
[MIRROR] [s] Fixes bioware surgery exploit
 2018-05-17 18:10:29 +00:00
deathride58
583de894f3 Merge pull request #6763 from Citadel-Station-13/upstream-merge-37863 
[MIRROR] Fixes changeling team objectives (a bit)
 2018-05-17 18:10:01 +00:00
deathride58
93a9afcf88 Merge pull request #6764 from Citadel-Station-13/upstream-merge-37839 
[MIRROR] Fixes minor cleanbot runtime.
 2018-05-17 18:09:31 +00:00
deathride58
5242d1ad4b Merge pull request #6768 from Citadel-Station-13/upstream-merge-37866 
[MIRROR] Client topics only check for deleted objects when an object was actually passed
 2018-05-17 18:09:00 +00:00
deathride58
b1d0d14834 Merge pull request #6771 from Citadel-Station-13/upstream-merge-37872 
[MIRROR] Fixes Adminorazine killing ash lizards
 2018-05-17 18:08:16 +00:00
deathride58
db6fdc0f48 Merge pull request #6773 from Citadel-Station-13/upstream-merge-37836 
[MIRROR] Circuit gun inhands and grabber fix
 2018-05-17 18:07:46 +00:00
deathride58
24d87f2884 Merge pull request #6774 from Citadel-Station-13/upstream-merge-37871 
[MIRROR] Fixes sharp weapons deconverting revs
 2018-05-17 18:06:45 +00:00
ShizCalev
394fbf09e3 Fixes vent_clog bad chem id runtime (#37887) 
* Fixes vent_clog bad chem id runtime

* sodiumchloride
 2018-05-17 10:56:35 -05:00
ShizCalev
e425a8514e Fixes sharp weapons deconverting revs (#37871) 
* Fixes sharp weapons deconverting revs

* enhanced commentary
 2018-05-17 10:28:38 -05:00
Trevor Serpas
61e1529e18 Circuit gun inhands and grabber fix (#37836) 
* Grabbers update when a thrower uses its inventory and throwers and gun circuits need to use the gun assembly

* visible_messages
 2018-05-17 10:27:25 -05:00
ShizCalev
a7f13f15cf Fixes Adminorazine killing ash lizards (#37872) 
* Fixes Adminorazine killing ash lizards

* this should do it...
 2018-05-17 10:24:59 -05:00
Kyle Spier-Swenson
085066d555 Client topics only check for deleted objects when an object was actually passed (#37866) 2018-05-17 10:15:12 -05:00
vuonojenmustaturska
7429a7ef6a Merge pull request #37839 from AnturK/rr1 
Fixes minor cleanbot runtime.
 2018-05-16 14:37:03 -05:00
vuonojenmustaturska
aa7a27420c Merge pull request #37863 from AnturK/rr4 
Fixes changeling team objectives (a bit)
 2018-05-16 14:35:49 -05:00
Dax Dupont
48c37df7cd [s] Fixes bioware surgery exploit (#37860) 
* Fixes bioware surgery

* my ass must blast
 2018-05-16 14:34:36 -05:00
81Denton
0333a50552 [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping 2018-05-16 12:18:36 -05:00
LetterJay
8efc7711a7 Merge branch 'master' into upstream-merge-37423 2018-05-16 12:17:57 -05:00
Dax Dupont
eb29d86c5f Fixes wrong circuits (#37853) 
* Fixes wrong circuits

* this too
 2018-05-16 12:04:54 -05:00
deathride58
ca36def4e6 Merge pull request #6754 from Citadel-Station-13/upstream-merge-37823 
[MIRROR] Makes cult items less of a vomit coaster
 2018-05-16 16:09:21 +00:00
LetterJay
3103119f6b Update soulstone.dm 2018-05-16 09:04:51 -05:00
LetterJay
fe93e1ccbd Update cult_items.dm 2018-05-16 09:04:39 -05:00
vuonojenmustaturska
5e48fcd275 Merge pull request #37846 from DaxDupont/axe-time 
Small cult nerf do not be alarmed robustin think about your heart
 2018-05-16 04:46:59 -05:00
Dax Dupont
79b5e412f1 Makes cult items less of a vomit coaster 2018-05-15 12:18:00 -05:00
LetterJay
08fab3adaa Update client_procs.dm 2018-05-15 10:25:58 -05:00
LetterJay
24b6ee5a6c should make life simpler 2018-05-15 10:05:56 -05:00
LetterJay
d421ad846a Merge pull request #6751 from Citadel-Station-13/upstream-merge-37715 
[MIRROR] Cleans up touch spells
 2018-05-15 06:53:54 -05:00
LetterJay
ce98f9c444 Merge pull request #6746 from Citadel-Station-13/upstream-merge-37785 
[MIRROR] Replaces loose tech storage boards with spawners
 2018-05-15 06:53:25 -05:00
LetterJay
49b22d2673 Merge pull request #6745 from Citadel-Station-13/upstream-merge-37810 
[MIRROR] Adds basic electronics to techwebs
 2018-05-15 06:53:11 -05:00
LetterJay
f86af0ab41 Merge pull request #6743 from Citadel-Station-13/upstream-merge-37818 
[MIRROR] Fix some missing icons
 2018-05-15 06:52:32 -05:00
LetterJay
7c3c270e2a Merge branch 'master' into upstream-merge-37749 2018-05-15 00:50:13 -05:00
LetterJay
0877bdd4e5 Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646 
[MIRROR] Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
 2018-05-15 00:47:59 -05:00
AnturK
a379391dd3 Cleans up touch spells (#37715) 
* Cleans up touch spells

* Silent param

* Oh god i'm blind.
 2018-05-15 00:35:41 -05:00
LetterJay
b161047f71 Merge pull request #6747 from Citadel-Station-13/upstream-merge-37851 
[MIRROR] Send jquery asset when initializing tooltips
 2018-05-14 22:16:12 -05:00
YPOQ
a7b5415a19 Fixes wumborian fugu dead sprite (#37832) 2018-05-14 18:55:54 -05:00
oranges
ef7be078b5 Merge pull request #37851 from AutomaticFrenzy/patch/jquery-tooltips-2 
Send jquery asset when initializing tooltips
 2018-05-14 16:51:20 -05:00
Jordan Brown
3b03fa3a37 Replaces loose tech storage boards with spawners 2018-05-14 15:18:17 -05:00
Jordan Brown
9a1dfefb97 Merge pull request #37810 from 81Denton/techweb-electronics 
Adds basic electronics to techwebs
 2018-05-14 15:17:00 -05:00
Jordan Brown
7dc1c116d5 Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons 
Fix some missing icons
 2018-05-14 15:13:33 -05:00
LetterJay
f9f42658e1 Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760 
[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
 2018-05-14 12:28:41 -05:00
LetterJay
21bc6c48ef Update preferences.dm 2018-05-14 09:53:00 -05:00
LetterJay
e990ac3ef7 Update preferences.dm 2018-05-13 22:06:35 -05:00
CitadelStationBot
1123df32b3 Merge pull request #6740 from Citadel-Station-13/upstream-merge-37794 
[MIRROR] Marginally to Mildly Improves Vending Machine, Burger, and Donut sprites.
 2018-05-13 20:39:21 -05:00