diff --git a/code/FEA/FEA_system.dm b/code/FEA/FEA_system.dm index 8189919da78..576bed173ee 100644 --- a/code/FEA/FEA_system.dm +++ b/code/FEA/FEA_system.dm @@ -329,8 +329,8 @@ datum AG.process_group() process_singletons() - for(var/turf/simulated/T in active_singletons) - T.process_cell() + //for(var/turf/simulated/T in active_singletons) // this code shouldn't actually exist in the current version of FEA apparently, + // T.process_cell() // causes horrible gas variable glitching process_super_conductivity() for(var/turf/simulated/hot_potato in active_super_conductivity) diff --git a/code/WorkInProgress/detective_work.dm b/code/WorkInProgress/detective_work.dm index c50e43b6c4a..48e741c7295 100644 --- a/code/WorkInProgress/detective_work.dm +++ b/code/WorkInProgress/detective_work.dm @@ -718,9 +718,7 @@ turf/proc/add_bloody_footprints(mob/living/carbon/human/M,leaving,d,info) this.blood_DNA.len++ this.blood_DNA[this.blood_DNA.len] = list(M.dna.unique_enzymes,M.dna.b_type) else - var/list/blood_DNA_temp[1] - blood_DNA_temp[1] = list(M.dna.unique_enzymes, M.dna.b_type) - this.blood_DNA = blood_DNA_temp + this.blood_DNA = list(list(M.dna.unique_enzymes,M.dna.b_type)) proc/get_tracks(mob/M) if(istype(M,/mob/living)) diff --git a/code/defines/atom.dm b/code/defines/atom.dm index fde7511d3bb..5db2913830a 100644 --- a/code/defines/atom.dm +++ b/code/defines/atom.dm @@ -5,7 +5,7 @@ var/list/fingerprints = list() var/list/fingerprintshidden = new/list() var/fingerprintslast = null - var/list/blood_DNA = list() + var/list/blood_DNA = null var/last_bumped = 0 var/pass_flags = 0 diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index bad0d4a1043..e0273fb85fd 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -3,8 +3,8 @@ /var/const/meteor_wave_delay = 625 //minimum wait between waves in tenths of seconds //set to at least 100 unless you want evarr ruining every round -/var/const/meteors_in_wave = 20 -/var/const/meteors_in_small_wave = 10 +/var/const/meteors_in_wave = 10 //THIS should be better, Spess. +/var/const/meteors_in_small_wave = 4 /proc/meteor_wave(var/number = meteors_in_wave) if(!ticker || wavesecret) @@ -97,8 +97,9 @@ /obj/effect/meteor/Move() var/turf/T = src.loc - if (istype(T, /turf)) - T.hotspot_expose(METEOR_TEMPERATURE, 1000) + //FUCK YOU. FUCK YOU ALL, METEORS. ~Hawk. + /*if (istype(T, /turf)) + T.hotspot_expose(METEOR_TEMPERATURE, 1000) */ ..() return diff --git a/code/game/magic/cultist/ritual.dm b/code/game/magic/cultist/ritual.dm index 990fb85e4e2..919c535d74d 100644 --- a/code/game/magic/cultist/ritual.dm +++ b/code/game/magic/cultist/ritual.dm @@ -559,9 +559,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", R.blood_DNA.len++ R.blood_DNA[R.blood_DNA.len] = list(H.dna.unique_enzymes, H.dna.b_type) else - var/list/blood_DNA_temp[1] - blood_DNA_temp[1] = list(H.dna.unique_enzymes, H.dna.b_type) - R.blood_DNA = blood_DNA_temp + R.blood_DNA = list(list(H.dna.unique_enzymes, H.dna.b_type)) return else user << "The book seems full of illegible scribbles. Is this a joke?" @@ -606,9 +604,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", var/obj/effect/rune/R = new /obj/effect/rune if(istype(user, /mob/living/carbon/human)) var/mob/living/carbon/human/H = user - var/list/blood_DNA_temp[1] - blood_DNA_temp[1] = list(H.dna.unique_enzymes, H.dna.b_type) - R.blood_DNA = blood_DNA_temp + R.blood_DNA = list(list(H.dna.unique_enzymes, H.dna.b_type)) switch(r) if("teleport") var/list/words = list("ire", "ego", "nahlizet", "certum", "veri", "jatkaa", "balaq", "mgar", "karazet", "geeri") diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index bedcbf3f3d5..a02524ceae0 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -1130,8 +1130,8 @@ CIRCULAR SAW /obj/item/weapon/surgical_tool/bonegel name = "bone gel" - icon = 'janitor.dmi' - icon_state = "cleaner" + icon = 'surgery.dmi' + icon_state = "bone gel" /obj/item/weapon/surgical_tool/bonegel/New() stage += 0 @@ -1154,8 +1154,8 @@ CIRCULAR SAW /obj/item/weapon/surgical_tool/bonesetter name = "bone setter" - icon = 'items.dmi' - icon_state = "wrench" + icon = 'surgery.dmi' + icon_state = "bone setter" /obj/item/weapon/surgical_tool/bonesetter/New() stage += 1 diff --git a/code/game/vote.dm b/code/game/vote.dm index 54f52659c23..45176d7e8bb 100644 --- a/code/game/vote.dm +++ b/code/game/vote.dm @@ -56,11 +56,11 @@ M << browse(null, "window=vote") M.client.showvote = 0 + calcwin() + if(winner == "none") winner = "default" - calcwin() - if(mode == 2) var/wintext = capitalize(winner) world << "Result is [wintext]" diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi index 9a4f4fec1b3..a1fe77d1b63 100644 Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ