From d121b740d1d60c5bdfc4b81801676e849c40f2c7 Mon Sep 17 00:00:00 2001 From: cib Date: Sat, 4 Feb 2012 11:59:46 -0800 Subject: [PATCH 1/6] Added Erthilo's bone gel and bone setter sprites. --- .../objects/items/weapons/surgery_tools.dm | 8 ++++---- icons/obj/surgery.dmi | Bin 7129 -> 8130 bytes 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index d0381bb464..f3521476c4 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -1106,8 +1106,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 @@ -1130,8 +1130,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/icons/obj/surgery.dmi b/icons/obj/surgery.dmi index 9a4f4fec1b338fccaa5a383231ecf317277050a2..a1fe77d1b63427b241ed331c7773c555450b48bb 100644 GIT binary patch literal 8130 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 literal 7129 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 From 35ae4bd5f392925cf5d692063e7a171e72ec2879 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Sun, 5 Feb 2012 01:07:57 -0500 Subject: [PATCH 2/6] turns out things broke from abi's runtime fix because that proc shouldn't ever be called here --- code/FEA/FEA_system.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/FEA/FEA_system.dm b/code/FEA/FEA_system.dm index 8189919da7..576bed173e 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) From 46d6cbdcd02b2d64dc322e6e03462929b827e318 Mon Sep 17 00:00:00 2001 From: Miniature Date: Sun, 5 Feb 2012 18:51:40 +1030 Subject: [PATCH 3/6] Fix for votes being none mode --- code/game/vote.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/vote.dm b/code/game/vote.dm index 54f52659c2..45176d7e8b 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]" From 34971bcd9990ecc1f2867d52ece2ab4d6017c83d Mon Sep 17 00:00:00 2001 From: Hawk-v3 Date: Sun, 5 Feb 2012 10:47:20 +0000 Subject: [PATCH 4/6] Should have fixed SUPERHEATED DOOM --- code/game/gamemodes/meteor/meteors.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index bad0d4a104..7c4a21676e 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,8 @@ /obj/effect/meteor/Move() var/turf/T = src.loc - if (istype(T, /turf)) - T.hotspot_expose(METEOR_TEMPERATURE, 1000) + /*if (istype(T, /turf)) + T.hotspot_expose(METEOR_TEMPERATURE, 1000) //FUCK YOU. FUCK YOU ALL. ~Hawk. */ ..() return From 36e51a9fd420667313cc78203ef90cc1dd2e0972 Mon Sep 17 00:00:00 2001 From: Hawk-v3 Date: Sun, 5 Feb 2012 13:04:03 +0000 Subject: [PATCH 5/6] ARGH METEORS --- code/game/gamemodes/meteor/meteors.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 7c4a21676e..e0273fb85f 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -97,8 +97,9 @@ /obj/effect/meteor/Move() var/turf/T = src.loc + //FUCK YOU. FUCK YOU ALL, METEORS. ~Hawk. /*if (istype(T, /turf)) - T.hotspot_expose(METEOR_TEMPERATURE, 1000) //FUCK YOU. FUCK YOU ALL. ~Hawk. */ + T.hotspot_expose(METEOR_TEMPERATURE, 1000) */ ..() return From ec77e9da196b1568d1d6fda3aa65b6eecdd4caa4 Mon Sep 17 00:00:00 2001 From: Albert Iordache Date: Sun, 5 Feb 2012 16:22:48 +0200 Subject: [PATCH 6/6] Revert "More fingerprint fixes" This reverts commit c11502eb531c6563a46a8b86a63cae4f7cb329c7 due to a bug where blood appears on objects when the blood_DNA variable is not null. --- code/WorkInProgress/detective_work.dm | 4 +--- code/defines/atom.dm | 2 +- code/game/magic/cultist/ritual.dm | 8 ++------ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/code/WorkInProgress/detective_work.dm b/code/WorkInProgress/detective_work.dm index c50e43b6c4..48e741c729 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 fde7511d3b..5db2913830 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/magic/cultist/ritual.dm b/code/game/magic/cultist/ritual.dm index 990fb85e4e..919c535d74 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")