cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +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/modules/power/lighting.dm
+4 -4
View File
@@ -386,7 +386,7 @@
continue
M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2)
if(on && (W.flags & CONDUCT))
//if(!user.mutations & COLD_RESISTANCE)
//if(!user.mutations & M_RESIST_COLD)
if (prob(12))
electrocute_mob(user, get_area(src), src, 0.3)
broken()
@@ -422,7 +422,7 @@
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
//if(!user.mutations & COLD_RESISTANCE)
//if(!user.mutations & M_RESIST_COLD)
if (prob(75))
electrocute_mob(user, get_area(src), src, rand(0.7,1.0))
@@ -498,9 +498,9 @@
else
prot = 1
if(prot > 0 || (COLD_RESISTANCE in user.mutations))
if(prot > 0 || (M_RESIST_HEAT in user.mutations))
user << "You remove the light [fitting]"
else if(TK in user.mutations)
else if(M_TK in user.mutations)
user << "You telekinetically remove the light [fitting]."
else
user << "You try to remove the light [fitting], but it's too hot and you don't want to burn your hand."