cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Baystation12/Baystation12

Browse Source 
Conflicts:
	code/modules/research/xenoarchaeology/artifact_effect.dm
This commit is contained in:
Albert Iordache
2012-07-13 20:58:48 +03:00
parent dda09390ac b4c7e25d94
commit dd6c41ade1
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/research/xenoarchaeology/artifact_effect.dm
View File

@@ -201,7 +201,7 @@
else if (src.effectmode == "aura") else if (src.effectmode == "aura")
switch(src.effecttype) switch(src.effecttype)
if("healing") if("healing")
for (var/mob/living/carbon/human/M in range(src.aurarange,originator)) for (var/mob/living/carbon/M in range(src.aurarange,originator))
if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
continue continue
if(prob(10)) M << "\blue You feel a soothing energy radiating from something nearby." if(prob(10)) M << "\blue You feel a soothing energy radiating from something nearby."
@@ -213,8 +213,8 @@
M.updatehealth() M.updatehealth()
return 1 return 1
if("injure") if("injure")
for (var/mob/living/carbon/human/M in range(src.aurarange,originator)) for (var/mob/living/carbon/M in range(src.aurarange,originator))
if(istype(ishuman(M) && M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
continue continue
if(prob(10)) M << "\red You feel a painful force radiating from something nearby." if(prob(10)) M << "\red You feel a painful force radiating from something nearby."
M.adjustBruteLoss(1) M.adjustBruteLoss(1)
@@ -225,7 +225,7 @@
M.updatehealth() M.updatehealth()
return 1 return 1
/*if("stun") /*if("stun")
for (var/mob/living/carbon/human/M in range(src.aurarange,originator)) for (var/mob/living/carbon/M in range(src.aurarange,originator))
if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
continue continue
if(prob(10)) M << "\red Energy radiating from the [originator] is making you feel numb." if(prob(10)) M << "\red Energy radiating from the [originator] is making you feel numb."
@@ -289,7 +289,7 @@
O.show_message(text("<b>[]</b> emits a pulse of energy!", originator), 1) O.show_message(text("<b>[]</b> emits a pulse of energy!", originator), 1)
switch(src.effecttype) switch(src.effecttype)
if("healing") if("healing")
for (var/mob/living/carbon/human/M in range(src.aurarange,originator)) for (var/mob/living/carbon/M in range(src.aurarange,originator))
if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
continue continue
M << "\blue A wave of energy invigorates you." M << "\blue A wave of energy invigorates you."
@@ -301,7 +301,7 @@
M.updatehealth() M.updatehealth()
return 1 return 1
if("injure") if("injure")
for (var/mob/living/carbon/human/M in range(src.aurarange,originator)) for (var/mob/living/carbon/M in range(src.aurarange,originator))
if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
continue continue
M << "\red A wave of energy causes you great pain!" M << "\red A wave of energy causes you great pain!"
@@ -315,7 +315,7 @@
M.updatehealth() M.updatehealth()
return 1 return 1
/*if("stun") /*if("stun")
for (var/mob/living/carbon/human/M in range(src.aurarange,originator)) for (var/mob/living/carbon/M in range(src.aurarange,originator))
if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
continue continue
M << "\red A wave of energy overwhelms your senses!" M << "\red A wave of energy overwhelms your senses!"
@@ -392,7 +392,7 @@
O.show_message(text("<b>[]</b> emits a powerful burst of energy!", originator), 1) O.show_message(text("<b>[]</b> emits a powerful burst of energy!", originator), 1)
switch(src.effecttype) switch(src.effecttype)
if("healing") if("healing")
for (var/mob/living/carbon/human/M in world) for (var/mob/living/carbon/M in world)
if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
continue continue
M << "\blue Waves of soothing energy wash over you." M << "\blue Waves of soothing energy wash over you."
@@ -414,7 +414,7 @@
M.updatehealth() M.updatehealth()
return 1 return 1
/*if("stun") /*if("stun")
for (var/mob/living/carbon/human/M in world) for (var/mob/living/carbon/M in world)
if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
continue continue
M << "\red A powerful force causes you to black out momentarily." M << "\red A powerful force causes you to black out momentarily."