Commit Graph

10392 Commits

Author SHA1 Message Date
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
Robustin
df9894ff4b Fixes monkey retaliation from beyond the grave 2018-03-31 06:16:18 -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
ShizCalev
1c76539a5b Fixes mutant bodypart assignments 2018-03-31 06:15:24 -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
Cruix
0b7f816033 Added a new ability to sentient diseases 2018-03-31 06:14:54 -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
kevinz000
84ac06c986 Yeah no 2018-03-31 04:07:29 -07: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
Poojawa
50d9ff9295 ups the prob of anomaly reports, add dust 2018-03-29 15:26:53 -05: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
kachnov
bf699ac9e6 increases MAX_THROWING_DIST (#36702)
* initial commit

* refactor

* oh that went first
2018-03-29 05:00:14 -05:00
FrozenGuy5
85ef261c76 Capitalizes pathfinder (#36763) 2018-03-29 04:52:53 -05:00
Tad Hardesty
b871285655 Fix 512-only code in recent conveyor belt fix 2018-03-29 04:41:27 -05:00
kevinz000
9442a2905e Fixes blueprints exploit (#36625)
* Fixes blueprints exploit

* redundent qdeleted
2018-03-29 04:35:09 -05:00
Alomga
6b48740f7e Tweaks stats of 4 virus symptoms (#36748)
Makes Vitiligo, Revitiligo, Facial Hypertrichosis and Alopecia usefull instead of making your virus worse without contributing anything. Symptom that makes you pale shouldn't have worse stats that one that can kill.
2018-03-28 19:21:05 -05:00
Tacolizard
8b1cf5bfce Fixes phobia word recognition (#36457)
* fix

* Update phobia.json

* add plural detection
2018-03-28 13:43:09 -05:00
Davidj361
60091c50b5 Fixes "ocular wardens don't target buckled mobs" (#36628)
* Ocular wardens now shoot handcuffed and buckled, but not if they're spelled handcuffed.

* Clock cultists can spell cuff sec cuffed carbon mobs, so the ocular doesn't shoot them.

* Added in review suggestions

* More oversight
2018-03-28 13:42:59 -05:00
XDTM
75187908a3 Fixes strobe shields' icon getting stuck (#36714)
* Fixes strobe shields' icon getting stuck

* src instead of get_turf(src)
2018-03-28 13:42:48 -05:00
Jordan Brown
7980b080e3 Restarting the controller no longer resets the config 2018-03-28 13:40:31 -05:00
Jalleo
8ff1fdd907 Little fix to RPED (#36610)
* Why use a weird proc to check it than set a static list? Yes one is technically more expensive but better maintainability

* Changes to what Cyberboss suggested (For performance reasons?)

* oranges and Antur make sense with the && False its just a false return instead.

* Man I need to read more areas of the codebase that entire proc being modified was not required with my list change......
2018-03-28 13:39:18 -05:00
MrDoomBringer
efb3dceb32 Fixes the cargo Express Console's description [wtf why is there a sprites tag] (#36765)
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* mfw the space jews finally leave the drop pod buisiness

gimme gimme the gee bee pee

the fuck ahaha
2018-03-28 13:38:04 -05:00
RandomMarine
d7cd4726a2 Fixes plasma window fire armor 2018-03-28 13:37:53 -05:00
Jordan Brown
4629039c38 Adds config to allow ranks only from txt 2018-03-28 13:01:41 -05:00
yorii
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
Armhulen
2d8b007086 Refactors Spell and Martial Art Books to use Action Granters! 2018-03-28 12:18:06 -05:00
vuonojenmustaturska
6e02f61b37 Merge pull request #36734 from Robustin/colossusfix
Colossus projectile runtime removal
2018-03-28 12:17:54 -05:00
kevinz000
8c98e4769c Fixes hot potato coloration (#36655)
* Fixes hot potato coloration

* wupps
2018-03-28 12:17:45 -05:00
vuonojenmustaturska
adf4786470 Merge pull request #36617 from ShizCalev/logging-cleanup
Improves some logging legibility
2018-03-28 12:17:32 -05:00
vuonojenmustaturska
888ca609a8 Merge pull request #36636 from ShizCalev/robo-limb-shake-message
Fixes prosthetic limbs injury messages
2018-03-28 12:17:23 -05:00
BeeSting12
cb8f3e9293 >happend 2018-03-28 12:17:14 -05:00
fludd12
13593d757b Nutriment can get you fat again. 2018-03-28 12:17:06 -05:00