cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-04 14:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,443 Commits 26 Branches 2 Tags
c8f9aa0c33564dba955ffbb559c19f2bfa845b2e
Commit Graph

568 Commits

Author SHA1 Message Date
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
Markolie
3777f5c8bf Revert debugging 2014-11-20 20:56:34 +01:00
Markolie
dc89eaba1a Debugging 2014-11-19 02:24:07 +01:00
Rob Nelson
3a3e8ac7be Fix grey eyes, add bitching when hairstyles are invalid. 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/new_player/sprite_accessories.dm
 2014-08-04 22:29:38 -04:00
ZomgPonies
1b2e61f3d0 Bugfixes 2014-07-31 19:42:07 -04:00
Jarcolr
ff71c6f097 Fixes #5691 
Chef >> Chefhat
 2014-07-26 11:28:15 -04:00
ZomgPonies
ab32000c2a Finally fixes lobby jukebox 2014-06-29 16:44:42 -04:00
ZomgPonies
399e4909d6 The death of assistants. Long live civilians! 2014-06-27 17:57:18 -04:00
ZomgPonies
cb9b6fca4d Replacing civilian with support department. Still need to make changes on MySQL schema. 2014-06-26 19:42:14 -04:00
ZomgPonies
adfa2ca902 And another one, I'll remove them one by one until I find the one that works. 2014-06-25 13:21:09 -04:00
mwerezak
9874ce38ce shuttle_controller now uses a shuttle datum 
Conflicts:
	code/game/machinery/computer/communications.dm
	code/modules/admin/verbs/randomverbs.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/power/singularity/singularity.dm
 2014-06-23 11:07:58 -04:00
ZomgPonies
096cae4dd4 Hopefully cut down on ressource size and speed up loading 2014-06-23 04:29:22 -04:00
Loganbacca
6225adf42f Preview icon render fix 
- Fixes #5254
- Changes organ render list to a structured list so we can control the render order
 2014-06-22 01:49:44 -04:00
Jarcolr
4009f26b9a Fixes the Unathi/Shogun short frills 
A s was missing from the icon_state.
 2014-06-21 10:01:30 +03:00
mwerezak
a06850450a Fixes tails not rendering on the player preview 2014-06-18 22:17:29 -04:00
Jeremy Liberman
33cd27e032 Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel. 
Conflicts:
	code/__HELPERS/names.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/mob.dm
	code/modules/mob/new_player/new_player.dm
 2014-06-05 16:05:09 -04:00
Hubblenaut
f2721ca8a6 Wheelchairs spawn on footless characters 
Conflicts:
	code/modules/client/preferences.dm
 2014-06-03 18:48:57 -04:00
ZomgPonies
06bbfcf150 Final Nations patch before live testing. This is going to be painful. 2014-05-27 20:09:10 -04:00
ZomgPonies
3c9dbcc822 First commit for nations gamemode, setting up the framework I'll be using. 2014-05-26 20:02:20 -04:00
Zuhayr
05809ec585 Changed by-species icon sheets to by-clothing species-specific icon sheets. 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/species.dm
 2014-05-26 13:30:47 -04:00
Jeremy Liberman
b3d3f5df8c Mutiny fix prereqs for directives 
Conflicts:
	code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm
	code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm
	code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
	code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm
	code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm
	code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm
	code/game/gamemodes/mutiny/directives/terminations_directive.dm
	code/game/gamemodes/mutiny/directives/test_directive.dm
	code/modules/mob/mob.dm
	code/modules/mob/new_player/new_player.dm
 2014-05-25 22:34:39 +02:00
ZomgPonies
5ffb4a15ed Moar armalis fixes 2014-05-14 23:00:13 -04:00
Rob Nelson
9d53cfa446 Moved Vox DMI to a subfolder, added species-based random-naming, fixed preview. 
Tested.

Conflicts:
	code/game/gamemodes/vampire/vampire_powers.dm
	code/game/gamemodes/vox/heist/heist.dm
	code/modules/admin/verbs/one_click_antag.dm
	code/modules/events/heist.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/mob.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences_setup.dm
 2014-05-14 04:32:18 -04:00