Commit Graph

18268 Commits

Author SHA1 Message Date
Purpose 62cd1e508f nanoui sucks 2018-10-15 22:30:09 +01:00
Purpose 6ecf86a58f finishing off... 2018-10-15 16:41:05 +01:00
Purpose 621a2a7f9d bed time 2018-10-15 00:47:13 +01:00
alex-gh 7633b312e5 Voice analyzers no longer activate on any noise. 2018-10-13 07:50:05 +02:00
Mark Mak ae0f6b28bd Merge pull request #9832 from Ty-Omaha/boxing-logs
Moves Boxing logs to the ALL preference
2018-10-13 11:41:32 +08:00
Mark Mak ea1ac49897 Merge pull request #9521 from alex-gh/damage_mod_fix
Species damage mod now only affects damage, not healing.
2018-10-13 11:32:11 +08:00
Ty-Omaha 216f03ddca moves boxing attack logs to the ALL preference 2018-10-12 23:28:04 -04:00
Ty-Omaha c2d6726168 Update code/modules/martial_arts/brawling.dm 2018-10-12 23:25:10 -04:00
Ty-Omaha d84c191a88 removes boxing attack logs 2018-10-12 22:54:39 -04:00
DarkPyrolord f22e21a0e2 SpamBGone 2018-10-13 14:43:27 +13:00
Mark Mak 21cae85a91 Merge pull request #9830 from Birdtalon/chem
Small chem master icon fix/cleanup
2018-10-13 09:02:25 +08:00
Birdtalon 98a084921f moves chem master to using update_icon() fixes not using no power sprites 2018-10-13 00:22:03 +01:00
Mark Mak e79e3366db Merge pull request #9827 from Birdtalon/check-and-add
Moves check_and_add() to reagents holder
2018-10-13 06:36:59 +08:00
Birdtalon e9d153daf4 moves check and add to reagents holder datum 2018-10-12 15:59:30 +01:00
Birdtalon 228ba156ca adds nullrod to gamma paranormal 2018-10-12 15:41:06 +01:00
variableundefined 96f5046f19 Merge pull request #9817 from SamHPurp/stool-bed-chair-fixes
A few fixes
2018-10-12 13:48:02 +08:00
variableundefined 376cdc709a Merge pull request #9818 from farie82/twohanded-fix
Fixes the giving of required two handed items and chainsaw stuf
2018-10-12 13:24:19 +08:00
variableundefined 4de5284557 Merge pull request #9677 from DesolateG/global
Updates global lists to the global var subsystem.
2018-10-12 13:18:28 +08:00
tigercat2000 98c77fc466 Merge pull request #9343 from variableundefined/OreTGPort
Port over tg ore stack and stack merging
2018-10-11 19:34:13 -07:00
variableundefined 108ebfed3a Formatting improvement 2018-10-12 07:57:58 +08:00
Desolate 46dd98f4e0 oops 2018-10-11 16:26:06 -05:00
Purpose 6c6d35d133 fixies 2018-10-11 22:02:23 +01:00
joep van der velden c96adec91f Fixed it 2018-10-11 22:55:10 +02:00
Desolate f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
variableundefined fc27b8b7f1 Merge pull request #9726 from Agameofscones/thatdanguy23_fluff_t2
Rissa's Fluff Item
2018-10-11 11:30:59 +08:00
variableundefined 7882e5abca Merge pull request #9811 from Kyep/ert_fix
Fixes #9612 - ert panel not working for carbon mobs
2018-10-11 10:26:15 +08:00
variableundefined f58b405580 Merge pull request #9809 from Agameofscones/necklaces_fix_reeeee
Necklace equip location fix
2018-10-11 09:50:59 +08:00
variableundefined 7cb45b93ec Merge pull request #9806 from farie82/dna.species-runtime-fix
Fixes the NPCs not being initialised correctly
2018-10-11 09:16:01 +08:00
Kyep 9cfee0afd5 space 2018-10-10 18:01:00 -07:00
Kyep 280ec3746b cleanup, better to use the default 2018-10-10 17:58:30 -07:00
Kyep 559eae16cd Fixes #9612 - ert panel not working for carbon mobs 2018-10-10 17:48:16 -07:00
Gwydion Brain 516942a6ee Removes Terrible Implementation 2018-10-10 16:15:07 -07:00
joep van der velden c8d831dc67 Fixed it 2018-10-10 21:41:09 +02:00
variableundefined 62fceba06a Merge pull request #9765 from Agameofscones/cupsnstuff
Hot Drink Sprites QOL
2018-10-11 03:24:29 +08:00
Gwydion Brain 57debc2eb8 Merge branch 'master' into thatdanguy23_fluff_t2 2018-10-10 10:52:04 -07:00
variableundefined 03deae3a31 Merge pull request #9804 from Birdtalon/tpbug
Fixes mulebot teleportation bug
2018-10-11 01:44:11 +08:00
Birdtalon 83f906ad21 nulls load properly 2018-10-10 18:11:34 +01:00
variableundefined 021f55539f Merge pull request #9776 from tigercat2000/hover_indicator_inventory
SSOverlays & Hover Inventory Indicator
2018-10-10 22:19:26 +08:00
variableundefined 81707be798 Merge pull request #9792 from Ty-Omaha/SIREN-FIX
Fixes the Ambulance
2018-10-10 21:22:08 +08:00
Crazy Lemon 6c6c4d87f2 Merge pull request #9796 from Citinited/no-goatse-in-chat-pls
[s] Fixes a way to circumvent banned HTML tag check
2018-10-09 19:16:47 -07:00
variableundefined 5e4ec5bfeb Merge pull request #9795 from Ty-Omaha/PAI-FIX
Fixes PAIs
2018-10-10 08:00:50 +08:00
variableundefined 1122bf192f Merge pull request #9785 from lass9030/match-fix
Relighting matches with shoes fix.
2018-10-10 07:55:11 +08:00
Citinited 07572d672f Keeps img functionality in chat while fixing the other exploit 2018-10-09 22:25:58 +01:00
Ty-Omaha 506b90c806 pai fix 2018-10-09 17:02:02 -04:00
Citinited f9f5cfbe40 Adds img to list of banned html tags; fixes an easy way to circumvent the check 2018-10-09 20:48:54 +01:00
Ty-Omaha 4b11c9cdaf WEEWOO FIX 2018-10-09 15:26:44 -04:00
lass9030 b853f2e28c Changed as requested, re-added sound. 2018-10-09 18:22:54 +02:00
lass9030 8111331094 Replaced code with procs, added return values. 2018-10-09 16:21:11 +02:00
lass9030 8c5153b490 Minor text edit. 2018-10-09 15:12:51 +02:00
alex-gh 38bc4fdbb8 You no longer scream and collapse non-stop when buckled into a chair without legs. 2018-10-09 13:39:40 +02:00