shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,199 Commits 5 Branches 0 Tags
dfc437a00f74ead1dfda28231eee90642f22d359
Commit Graph

9605 Commits

Author SHA1 Message Date
LetterJay
dfc437a00f Merge pull request #6196 from Citadel-Station-13/upstream-merge-36805 
[MIRROR] Cleans up duplicate chem_master power_change() proc
 2018-03-31 18:44:25 -05:00
LetterJay
df8f936cf8 Merge pull request #6195 from Citadel-Station-13/upstream-merge-36803 
[MIRROR] [s] Fixes chem dispenser not actually requiring power
 2018-03-31 18:44:11 -05:00
LetterJay
d5f94e6ce6 Merge pull request #6194 from Citadel-Station-13/upstream-merge-36794 
[MIRROR] Failing to latejoin as a job when the latejoin panel is already open now makes a more descriptive error message
 2018-03-31 18:43:53 -05:00
LetterJay
961c69a8e5 Merge pull request #6193 from Citadel-Station-13/upstream-merge-36800 
[MIRROR] Adds check to keep observers from being recognized as servants of ratvar
 2018-03-31 18:43:34 -05:00
LetterJay
1ff35776a7 Merge pull request #6192 from Citadel-Station-13/upstream-merge-36795 
[MIRROR] Fixes custom ticker logic (#36792)
 2018-03-31 18:43:06 -05:00
LetterJay
19df345067 Merge pull request #6191 from Citadel-Station-13/upstream-merge-36787 
[MIRROR] Removed health cost for Twisted Construction upon casting on a wrong object
 2018-03-31 18:42:51 -05:00
LetterJay
54feba8901 Merge pull request #6190 from Citadel-Station-13/upstream-merge-36780 
[MIRROR] Fixes OOC ban not applying to admins
 2018-03-31 18:42:31 -05:00
LetterJay
e3eda7c49a Merge pull request #6189 from Citadel-Station-13/upstream-merge-36770 
[MIRROR] Fixes chem dispenser icon desync
 2018-03-31 18:42:09 -05:00
LetterJay
29bd14c0c2 Merge pull request #6187 from Citadel-Station-13/upstream-merge-36827 
[MIRROR] Fixes flightsuit active gib runtime
 2018-03-31 18:41:55 -05:00
LetterJay
043f05e466 Merge pull request #6186 from Citadel-Station-13/upstream-merge-36785 
[MIRROR] Fixes staff of change borgs recieving AI laws
 2018-03-31 18:41:24 -05:00
LetterJay
8dfefe3037 Merge pull request #6184 from Citadel-Station-13/upstream-merge-36786 
[MIRROR] Fixed table crafting with tools in surrounding area
 2018-03-31 18:41:08 -05:00
LetterJay
4e095cec40 Merge pull request #6181 from Citadel-Station-13/upstream-merge-36811 
[MIRROR] Removes a unused helper
 2018-03-31 18:40:36 -05:00
LetterJay
fa64b72ea6 Merge pull request #6180 from Citadel-Station-13/upstream-merge-36781 
[MIRROR] Get_Flat_Human_Icon no longer draws asses that nobody wants
 2018-03-31 18:39:15 -05:00
kevinz000
5a6a8c332a Buildmode GC (#36828) 2018-03-31 14:02:54 -07:00
LetterJay
78bc5ed7ef Merge pull request #6173 from Citadel-Station-13/upstream-merge-36772 
[MIRROR] Removes derpartment
 2018-03-31 06:22:11 -05:00
LetterJay
5fe5f34692 Merge pull request #6172 from Citadel-Station-13/upstream-merge-36679 
[MIRROR] Fixes round-end report not generating sometimes.
 2018-03-31 06:21:58 -05:00
LetterJay
4f032913c7 Merge pull request #6171 from Citadel-Station-13/upstream-merge-36702 
[MIRROR] increases MAX_THROWING_DIST
 2018-03-31 06:21:47 -05:00
LetterJay
bfda01ec9f Merge pull request #6170 from Citadel-Station-13/upstream-merge-36763 
[MIRROR] Capitalizes pathfinder subsystem
 2018-03-31 06:21:29 -05:00
LetterJay
05e85ddfb0 Merge pull request #6168 from Citadel-Station-13/upstream-merge-36625 
[MIRROR] Fixes blueprints exploit
 2018-03-31 06:21:14 -05:00
LetterJay
2ca217388f Merge pull request #6165 from Citadel-Station-13/upstream-merge-36748 
[MIRROR] Tweaks stats of 4 virus symptoms
 2018-03-31 06:20:54 -05:00
LetterJay
15cb1258dc Merge pull request #6163 from Citadel-Station-13/upstream-merge-36457 
[MIRROR] Fixes phobia word recognition
 2018-03-31 06:20:33 -05:00
LetterJay
c3ddcb9da7 Merge pull request #6162 from Citadel-Station-13/upstream-merge-36628 
[MIRROR] Fixes "ocular wardens don't target buckled mobs"
 2018-03-31 06:20:12 -05:00
LetterJay
48bfd57b0f Merge pull request #6161 from Citadel-Station-13/upstream-merge-36714 
[MIRROR] Fixes strobe shields' icon getting stuck
 2018-03-31 06:19:55 -05:00
LetterJay
7ce6bc2a62 Merge pull request #6160 from Citadel-Station-13/upstream-merge-36703 
[MIRROR] Restarting the controller no longer resets the config
 2018-03-31 06:19:35 -05:00
LetterJay
2d4218d6c6 Merge pull request #6159 from Citadel-Station-13/upstream-merge-36610 
[MIRROR] Little fix to RPED
 2018-03-31 06:19:19 -05:00
LetterJay
a40df26aed Merge pull request #6158 from Citadel-Station-13/upstream-merge-36765 
[MIRROR] Fixes the cargo Express Console's description [wtf why is there a sprites tag]
 2018-03-31 06:19:05 -05:00
LetterJay
e35ddc7093 Merge pull request #6157 from Citadel-Station-13/upstream-merge-36723 
[MIRROR] Corrects plasma window armor inconsistency
 2018-03-31 06:18:48 -05:00
LetterJay
018fa05f01 Merge pull request #6155 from Citadel-Station-13/upstream-merge-36554 
[MIRROR] Adds config to allow ranks only from txt
 2018-03-31 06:17:58 -05:00
Jordan Brown
ca7f0796a2 Merge pull request #36805 from ShizCalev/chemmaster-power-change-cleanup 
Cleans up duplicate chem_master power_change() proc
 2018-03-31 06:17:44 -05:00
LetterJay
71af2a9bc5 Merge pull request #6154 from Citadel-Station-13/upstream-merge-36477 
[MIRROR] Science goggles detect grenade reagents
 2018-03-31 06:17:37 -05:00
Jordan Brown
0273ee6d03 Merge pull request #36803 from ShizCalev/chem-dispenser-exploit-fix 
[s] Fixes chem dispenser not actually requiring power
 2018-03-31 06:17:34 -05:00
LetterJay
d509014cd3 Merge pull request #6151 from Citadel-Station-13/upstream-merge-36655 
[MIRROR] Fixes hot potato coloration
 2018-03-31 06:17:22 -05:00
kevinz000
6e64e8e601 Failing to latejoin as a job when the latejoin panel is already open now makes a more descriptive error message (#36794) 
* job availability

* avail

* Boop
 2018-03-31 06:17:20 -05:00
LetterJay
9cf0b857db Merge pull request #6150 from Citadel-Station-13/upstream-merge-36617 
[MIRROR] Improves some logging legibility
 2018-03-31 06:17:11 -05:00
AlexTheSysop42
360eb223b3 Adds check to keep observers from being recognized as servants of ratvar (#36800) 
* Comments out code to try to fix a bug

* fixes servant ghosts being trapped on Reebe

* protip: next time don't commit to master

* ghosts no longer count as servants

* Undoes ghost check, moved to is_servant_of_ratvar

* change istype to isliving
 2018-03-31 06:17:10 -05:00
Jordan Brown
447008e625 Merge pull request #36795 from robbym/master 
Fixes custom ticker logic (#36792)
 2018-03-31 06:17:00 -05:00
Jordan Brown
c48b35a0b2 Merge pull request #36787 from Davidj361/36744-twistedHealthFix 
Removed health cost for Twisted Construction upon casting on a wrong object
 2018-03-31 06:16:50 -05:00
LetterJay
694f3a6949 Merge pull request #6149 from Citadel-Station-13/upstream-merge-36636 
[MIRROR] Fixes prosthetic limbs injury messages
 2018-03-31 06:16:48 -05:00
Jordan Brown
9b53b3da2c Merge pull request #36780 from KorPhaeron/oocban 
Fixes OOC ban not applying to admins
 2018-03-31 06:16:41 -05:00
Jordan Brown
73d4e9b11c Fixes chem dispenser icon desync 2018-03-31 06:16:29 -05:00
kevinz000
65097bb4e4 runtime 2018-03-31 06:16:05 -05:00
LetterJay
dcaf3e2575 Merge pull request #6148 from Citadel-Station-13/upstream-merge-36750 
[MIRROR] spelling error fixed.
 2018-03-31 06:16:00 -05:00
KorPhaeron
d6083b0ff6 Fixes staff of change borgs recieving AI laws (#36785) 
* Fixes staff of change borgs recieving AI laws

* lawupdate
 2018-03-31 06:15:50 -05:00
LetterJay
e6345d05bc Merge pull request #6146 from Citadel-Station-13/upstream-merge-36736 
[MIRROR] Assemblies with lighting circuits now properly update light position.
 2018-03-31 06:15:34 -05:00
LetterJay
437301bf21 Merge pull request #6144 from Citadel-Station-13/upstream-merge-36609 
[MIRROR] Night vision goggles no longer cancel out thermal eyes
 2018-03-31 06:15:19 -05:00
Davidj361
2b280caa9b Fixed table crafting with tools in surrounding area (#36786) 2018-03-31 06:15:08 -05:00
LetterJay
acc54fedb0 Merge pull request #6142 from Citadel-Station-13/upstream-merge-36667 
[MIRROR] Gas react is much more efficient
 2018-03-31 06:15:05 -05:00
LetterJay
fcb2dc821e Merge pull request #6141 from Citadel-Station-13/upstream-merge-36747 
[MIRROR] Increases monkeycap to 64
 2018-03-31 06:14:34 -05:00
Jalleo
fb28072ef3 Removes a unused helper (#36811) 2018-03-31 06:13:59 -05:00
LetterJay
0c076ef013 Merge pull request #6137 from Citadel-Station-13/upstream-merge-36700 
[MIRROR] Makes chem dispenser recharging far less glacial
 2018-03-31 06:13:35 -05:00