cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-01 21:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,355 Commits 26 Branches 2 Tags
2f401fd7d3600aeebbc71864fbcc42915d2abacc
Commit Graph

546 Commits

Author SHA1 Message Date
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
ZomgPonies
5d7257e651 This worked better before 2014-05-01 22:28:32 -04:00
suethecake
aa33563ba7 Few bugfixes - namely species hair still having do coloration = 0 and the tail rendering over equipment. Tajaran and Unathi sprites are also now black to facilitate more vibrant colors. 
Trying to color them while dark green and brown-grey ended up in odd colorations. Quality of life change.

Conflicts:
	code/modules/mob/new_player/sprite_accessories.dm
	icons/mob/human_face.dmi
	icons/mob/human_races/r_def_tajaran.dmi
	icons/mob/human_races/r_tajaran.dmi
 2014-04-29 14:08:32 -04:00
suethecake
10b7a2e8d9 Initial commit containing all the necessary code files that allow Tajaran, Unathi, and Skrell to change both their hair and body color to match. NO MORE GREEN/GREY! 
Conflicts:
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/living/carbon/species.dm
	code/setup.dm
 2014-04-29 13:58:56 -04:00
Mloc-Argent
fcdcef5931 human: move organ generation into a species proc 
New proc: /datum/species/create_organs
Called in set_species when no organs exist or it's forced.
Also shuffled set_species around a bit, adding a var to human/new to
specify a species to start as.
Should fix the adminspawn vox organ runtime.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/organs/organ.dm
 2014-04-28 21:09:45 -04:00
Ccomp5950
13a72f4a04 Crash fix attempt: Moving NanoUI resource file sending away from client/New() 
it's going in mob/Login() instead.

Conflicts:
	code/modules/client/client procs.dm
	code/modules/mob/login.dm
 2014-04-28 18:51:57 -04:00
alex-gh
02aab3f779 Temporary revert for the new say code. 2014-04-24 10:28:52 +02:00
Ccomp5950
2d34d142a7 Say code fixes. 
Lobby players won't hear stuffs
Universal hearing with animals won't be a thing.
Players won't hear stuff if they are sleeping, though somethings might slip through...

Conflicts:
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/modules/mob/new_player/new_player.dm
 2014-04-20 09:30:18 -04:00
DJSnapshot
843ac65077 Undershirts and rolling down jumpsuits! 
Conflicts:
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	icons/mob/human.dmi
	icons/mob/uniform.dmi
 2014-04-19 16:17:14 -04:00
SparklySheep
1acab2a20a Adds a few new hairstyles and adds a fix for the red IPC hairstyle as well. Please check to see if this doesn't break anything. 
Conflicts:
	baystation12.int
	icons/mob/human_face.dmi
 2014-03-11 06:04:10 -04:00
RKF45
e7e7001aae New preferences 
Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
 2014-02-02 01:58:16 -05:00
Loganbacca
6f655a1686 Added underwear rendering to character setup screen 
Also culled unused underwear names from global_lists.dm

Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
 2014-02-01 18:34:49 -05:00
ZomgPonies
bd946b0ab1 Fixes for new species 2014-01-28 16:33:02 -05:00
Zuhayr
f2f9616f2b IPC hairstyles. 
Conflicts:
	code/modules/mob/new_player/sprite_accessories.dm
	icons/mob/human_face.dmi
 2014-01-28 15:14:55 -05:00
Rob Nelson
f44ff1d7aa Standardize FAT 
Conflicts:
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/simple_animal/constructs.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_grab.dm
 2014-01-21 22:57:10 -05:00
Rob Nelson
1b2d09bb2d More fixings. 
Conflicts:
	code/game/machinery/computer/medical.dm
 2014-01-20 01:09:03 -05:00
Rob Nelson
db21525feb SAY HELO TO DNA2, N3X15'S AWFUL FUCKING RECODE OF DNA 
Conflicts:
	baystation12.dme
	code/game/gamemodes/setupgame.dm
	code/game/objects/items/weapons/dna_injector.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/new_player/new_player.dm
 2014-01-20 00:43:19 -05:00
ZomgPonies
d40ebc5cc5 Revert "Tradeband and Gutterspeak now have a different font than Tradeband." 
This reverts commit b5906bba39.

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
 2014-01-15 06:54:46 -05:00
SkyMarshal
b5906bba39 Tradeband and Gutterspeak now have a different font than Tradeband. 
Fixes #4143

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/new_player/new_player.dm
 2014-01-09 21:05:36 -05:00
ZomgPonies
6dd2336ae2 Fixed the way Dionas get their names. Should help fluff. 2014-01-07 04:20:57 -05:00
Zuhayr
e09a00fe0e Fixed a duplicate definition bug with WHITELISTED. 
Conflicts:
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/new_player/new_player.dm
	code/setup.dm
 2014-01-06 23:59:21 -05:00
ZomgPonies
c8e12ffb4d Assistant limiter tweak 2013-12-30 12:21:41 -05:00
ZomgPonies
3b346dea27 Assistant Limiting 2013-12-30 12:20:08 -05:00