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

Standardize mutation constants, remove ambiguity, remove non-implemented muts.

Browse Source 
Conflicts:
	code/_onclick/click.dm
	code/game/dna/genes/powers.dm
	code/game/machinery/wishgranter.dm
	code/modules/mob/living/carbon/alien/alien.dm
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_movement.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/damage_procs.dm
	code/modules/mob/living/living.dm
	code/modules/power/lighting.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/setup.dm
	maps/RandomZLevels/wildwest.dm
This commit is contained in:
Rob Nelson
2014-01-21 22:36:19 -05:00
committed by ZomgPonies
parent 0f5f78fcc9
commit 95cc6a27b5
29 changed files with 353 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/atoms.dm
+1 -1
View File
@@ -292,7 +292,7 @@ its easier to just keep the beam vertical.
add_fibers(M)
//He has no prints!
if (mFingerprints in M.mutations)
if (M_FINGERPRINTS in M.mutations)
if(fingerprintslast != M.key)
fingerprintshidden += "(Has no fingerprints) Real name: [M.real_name], Key: [M.key]"
fingerprintslast = M.key
code/game/dna/dna2_domutcheck.dm
+32 -32
View File
@@ -69,57 +69,57 @@
var/forced = (flags & MUTCHK_FORCED) == MUTCHK_FORCED
if(M.dna.GetSEState(NOBREATHBLOCK))
if(forced || probinj(45,inj) || (mNobreath in old_mutations))
if(forced || probinj(45,inj) || (M_NO_BREATH in old_mutations))
M << "\blue You feel no need to breathe."
M.mutations.Add(mNobreath)
M.mutations.Add(M_NO_BREATH)
if(M.dna.GetSEState(REMOTEVIEWBLOCK))
if(forced || probinj(45,inj) || (mRemote in old_mutations))
if(forced || probinj(45,inj) || (M_REMOTE_VIEW in old_mutations))
M << "\blue Your mind expands"
M.mutations.Add(mRemote)
M.mutations.Add(M_REMOTE_VIEW)
M.verbs += /mob/living/carbon/human/proc/remoteobserve
if(M.dna.GetSEState(REGENERATEBLOCK))
if(forced || probinj(45,inj) || (mRegen in old_mutations))
if(forced || probinj(45,inj) || (M_REGEN in old_mutations))
M << "\blue You feel better"
M.mutations.Add(mRegen)
M.mutations.Add(M_REGEN)
if(M.dna.GetSEState(INCREASERUNBLOCK))
if(forced || probinj(45,inj) || (mRun in old_mutations))
if(forced || probinj(45,inj) || (M_RUN in old_mutations))
M << "\blue Your leg muscles pulsate."
M.mutations.Add(mRun)
M.mutations.Add(M_RUN)
if(M.dna.GetSEState(REMOTETALKBLOCK))
if(forced || probinj(45,inj) || (mRemotetalk in old_mutations))
if(forced || probinj(45,inj) || (M_REMOTE_TALK in old_mutations))
M << "\blue You expand your mind outwards"
M.mutations.Add(mRemotetalk)
M.mutations.Add(M_REMOTE_TALK)
M.verbs += /mob/living/carbon/human/proc/remotesay
if(M.dna.GetSEState(MORPHBLOCK))
if(forced || probinj(45,inj) || (mMorph in old_mutations))
M.mutations.Add(mMorph)
if(forced || probinj(45,inj) || (M_MORPH in old_mutations))
M.mutations.Add(M_MORPH)
M << "\blue Your skin feels strange"
M.verbs += /mob/living/carbon/human/proc/morph
if(M.dna.GetSEState(COLDBLOCK))
if(!(COLD_RESISTANCE in old_mutations))
if(forced || probinj(15,inj) || (mHeatres in old_mutations))
M.mutations.Add(mHeatres)
if(!(M_RESIST_COLD in old_mutations))
if(forced || probinj(15,inj) || (M_RESIST_HEAT in old_mutations))
M.mutations.Add(M_RESIST_HEAT)
M << "\blue Your skin is icy to the touch"
else
if(forced || probinj(5,inj) || (mHeatres in old_mutations))
M.mutations.Add(mHeatres)
if(forced || probinj(5,inj) || (M_RESIST_HEAT in old_mutations))
M.mutations.Add(M_RESIST_HEAT)
M << "\blue Your skin is icy to the touch"
if(M.dna.GetSEState(HALLUCINATIONBLOCK))
if(forced || probinj(45,inj) || (mHallucination in old_mutations))
M.mutations.Add(mHallucination)
if(forced || probinj(45,inj) || (M_HALLUCINATE in old_mutations))
M.mutations.Add(M_HALLUCINATE)
M << "\red Your mind says 'Hello'"
if(M.dna.GetSEState(NOPRINTSBLOCK))
if(forced || probinj(45,inj) || (mFingerprints in old_mutations))
M.mutations.Add(mFingerprints)
if(forced || probinj(45,inj) || (M_FINGERPRINTS in old_mutations))
M.mutations.Add(M_FINGERPRINTS)
M << "\blue Your fingers feel numb"
if(M.dna.GetSEState(SHOCKIMMUNITYBLOCK))
if(forced || probinj(45,inj) || (mShock in old_mutations))
M.mutations.Add(mShock)
if(forced || probinj(45,inj) || (M_NO_SHOCK in old_mutations))
M.mutations.Add(M_NO_SHOCK)
M << "\blue Your skin feels strange"
if(M.dna.GetSEState(SMALLSIZEBLOCK))
if(forced || probinj(45,inj) || (mSmallsize in old_mutations))
if(forced || probinj(45,inj) || (M_DWARF in old_mutations))
M << "\blue Your skin feels rubbery"
M.mutations.Add(mSmallsize)
M.mutations.Add(M_DWARF)
M.pass_flags |= 1
@@ -160,21 +160,21 @@
M.disabilities |= NERVOUS
M << "\red You feel nervous."
if (M.dna.GetSEState(FIREBLOCK))
if(!(mHeatres in old_mutations))
if(forced || probinj(30,inj) || (COLD_RESISTANCE in old_mutations))
if(!(M_RESIST_HEAT in old_mutations))
if(forced || probinj(30,inj) || (M_RESIST_COLD in old_mutations))
M << "\blue Your body feels warm."
M.mutations.Add(COLD_RESISTANCE)
M.mutations.Add(M_RESIST_COLD)
else
if(forced || probinj(5,inj) || (COLD_RESISTANCE in old_mutations))
if(forced || probinj(5,inj) || (M_RESIST_COLD in old_mutations))
M << "\blue Your body feels warm."
M.mutations.Add(COLD_RESISTANCE)
M.mutations.Add(M_RESIST_COLD)
if (M.dna.GetSEState(BLINDBLOCK))
M.sdisabilities |= BLIND
M << "\red You can't seem to see anything."
if (M.dna.GetSEState(TELEBLOCK))
if(forced || probinj(15,inj) || (TK in old_mutations))
if(forced || probinj(15,inj) || (M_TK in old_mutations))
M << "\blue You feel smarter."
M.mutations.Add(TK)
M.mutations.Add(M_TK)
if (M.dna.GetSEState(DEAFBLOCK))
M.sdisabilities |= DEAF
M.ear_deaf = 1
code/game/dna/dna2_helpers.dm
+1 -1
View File
@@ -31,7 +31,7 @@
/proc/randmutg(var/mob/living/M)
if(!M) return
M.dna.check_integrity()
var/block = pick(HULKBLOCK,XRAYBLOCK,FIREBLOCK,TELEBLOCK,NOBREATHBLOCK,REMOTEVIEWBLOCK,REGENERATEBLOCK,INCREASERUNBLOCK,REMOTETALKBLOCK,MORPHBLOCK,NOPRINTSBLOCK,SHOCKIMMUNITYBLOCK,SMALLSIZEBLOCK)
var/block = pick(HULKBLOCK,XRAYBLOCK,FIREBLOCK,COLDBLOCK,TELEBLOCK,NOBREATHBLOCK,REMOTEVIEWBLOCK,REGENERATEBLOCK,INCREASERUNBLOCK,REMOTETALKBLOCK,MORPHBLOCK,NOPRINTSBLOCK,SHOCKIMMUNITYBLOCK,SMALLSIZEBLOCK)
M.dna.SetSEState(block, 1)
// Random Appearance Mutation
code/game/dna/genes/disabilities.dm
+1 -1
View File
@@ -54,7 +54,7 @@
/datum/dna/gene/disability/hallucinate
name="Hallucinate"
activation_message="Your mind says 'Hello'."
mutation=mHallucination
mutation=M_HALLUCINATE
New()
block=HALLUCINATIONBLOCK
code/game/dna/genes/powers.dm
+32 -12
View File
@@ -5,7 +5,7 @@
/datum/dna/gene/basic/nobreath
name="No Breathing"
activation_messages=list("You feel no need to breathe.")
mutation=mNobreath
mutation=M_NO_BREATH
New()
block=NOBREATHBLOCK
@@ -13,7 +13,7 @@
/datum/dna/gene/basic/remoteview
name="Remote Viewing"
activation_messages=list("Your mind expands.")
mutation=mRemote
mutation=M_REMOTE_VIEW
New()
block=REMOTEVIEWBLOCK
@@ -25,7 +25,7 @@
/datum/dna/gene/basic/regenerate
name="Regenerate"
activation_messages=list("You feel better.")
mutation=mRegen
mutation=M_REGEN
New()
block=REGENERATEBLOCK
@@ -33,7 +33,7 @@
/datum/dna/gene/basic/increaserun
name="Super Speed"
activation_messages=list("Your leg muscles pulsate.")
mutation=mRun
mutation=M_RUN
New()
block=INCREASERUNBLOCK
@@ -41,7 +41,7 @@
/datum/dna/gene/basic/remotetalk
name="Telepathy"
activation_messages=list("You expand your mind outwards.")
mutation=mRemotetalk
mutation=M_REMOTE_TALK
New()
block=REMOTETALKBLOCK
@@ -53,7 +53,7 @@
/datum/dna/gene/basic/morph
name="Morph"
activation_messages=list("Your skin feels strange.")
mutation=mMorph
mutation=M_MORPH
New()
block=MORPHBLOCK
@@ -62,11 +62,29 @@
..(M)
M.verbs += /mob/living/carbon/human/proc/morph
/datum/dna/gene/basic/heat_resist
name="Heat Resistance"
activation_messages=list("Your skin is icy to the touch.")
mutation=M_RESIST_HEAT
New()
block=COLDBLOCK
can_activate(var/mob/M,var/flags)
// Probability check
var/_prob = 15
if(M_RESIST_COLD in M.mutations)
_prob=5
if(probinj(_prob,(flags&MUTCHK_FORCED)))
return 1
OnDrawUnderlays(var/mob/M,var/g,var/fat)
return "cold[fat]_s"
/datum/dna/gene/basic/cold_resist
name="Cold Resistance"
activation_messages=list("Your body is filled with warmth.")
mutation=COLD_RESISTANCE
mutation=M_RESIST_COLD
New()
block=FIREBLOCK
@@ -74,6 +92,8 @@
can_activate(var/mob/M,var/flags)
// Probability check
var/_prob=30
if(M_RESIST_HEAT in M.mutations)
_prob=5
if(probinj(_prob,(flags&MUTCHK_FORCED)))
return 1
@@ -83,7 +103,7 @@
/datum/dna/gene/basic/noprints
name="No Prints"
activation_messages=list("Your fingers feel numb.")
mutation=mFingerprints
mutation=M_FINGERPRINTS
New()
block=NOPRINTSBLOCK
@@ -91,7 +111,7 @@
/datum/dna/gene/basic/noshock
name="Shock Immunity"
activation_messages=list("Your skin feels strange.")
mutation=mShock
mutation=M_NO_SHOCK
New()
block=SHOCKIMMUNITYBLOCK
@@ -99,7 +119,7 @@
/datum/dna/gene/basic/midget
name="Midget"
activation_messages=list("Your skin feels rubbery.")
mutation=mSmallsize
mutation=M_DWARF
New()
block=SMALLSIZEBLOCK
@@ -124,7 +144,7 @@
can_activate(var/mob/M,var/flags)
// Can't be big and small.
if(mSmallsize in M.mutations)
if(M_DWARF in M.mutations)
return 0
return ..(M,flags)
@@ -155,7 +175,7 @@
/datum/dna/gene/basic/tk
name="Telekenesis"
activation_messages=list("You feel smarter.")
mutation=TK
mutation=M_TK
activation_prob=15
New()
code/game/gamemodes/setupgame.dm
+1
View File
@@ -49,6 +49,7 @@
INCREASERUNBLOCK = getAssignedBlock("INCREASERUN", numsToAssign, DNA_HARDER_BOUNDS)
REMOTETALKBLOCK = getAssignedBlock("REMOTETALK", numsToAssign, DNA_HARDER_BOUNDS)
MORPHBLOCK = getAssignedBlock("MORPH", numsToAssign, DNA_HARDER_BOUNDS)
COLDBLOCK = getAssignedBlock("COLD", numsToAssign)
HALLUCINATIONBLOCK = getAssignedBlock("HALLUCINATION", numsToAssign)
NOPRINTSBLOCK = getAssignedBlock("NOPRINTS", numsToAssign, DNA_HARD_BOUNDS)
SHOCKIMMUNITYBLOCK = getAssignedBlock("SHOCKIMMUNITY", numsToAssign)
code/game/machinery/wishgranter.dm
+9 -4
View File
@@ -48,14 +48,19 @@
user.see_in_dark = 8
user.see_invisible = SEE_INVISIBLE_LEVEL_TWO
if (!(COLD_RESISTANCE in user.mutations))
user.mutations.Add(COLD_RESISTANCE)
if (!(M_RESIST_COLD in user.mutations))
user.mutations.Add(M_RESIST_COLD)
if (!(TK in user.mutations))
user.mutations.Add(TK)
if (!(M_RESIST_HEAT in user.mutations))
user.mutations.Add(M_RESIST_HEAT)
if (!(M_TK in user.mutations))
user.mutations.Add(M_TK)
/* Not used
if(!(HEAL in user.mutations))
user.mutations.Add(HEAL)
*/
user.update_mutations()