Commit Graph

9652 Commits

Author SHA1 Message Date
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
KorPhaeron 7f44453232 Being buckled to an object means space wind wont pull you (#36783)
* Being buckled to an object means space wind wont pull you

* Puts check in the proper place
2018-03-31 06:18:29 -05:00
ShizCalev d29eb299ec Fixes silicons unable to remotely use chemmaster 2018-03-31 06:18:13 -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 c97d4e0970 Merge pull request #36796 from neersighted/delete_perms
Make the delete verb check for SPAWN|DEBUG
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
Robustin 72348f6235 wow 2018-03-31 06:14:31 -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
Robustin b26868a6b7 Get_Flat_Human_Icon no longer draws asses that nobody wants (#36781)
* Argument to limit excess icon work

* 50% less icon for your icon

* 75% less icon for your icon

* Correction

* statics the list, tweaks a default arg

* Cardinal argument list

* correct GLOB name
2018-03-31 06:13:28 -05:00
LetterJay 2e552042c5 Merge pull request #6136 from Citadel-Station-13/upstream-merge-36752
[MIRROR] Adds an admin follow link to revenant spawns
2018-03-31 06:13:22 -05:00
LetterJay 3db8277ccd Merge pull request #6135 from Citadel-Station-13/upstream-merge-36426
[MIRROR] Adds the Family Heirloom, Nyctophobia, and Monochromacy traits, and rebalances Social Anxiety
2018-03-31 06:13:10 -05:00
Jordan Brown 675b5570b8 Merge pull request #36807 from vuonojenmustaturska/champrojectoragain
Fixes some edge cases with chameleon projectors and sleepers
2018-03-31 06:13:00 -05:00
LetterJay cb4aa936db Update ai.dm 2018-03-29 18:32:24 -07:00
LetterJay 002c5a2b73 ai icon 2018-03-29 18:32:24 -07:00
kevinz000 dc4b52bcfd logging (#36818) 2018-03-29 18:31:31 -07:00
CitadelStationBot de282f5201 [MIRROR] individual player panel now logs 100% of the time (#6176)
* individual player panel now logs 100% of the time

* logging (#36819)
2018-03-29 17:10:37 -07:00
Jordan Brown 9520546277 Merge pull request #36772 from vuonojenmustaturska/dertpartment
Removes derpartment
2018-03-29 08:34:02 -05:00
Jordie 2aae805c1d Fixes round-end report not generating sometimes. (#36679)
* fixes some non-minded mobs breaking roundend report

* actually a better handling
2018-03-29 05:03:26 -05:00