Fox-McCloud
7007f6bbdf
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-23 01:01:09 -05:00
Fox-McCloud
dc0710135e
more fixes
2017-01-23 00:53:44 -05:00
Fox-McCloud
104bfab759
sprite and code fixes
2017-01-22 23:25:56 -05:00
Fox-McCloud
dde14aa78e
it compiles
2017-01-22 19:57:03 -05:00
Fox-McCloud
706347fd84
even more work
2017-01-22 08:11:31 -05:00
Fox-McCloud
10c0e734c3
more work
2017-01-22 01:46:48 -05:00
Fox-McCloud
ea76990b7a
Botany Rework
2017-01-21 18:28:03 -05:00
Fox McCloud
e0569091c9
Merge pull request #6222 from Markolie/ann2
...
Announcement fixes
2017-01-19 13:21:18 -05:00
Markolie
cedfc2ccbf
Announcement fixes
2017-01-19 15:12:20 +01:00
Crazy Lemon
2a209f62cd
Merge pull request #5814 from Markolie/ann2
...
Announcement refactor
2017-01-18 19:17:30 -08:00
Crazy Lemon
37a7484976
Merge pull request #6149 from FlattestGuitar/log-upgrade
...
Adds log stacking to admin logs
2017-01-18 19:13:50 -08:00
Crazy Lemon
c16397af3f
Merge pull request #6145 from AndriiYukhymchak/teg_reworks
...
TEG's circulators can now be controlled
2017-01-18 19:04:10 -08:00
Fox McCloud
55a255aa40
Merge pull request #6195 from TheBeoni/More-Book-Sprites
...
More book sprites
2017-01-18 21:22:38 -05:00
Fox McCloud
ebad512fb6
Merge pull request #6218 from KasparoVy/fat-roundstart-fix
...
Fat characters now spawn in fat.
2017-01-18 21:20:45 -05:00
KasparoVy
5b9a5aeb6e
Reduced redundancy.
...
Setting .disabilities and .mutations was made redundany by the use of
SetSEState and domutcheck.
2017-01-18 19:39:49 -05:00
Fox McCloud
03e3f1d624
Merge pull request #6169 from Aurorablade/KALIMAH
...
Bugsie 3
2017-01-18 18:52:19 -05:00
KasparoVy
4a420ef768
Fat characters are now fat.
2017-01-18 18:44:36 -05:00
Crazy Lemon
deba5d8b95
Merge pull request #6170 from Fox-McCloud/species-lever-options
...
Adds Species Levers
2017-01-18 15:35:17 -08:00
Aurorablade
9f1037006d
Changes and more shit i noticed...
2017-01-17 23:45:47 -05:00
Mieszko Jędrzejczak
ebe0d0271c
Fixes a silly loadout error
2017-01-17 16:14:09 +01:00
Mieszko Jędrzejczak
1b506aaf9f
Switches over to the new system
2017-01-17 13:57:07 +01:00
Mieszko Jędrzejczak
9e7be0276a
Adds log stacking to admin logs
2017-01-17 13:52:46 +01:00
Aurorablade
479a82017c
Merge this before i find something else....
2017-01-16 23:55:41 -05:00
TheBeoni
c5158fe710
Makes new book sprites available for Bookbinder
2017-01-16 19:43:14 +01:00
TheBeoni
bb7cad2470
Makes new sprites available for Checkout PC
2017-01-16 19:41:49 +01:00
Fox McCloud
495cb56e74
Merge pull request #6191 from Krausus/CharacterSlotFixes
...
Character Slot Randomization and Loading Fixes
2017-01-16 13:31:19 -05:00
Krausus
6f96d0bae2
Character slot fixes
...
Fixes "Randomized Character Slot" not working at all and the slot load
list running 20x as many SQL queries as it should
2017-01-16 13:15:37 -05:00
Krausus
f41069b8c1
Fixes force-feeding full people pills/patches
...
Pills/patches now ignore fullness when being used on others, just like
they do when used on yourself.
2017-01-16 04:31:50 -05:00
Fox McCloud
2435aa1c52
Merge pull request #6115 from tigercat2000/ooc_emoji_twemoji
...
Goonchat Twemoji support.
2017-01-15 18:13:39 -05:00
Andrii Yukhymchak
6d3eb11adb
Naming and using updated
2017-01-15 19:48:14 +02:00
Fox McCloud
b993295e60
Merge pull request #6120 from TullyBurnalot/OverOverload
...
Multiple Ascendant Light Fix
2017-01-15 12:44:47 -05:00
TullyBurnalot
f7b729c138
ACTUALLY addresses suggestion by Krausus
2017-01-15 17:37:30 +00:00
Fox McCloud
011b492e2e
Merge pull request #6146 from Crazylemon64/i_love_evil_traps
...
Makes Adminbussing Evil Traps Easier
2017-01-15 12:06:39 -05:00
TullyBurnalot
86536e3b43
Removes needless proc
2017-01-15 14:35:00 +00:00
TullyBurnalot
d2210f24c5
Re-adds skip_sounds_and_sparks
...
Woops, forgot how useful this could be
2017-01-15 14:25:05 +00:00
TullyBurnalot
2d82f940f6
Addresses suggestion by Krausus/Syntax fix
2017-01-15 14:20:15 +00:00
Krausus
3aa007a1c7
Pet slime tweaks
2017-01-14 17:38:08 -05:00
Aurorablade
5642ba19e7
Added failbacks for icon states
...
updated firecult floor thanks to Jedr
2017-01-14 13:02:05 -05:00
Fox-McCloud
56f0d79f15
Adds Species Levers
2017-01-14 03:51:43 -05:00
Aurorablade
90b5177f4e
Rawr
2017-01-14 01:48:44 -05:00
Crazylemon64
0e01cf9353
Redundancy removal
2017-01-13 15:33:22 -08:00
Crazylemon64
d2da018f56
Removes the /atom-level var
2017-01-13 14:05:04 -08:00
Fox McCloud
2aa86d8777
Merge pull request #5704 from uraniummeltdown/lingfixesspecies
...
Changeling Changes
2017-01-13 15:50:17 -05:00
Fox McCloud
5df12c667a
Merge pull request #6151 from DarkPyrolord/nojoyallowed
...
Removes the joy mask
2017-01-13 12:39:42 -05:00
Aurorablade
5a07759c97
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Bugsie
2017-01-11 23:41:06 -05:00
DarkPyrolord
217244deac
Removes the joy mask
2017-01-12 16:19:12 +13:00
Fox McCloud
b75614c4a2
Merge pull request #6138 from Puckaboo2/masterbackup
...
Adding medical scrubs and caps to the loadout
2017-01-11 16:36:44 -05:00
Tigercat2000
836d07189c
Added config toggle + admin verb to disable OOC emoji (not PM)
2017-01-11 09:54:15 -08:00
Tigercat2000
4a6ae68fd2
Already forgot something ;)
2017-01-11 09:31:56 -08:00
Tigercat2000
0b69fe7842
Goonchat Twemoji support.
...
Add twemoji support to goonchat. It only parses annotations if the message has a
<span> tag with the 'emoji_enabled' class.
Also adds utf-8 support with goonchat, for the twemoji.
2017-01-11 09:31:56 -08:00
