cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 14:37:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

SAY HELO TO DNA2, N3X15'S AWFUL FUCKING RECODE OF DNA

Browse Source 
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
This commit is contained in:
Rob Nelson
2014-01-20 00:43:19 -05:00
committed by ZomgPonies
parent f3354cf5de
commit db21525feb
13 changed files with 1097 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+9 -1
View File
@@ -1362,10 +1362,18 @@ mob/living/carbon/human/yank_out_object()
else
see_invisible = SEE_INVISIBLE_LIVING
if(species.name=="Slime People")
dna.mutantrace = "slime"
mutations+=species.default_mutations
if(species.default_mutations.len>0)
var/needs_update=0
for(var/mutation in species.default_mutations)
if(!(mutation in mutations))
mutations.Add(mutation)
needs_update=1
if(needs_update)
check_mutations=1 // Can't check here or shit will happen. Bad shit.
spawn(0)
update_icons()
code/modules/mob/living/carbon/human/human_defines.dm
+4 -1
View File
@@ -56,4 +56,7 @@
var/mob/remoteview_target = null
var/meatleft = 3 //For chef item
var/decaylevel = 0 // For rotting bodies
var/slime_color = "blue" //For slime people this defines their color, it's blue by default to pay tribute to the old icons
var/slime_color = "blue" //For slime people this defines their color, it's blue by default to pay tribute to the old icons
var/check_mutations=0 // Check mutations on next life tick
code/modules/mob/living/carbon/human/life.dm
+6
View File
@@ -73,6 +73,12 @@
var/obj/location_as_object = loc
location_as_object.handle_internal_lifeform(src, 0)
if(check_mutations)
testing("Updating [src.real_name]'s mutations: "+english_list(mutations))
domutcheck(src,null)
update_mutations()
check_mutations=0
//Updates the number of stored chemicals for powers
handle_changeling()
code/modules/mob/living/carbon/species.dm
+1 -1
View File
@@ -41,7 +41,7 @@
// For grays
var/max_hurt_damage = 5 // Max melee damage dealt + 5 if hulk
var/default_mutations = list()
var/list/default_mutations = list()
var/list/abilities = list() // For species-derived or admin-given powers
code/modules/mob/new_player/new_player.dm
+5 -3
View File
@@ -434,7 +434,7 @@
new_character.dna.b_type = client.prefs.b_type
if(client.prefs.disabilities & DISABILITY_FLAG_NEARSIGHTED)
new_character.dna.struc_enzymes = setblock(new_character.dna.struc_enzymes,GLASSESBLOCK,toggledblock(getblock(new_character.dna.struc_enzymes,GLASSESBLOCK,3)),3)
new_character.dna.SetSEState(GLASSESBLOCK,1,1)
new_character.disabilities |= NEARSIGHTED
if(client.prefs.disabilities & DISABILITY_FLAG_FAT)
@@ -442,13 +442,15 @@
new_character.overeatduration = 600 // Max overeat
if(client.prefs.disabilities & DISABILITY_FLAG_EPILEPTIC)
new_character.dna.struc_enzymes = setblock(new_character.dna.struc_enzymes,EPILEPSYBLOCK,toggledblock(getblock(new_character.dna.struc_enzymes,EPILEPSYBLOCK,3)),3)
new_character.dna.SetSEState(EPILEPSYBLOCK,1,1)
new_character.disabilities |= EPILEPSY
if(client.prefs.disabilities & DISABILITY_FLAG_DEAF)
new_character.dna.struc_enzymes = setblock(new_character.dna.struc_enzymes,DEAFBLOCK,toggledblock(getblock(new_character.dna.struc_enzymes,DEAFBLOCK,3)),3)
new_character.dna.SetSEState(DEAFBLOCK,1,1)
new_character.sdisabilities |= DEAF
new_character.dna.UpdateSE()
new_character.key = key //Manually transfer the key to log them in