ZomgPonies
52e8720bd8
Merge pull request #1195 from Fox-McCloud/wolpin-fix
...
Wolpin Fix+Monkey Tail Fix
2015-05-28 12:34:17 -04:00
Tigercat2000
32fce7f501
Example-ify config example.
2015-05-28 07:50:11 -07:00
Tigercat2000
1643b0f118
Overflow Rerouting System
...
This commit adds an overflow rerouting system customizable by modifying
the config. If the config values are set, after X amount of clients have
connected, the server will start rerouting all new players to the
configuration "overflow" server. Note that admins are immune to this, and
therefore will not be rerouted under any circumstance. Players that have
already connected and have a body will not be rerouted either, this will
only affect new players that get sent to the lobby.
It probably would also kick players if an admin sent them to the lobby,
but that's a very special case scenario.
2015-05-28 07:08:33 -07:00
SamCroswell
2b5d5815e1
Chem Lab Re-map
2015-05-28 04:53:40 -04:00
Fox-McCloud
226052c438
typo
2015-05-28 04:07:41 -04:00
Fox-McCloud
cd112b5364
Wolpin Fix+Monkey Tail Fix
2015-05-28 04:04:39 -04:00
ZomgPonies
613ae3f552
Merge pull request #1191 from TheFlagbearer/TheFlagbearer-Arachnomask-quickfix
...
Theflagbearer arachnomask quickfix
2015-05-28 01:18:00 -04:00
Fox-McCloud
5d3e837b4a
Mob Refactor+Update and Pet Collars
2015-05-28 00:20:25 -04:00
ZomgPonies
2827a2cd43
Merge pull request #1192 from Krausus/YeahSureJustAddTheBlood
...
Fixes Syringe Blood Duping
2015-05-27 22:09:01 -04:00
Krausus
460fccd8db
Fixes syringe blood duping
2015-05-27 21:56:01 -04:00
TheFlagbearer
a88240c2ce
Quickfix for the Arachno-Man Mask
...
I know this is my fourth PR regarding this item but bear with me. It's
been 4 days since I started doing this stuff.
My previous PR fixed everything EXCEPT for the mask, which remained the
same. This fixes that.
2015-05-27 21:10:17 -04:00
ZomgPonies
e2f867e896
Merge pull request #1189 from Fox-McCloud/squeaky
...
Fixes Rubber Duck
2015-05-27 20:27:27 -04:00
Fox-McCloud
93935bd315
Merge pull request #1185 from ZomgPonies/monkey
...
Monkey Fixes
2015-05-27 20:09:06 -04:00
ZomgPonies
7845127f34
Merge pull request #1187 from TheDZD/minor-fixes
...
Fix for custom items not spawning
2015-05-27 20:05:46 -04:00
Fox-McCloud
f87c819d25
heheh
2015-05-27 20:02:22 -04:00
Fox-McCloud
127aff20ba
Fixes Rubber Duck
2015-05-27 19:55:35 -04:00
ZomgPonies
c024764b10
Merge pull request #1179 from TheFlagbearer/revert-1158-Theflagbearer-customitems
...
The Flagbearer - Custom Item Fixes
2015-05-27 19:39:58 -04:00
Tigercat2000
581521daae
Refactor Alien icons to get rid of nasty laying layer.
2015-05-27 16:39:35 -07:00
ZomgPonies
57cb6a8ca5
Merge pull request #1178 from TheDZD/mobs
...
simple_animal and simple_animal/hostile Refactor
2015-05-27 19:38:50 -04:00
ZomgPonies
0587051c79
Fixes monkey inventory stuff
2015-05-27 19:29:17 -04:00
DZD
4407f58aa4
Fix for custom items not spawning
...
The jobmask wasn't trimming spaces after the comma between job names,
and thus thought every job after the first began with a space.
2015-05-27 19:10:43 -04:00
ZomgPonies
fc8a5b8789
Fixed invisible nymphs and monkey recyclers
2015-05-27 19:02:16 -04:00
Tigercat2000
0691822f9c
Mob Resizing, -tg- mob lying standarization
2015-05-27 15:58:13 -07:00
ZomgPonies
8dc5dd1431
Fixes monkeyblock genetics stuff
2015-05-27 18:32:11 -04:00
DZD
db863b258d
Minor bear fixes
...
Fixes bears not having attack text or an attack sound.
2015-05-27 18:22:03 -04:00
TheFlagbearer
a65e0bca7e
Real merge fix
...
Merge conflicts aren't my strong suit.
2015-05-27 16:51:00 -04:00
TheFlagbearer
c3deedf036
Fixes merge conflict
2015-05-27 16:46:44 -04:00
ZomgPonies
2864fb913c
Merge pull request #1175 from FalseIncarnate/master
...
[Feature] Botany Belt, Biogenerator Additions
2015-05-27 11:39:46 -04:00
FalseIncarnate
5f39924db4
Delete monkey/diona.dm
...
Exorcises the nymph code haunting my repo.
2015-05-27 01:26:57 -04:00
FalseIncarnate
584f4641fc
Merge branch 'master' of https://github.com/FalseIncarnate/Paradise
2015-05-27 01:07:29 -04:00
FalseIncarnate
a1cce51559
Merge Conflict Fix, Attempt 2
2015-05-27 01:07:19 -04:00
FalseIncarnate
28347540b6
Merge Conflict Fix
...
Because Ponies removed commented out code.
2015-05-27 00:57:57 -04:00
Krausus
1ba4270f78
Reverts borgification disorder
2015-05-27 00:34:26 -04:00
FalseIncarnate
b6652513c1
Merge Conflict Fix
...
Because Ponies removed commented out code.
2015-05-27 00:23:53 -04:00
ZomgPonies
d5f7f49c08
Merge pull request #1177 from Fox-McCloud/laserrrrzzzz
...
Researchable Surgical Tools Port
2015-05-26 22:21:10 -04:00
Fox-McCloud
710dd1b520
Merge pull request #1171 from ZomgPonies/monkey
...
Converting monkeys to human subtypes
2015-05-26 22:14:55 -04:00
ZomgPonies
a3d29eec2f
Fix for languages using 2 characters in prefix
2015-05-26 21:38:10 -04:00
TheFlagbearer
b24c1a783f
Item sprites and defines
...
Fixes the Arachno-Man items. Hopefully doesn't cause a merge conflict.
If it does, I'll be forced to leave this PR open until someone helps out
or it's closed by a Senior Admin.
2015-05-26 21:32:42 -04:00
ZomgPonies
e76e33f4eb
Fixed language keys for monkeys
2015-05-26 21:30:13 -04:00
ZomgPonies
1aa5a8533d
Cleanup and moving of species files
2015-05-26 21:21:37 -04:00
ZomgPonies
2092695d0b
Merge pull request #1180 from tigercat2000/GPD
...
Fix getPixelDistance()
2015-05-26 21:14:56 -04:00
ZomgPonies
a9e2f0c641
HUD fixes
2015-05-26 21:13:02 -04:00
Tigercat2000
2d87dbcb13
Fix getPixelDistance()
2015-05-26 18:08:32 -07:00
DZD
93419f7fd4
simple_animal and hostile mob refactor
...
Ports the following:
tgstation/-tg-station#1780
Part of tgstation/-tg-station#6278 (Not including faction transferring)
tgstation/-tg-station#8206
tgstation/-tg-station#8543
2015-05-26 20:30:32 -04:00
ZomgPonies
0cc15105e5
Final fix
2015-05-26 20:29:47 -04:00
ZomgPonies
32c00989d6
Tigercat's fixes
2015-05-26 20:26:26 -04:00
ZomgPonies
86ebb33c7e
fix monkey language keys
2015-05-26 20:18:43 -04:00
ZomgPonies
be68965578
Fix pun pun runtimes also fixes for datums not initializing before world
2015-05-26 20:15:53 -04:00
Fox-McCloud
9e4af78603
tweaks
2015-05-26 20:06:42 -04:00
ZomgPonies
4f9b90a53f
Merge pull request #1176 from veganzombeh/fix
...
Prevents ghosts with antagHUG enabled becoming golems.
2015-05-26 19:29:28 -04:00
