Commit Graph

590 Commits

Author SHA1 Message Date
Markolie
90f722d752 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom
Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
	icons/mob/back.dmi
2015-09-15 04:18:27 +02:00
Markolie
84c60aa560 Monkey/human transform fixes 2015-09-14 22:13:32 +02:00
Markolie
ca6c7d10ba In hand sprite overhaul 2015-09-13 22:44:18 +02:00
Aurorablade
9886775a61 typo fix 2015-09-13 00:06:30 -04:00
Markolie
570b90393d Fix Vox socks 2015-09-11 20:10:10 +02:00
Mark van Alphen
6c1208e18f Merge pull request #1819 from Aurorablade/GoOnYourFeet
[Sprite] [TG Port] Things that go on your feet
2015-09-07 22:31:21 +02:00
Aurorablade
dd558c68e2 Remove an opps and sprite name tweak 2015-08-29 20:05:25 -04:00
KasparoVy
963a7c0c96 Part 2 of new Disabilities in Player Creation
Adds blind and mute to the disabilities list.
2015-08-29 14:05:12 -04:00
Aurorablade
7ef6ae96c6 Finishes voxxy soxs 2015-08-26 21:30:42 -04:00
Aurorablade
726843ffc9 Changes pathing back
probaly only need the species allowed for non-vox once though will fix
later.
2015-08-25 08:28:06 -04:00
Aurorablade
1104ca5d2b Ever try to put a vox in fishnets? 2015-08-25 06:33:56 -04:00
Aurorablade
3560722717 SQL files, Structure rearrange, Vox Sox
I still need to get species restrict to work properly for vox sox. Not
the BEST sprite edit for it but it works.
2015-08-24 07:42:37 -04:00
Aurorablade
ac6a2baa80 Sock port
Plus fix to secruity records text
2015-08-21 17:43:16 -04:00
Fox-McCloud
333e7fe236 Merge pull request #1766 from Markolie/adminbus
Admin jump overhaul, add watchlist functionality, other admin updates
2015-08-17 18:10:38 -04:00
Markolie
a397c730b5 Admin jump overhaul, add watchlist functionality, other admin updates 2015-08-16 23:28:02 +02:00
Tigercat2000
748da30bb6 -tg- underware overhaul
This commit overhauls the underwear/undershirt system to -tg-'s text-based
version. No more magic numbers, just text states.

Note, this modifies the SQL Schema, and existing databases must be
modified by the following SQL:

ALTER TABLE server_db.characters
	CHANGE underwear underwear MEDIUMTEXT NOT NULL,
	CHANGE undershirt undershirt MEDIUMTEXT NOT NULL;
2015-08-13 17:45:52 -07:00
Fox-McCloud
f5ce957f33 qdel pass II 2015-07-11 02:10:31 -04:00
Tigercat2000
61e7fdb368 Whitelisting to bypass the reroute system.
Note, all ckeys in the ofwhitelist must be lowercase and contain no
spaces.
2015-05-28 10:34:33 -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
Fox-McCloud
64d2d5c092 Vulpkanin Facial Fur Fix 2015-05-25 21:48:08 -04:00
Fox-McCloud
95a06fa165 updates and tweaks 2015-05-24 20:17:17 -04:00
Fox-McCloud
791ebc0b7f New Race: Canine Race--Vulpkanin 2015-05-24 01:00:19 -04:00
Krausus
41b0dbf5f7 Fixes new player stat panel runtimes
Whoops!
2015-05-19 10:43:59 -04:00
Krausus
1e046c9fa4 Stat Panel Fixes
Fixes shuttle ETD, debugging info in Status tab, ghost alt-clicking,
mind-level spell listing, and ordering of Lobby tab.
2015-05-19 10:06:05 -04:00
ZomgPonies
95b1c1d87c Adds two new event species 2015-05-14 22:30:38 -04:00
ZomgPonies
dddecb9025 Change slime people to not need mutantrace anymore. 2015-04-13 07:59:25 -04:00
Fox-McCloud
7c739e4745 Merge pull request #710 from ZomgPonies/limb
Port of the BS12 limb overhaul
2015-04-05 19:06:39 -04:00
VelardAmakar
4dc73ce9af Added ~15~ 12 new hair options courtesy of Fury McFlurry 2015-04-05 04:20:26 +02:00
ZomgPonies
91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
ZomgPonies
c693be1c57 Merge pull request #548 from tigercat2000/SlimeColorChanger
Allows slime people to change color in lobby.
2015-03-11 16:53:29 -04:00
Tigercat2000
7da4efc494 Fix proc/update_preview_icon as well as ID images for colored slime people 2015-03-11 16:18:34 +01:00
ZomgPonies
d1587addaf No more crazy random colors 2015-03-09 22:32:14 -04:00
Mark van Alphen
d89c885a14 Merge pull request #435 from ZomgPonies/fixuns
Various fixings and additions
2015-02-27 18:22:35 +01:00
Fox-McCloud
9bae042444 Fixes a Gamebreaking Bug 2015-02-26 21:07:50 -05:00
ZomgPonies
4fdd31f0da 5 new Vox quill styles, thanks to FullofSkittles 2015-02-26 20:08:20 -05:00
ZomgPonies
ef7fe5a181 Optimizing lobby stuff 2015-02-24 11:22:12 -05:00
Markolie
72db213067 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/jobs/job/support.dm
	code/setup.dm
2015-02-22 19:12:11 +01:00
Markolie
982102a407 Standardize mutations 2015-02-22 19:04:43 +01:00
Markolie
d8d1670b68 Revert "Revert "Saycode/language/species port from Bay""
This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-02-20 17:46:35 +01:00
ZomgPonies
d54579850c Revert "Saycode/language/species port from Bay" 2015-02-19 20:15:42 -05:00
Markolie
21926c9e48 Part 1 of saycode/language/species port from Bay 2015-02-17 23:20:50 +01:00
Artorp
69f5776aee Disability fixes
- Disabilities properly updated when new player is made

- Fixed epilepsy disability not linked to proper SE block
2015-02-08 14:20:57 +01:00
Markolie
36f5bd0c52 Add AI latejoining, fix Ofitser again, blob damages pods 2015-02-05 14:58:12 +01:00
Markolie
86dd7782d5 Add cyborg latejoining 2015-02-05 14:27:39 +01:00
Markolie
60e18d0c0e Major map overhaul, remove customs officer/nanotrasen recruiter 2015-01-12 02:23:45 +01:00
Fox-McCloud
b90b9ad8b5 Merge pull request #131 from Markolie/master
Map fixes, bug fixes
2015-01-05 22:57:19 -05:00
Markolie
6ce5b379e4 Let AI transmit cryo/arrival messages when present, let AI change arrival message 2015-01-06 02:06:23 +01:00
Fox-McCloud
03c7a72a33 Undershirts 2015-01-05 16:22:47 -05:00
Fox-McCloud
21a1c0bc83 Stunning Changes 2014-12-06 02:33:31 -05:00
Markolie
7554748a26 Adds Mortician, vomit mask fix, fix for missing images for various jobs 2014-11-26 20:44:06 +01:00