cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 06:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolution.

Browse Source
This commit is contained in:
Zuhayr
2014-09-02 09:18:20 +09:30
parent 4e281fde44 6faad805d8
commit 53bee60a27
5 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm
View File

@@ -3,6 +3,7 @@
/datum/artifact_effect/cellcharge
effecttype = "cellcharge"
effect_type = 3
var/last_message
/datum/artifact_effect/cellcharge/DoEffectTouch(var/mob/user)
if(user)
@@ -21,10 +22,12 @@
B.charge += 25
for (var/obj/machinery/power/smes/S in range (src.effectrange,src))
S.charge += 25
for (var/mob/living/silicon/robot/M in mob_list)
for (var/mob/living/silicon/robot/M in range(50, T))
for (var/obj/item/weapon/cell/D in M.contents)
D.charge += 25
M << "\blue SYSTEM ALERT: Energy boost detected!"
if(world.time - last_message > 200)
M << "\blue SYSTEM ALERT: Energy boost detected!"
last_message = world.time
return 1
/datum/artifact_effect/cellcharge/DoEffectPulse()
@@ -35,8 +38,10 @@
B.charge += rand() * 100
for (var/obj/machinery/power/smes/S in range (src.effectrange,src))
S.charge += 250
for (var/mob/living/silicon/robot/M in mob_list)
for (var/mob/living/silicon/robot/M in range(100, T))
for (var/obj/item/weapon/cell/D in M.contents)
D.charge += rand() * 100
M << "\blue SYSTEM ALERT: Energy boost detected!"
if(world.time - last_message > 200)
M << "\blue SYSTEM ALERT: Energy boost detected!"
last_message = world.time
return 1

13
code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm
View File

@@ -3,6 +3,7 @@
/datum/artifact_effect/celldrain
effecttype = "celldrain"
effect_type = 3
var/last_message
/datum/artifact_effect/celldrain/DoEffectTouch(var/mob/user)
if(user)
@@ -23,10 +24,12 @@
B.charge = max(B.charge - 50,0)
for (var/obj/machinery/power/smes/S in range (src.effectrange,src))
S.charge = max(S.charge - 100,0)
for (var/mob/living/silicon/robot/M in mob_list)
for (var/mob/living/silicon/robot/M in range(50, T))
for (var/obj/item/weapon/cell/D in M.contents)
D.charge = max(D.charge - 50,0)
M << "\red SYSTEM ALERT: Energy drain detected!"
if(world.time - last_message > 200)
M << "\red SYSTEM ALERT: Energy drain detected!"
last_message = world.time
return 1
/datum/artifact_effect/celldrain/DoEffectPulse()
@@ -37,8 +40,10 @@
B.charge = max(B.charge - rand() * 150,0)
for (var/obj/machinery/power/smes/S in range (src.effectrange,src))
S.charge = max(S.charge - 250,0)
for (var/mob/living/silicon/robot/M in mob_list)
for (var/mob/living/silicon/robot/M in range(100, T))
for (var/obj/item/weapon/cell/D in M.contents)
D.charge = max(D.charge - rand() * 150,0)
M << "\red SYSTEM ALERT: Energy drain detected!"
if(world.time - last_message > 200)
M << "\red SYSTEM ALERT: Energy drain detected!"
last_message = world.time
return 1

8
code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm
View File

@@ -1,6 +1,7 @@
/datum/artifact_effect/roboheal
effecttype = "roboheal"
var/last_message
/datum/artifact_effect/roboheal/New()
..()
@@ -19,8 +20,9 @@
if(holder)
var/turf/T = get_turf(holder)
for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
if(prob(10))
if(world.time - last_message > 200)
M << "\blue SYSTEM ALERT: Beneficial energy field detected!"
last_message = world.time
M.adjustBruteLoss(-1)
M.adjustFireLoss(-1)
M.updatehealth()
@@ -30,7 +32,9 @@
if(holder)
var/turf/T = get_turf(holder)
for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
M << "\blue SYSTEM ALERT: Structural damage has been repaired by energy pulse!"
if(world.time - last_message > 200)
M << "\blue SYSTEM ALERT: Structural damage has been repaired by energy pulse!"
last_message = world.time
M.adjustBruteLoss(-10)
M.adjustFireLoss(-10)
M.updatehealth()

9
code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm
View File

@@ -1,6 +1,7 @@
/datum/artifact_effect/robohurt
effecttype = "robohurt"
var/last_message
/datum/artifact_effect/robohurt/New()
..()
@@ -19,7 +20,9 @@
if(holder)
var/turf/T = get_turf(holder)
for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
if(prob(10)) M << "\red SYSTEM ALERT: Harmful energy field detected!"
if(world.time - last_message > 200)
M << "\red SYSTEM ALERT: Harmful energy field detected!"
last_message = world.time
M.adjustBruteLoss(1)
M.adjustFireLoss(1)
M.updatehealth()
@@ -29,7 +32,9 @@
if(holder)
var/turf/T = get_turf(holder)
for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
M << "\red SYSTEM ALERT: Structural damage inflicted by energy pulse!"
if(world.time - last_message > 200)
M << "\red SYSTEM ALERT: Structural damage inflicted by energy pulse!"
last_message = world.time
M.adjustBruteLoss(10)
M.adjustFireLoss(10)
M.updatehealth()