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

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

Browse Source
This commit is contained in:
caelaislinn
2012-06-14 22:52:33 +10:00
parent 3f19d356d6 a278b7c29f
commit 16eabd55ea
10 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/devices/PDA/cart.dm
+3 -3
View File
@@ -612,9 +612,9 @@ Code:
blood[main_blood] = A.blood_DNA[blood]
return 1
var/list/sum_list[4] //Pack it back up!
sum_list[1] = A.fingerprints
sum_list[2] = A.suit_fibers
sum_list[3] = A.blood_DNA
sum_list[1] = A.fingerprints.Copy()
sum_list[2] = A.suit_fibers.Copy()
sum_list[3] = A.blood_DNA.Copy()
sum_list[4] = "\The [A] in \the [get_area(A)]"
stored_data["\ref [A]"] = sum_list
return 0
code/game/objects/explosion.dm
+2
View File
@@ -2,6 +2,8 @@ var/roundExplosions = 1
proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1)
if(!epicenter) return
var/log_file = file("[time2text(world.timeofday, "statistics/DD-MM-YYYY.txt")]")
log_file << "Explosion | \The [get_area(epicenter)] | [devastation_range], [heavy_impact_range], [light_impact_range], [flash_range]"
spawn(0)
if(defer_powernet_rebuild != 2)
defer_powernet_rebuild = 1