Commit Graph
15122 Commits
Author SHA1 Message Date
AlexTheSysop42andCitadelStationBot 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
LetterJayandGitHub f61c73d486 Merge pull request #6156 from Citadel-Station-13/upstream-merge-36771
[MIRROR] Fixes an error and an omission in admin hotkey help
2018-03-31 06:18:20 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub dcaf3e2575 Merge pull request #6148 from Citadel-Station-13/upstream-merge-36750
[MIRROR] spelling error fixed.
2018-03-31 06:16:00 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandkevinz000 cb4aa936db Update ai.dm 2018-03-29 18:32:24 -07:00
LetterJayandkevinz000 002c5a2b73 ai icon 2018-03-29 18:32:24 -07:00
DavenPeace1andkevinz000 7bffe7110b OctopusTime 2018-03-29 18:32:05 -07:00
kevinz000 dc4b52bcfd logging (#36818) 2018-03-29 18:31:31 -07:00
CitadelStationBotandkevinz000 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
CitadelStationBot 3a2648ece4 Fixes an error and an omission in admin hotkey help 2018-03-28 13:36:36 -05:00
vuonojenmustaturskaandCitadelStationBot 8f240d4246 Update interface.dm 2018-03-28 13:36:36 -05:00
Jordan BrownandCitadelStationBot 4629039c38 Adds config to allow ranks only from txt 2018-03-28 13:01:41 -05:00
CitadelStationBot a91a8db370 Science goggles detect grenade reagents 2018-03-28 12:18:18 -05:00
yoriiandCitadelStationBot 130337797d Science goggles detect grenade reagents (#36477)
* Science goggles detect grenade reagents

* reversed output

* minor improvements

* new helper for counting stuff

* spelling fixes
2018-03-28 12:18:18 -05:00
CitadelStationBot d7ab684caf Fixes hot potato coloration 2018-03-28 12:17:45 -05:00
kevinz000andCitadelStationBot 8c98e4769c Fixes hot potato coloration (#36655)
* Fixes hot potato coloration

* wupps
2018-03-28 12:17:45 -05:00
CitadelStationBot 362553a1c0 Improves some logging legibility 2018-03-28 12:17:32 -05:00
vuonojenmustaturskaandCitadelStationBot adf4786470 Merge pull request #36617 from ShizCalev/logging-cleanup
Improves some logging legibility
2018-03-28 12:17:32 -05:00
CitadelStationBot 1a0ed1ec0c Fixes prosthetic limbs injury messages 2018-03-28 12:17:23 -05:00
vuonojenmustaturskaandCitadelStationBot 888ca609a8 Merge pull request #36636 from ShizCalev/robo-limb-shake-message
Fixes prosthetic limbs injury messages
2018-03-28 12:17:23 -05:00
CitadelStationBot 604a6161e4 spelling error fixed. 2018-03-28 12:17:14 -05:00
BeeSting12andCitadelStationBot cb8f3e9293 >happend 2018-03-28 12:17:14 -05:00
CitadelStationBot 292ee431d6 Assemblies with lighting circuits now properly update light position. 2018-03-28 12:16:56 -05:00
vuonojenmustaturskaandCitadelStationBot 7020c19dff Merge pull request #36736 from fludd12/light-up-the-night
Assemblies with lighting circuits now properly update light position.
2018-03-28 12:16:56 -05:00
CitadelStationBot a220d45ae6 Night vision goggles no longer cancel out thermal eyes 2018-03-28 12:16:38 -05:00
iksypandCitadelStationBot c0e45aa0a8 Night vision goggles no longer cancel out thermal eyes (#36609)
cl
fix: night vision goggles no longer overwrite thermal eyes. nvg eyes no longer overwrite thermal goggles.
/cl

fixes #35921
2018-03-28 12:16:38 -05:00
CitadelStationBot b6d20bd696 Gas react is much more efficient 2018-03-28 12:16:15 -05:00
RobustinandCitadelStationBot ff3818aa86 Gas react is much more efficient (#36667)
* React but with some conditions first

* Update gas_types.dm

* Webeditor maymay

* This might break fire but isn't that what freezes are for?

* More webeditor memes

* Did that madman just make it even FASTER?

* Changing list to typecache

* Gotta go faster

* review, dnm yet

* gas.len instead of volume

* Dunc the redeemed

* Merge ready

* Dunc's method actually wasnt the best
2018-03-28 12:16:15 -05:00
CitadelStationBot 2f50c127fd Increases monkeycap to 64 2018-03-28 12:16:06 -05:00
vuonojenmustaturskaandCitadelStationBot 6bcd278bb6 Merge pull request #36747 from praisenarsie/patch-36
Increases monkeycap to 64
2018-03-28 12:16:06 -05:00
CitadelStationBot d3a558f3f4 Makes chem dispenser recharging far less glacial 2018-03-28 12:15:24 -05:00
vuonojenmustaturskaandCitadelStationBot 0a63f55771 Makes chem dispenser recharging far less glacial (#36700)
* meme

* Makes chem dispenser recharging far less glacial

* Update chem_dispenser.dm
2018-03-28 12:15:24 -05:00
CitadelStationBot c473e50ff4 Adds an admin follow link to revenant spawns 2018-03-28 12:15:15 -05:00
vuonojenmustaturskaandCitadelStationBot c98ce25dfb adds an admin follow link to revenant spawns 2018-03-28 12:15:15 -05:00
CitadelStationBot d44ef7bb28 Adds the Family Heirloom, Nyctophobia, and Monochromacy traits, and rebalances Social Anxiety 2018-03-28 12:15:06 -05:00
Ashe HiggsandCitadelStationBot 8ec16df2e4 Adds the Family Heirloom, Nyctophobia, and Monochromacy traits, and rebalances Social Anxiety (#36426)
* Adds some more traits

* April Fools' heirlooms

* Fixes the detective sound

* Refactor to use signals
2018-03-28 12:15:06 -05:00
deathride58andGitHub 77f40b6be9 Merge pull request #6093 from Michiyamenotehifunana/no-more-mk37
Removes the Mk.37
2018-03-27 17:53:12 +00:00
deathride58andGitHub d351caf92f Merge pull request #6130 from Citadel-Station-13/upstream-merge-36663
[MIRROR] Slimepeople now transfer traits on body-swap, and traits now transfer correctly
2018-03-27 17:51:35 +00:00
deathride58andGitHub e6c16ba8f8 Merge pull request #6129 from Citadel-Station-13/upstream-merge-36597
[MIRROR] Security records consoles now uploads the center 32x32 of a photo when putting photos in
2018-03-27 17:51:17 +00:00