From b11408e367b56d519690c57b19ff1ce980176acc Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 20 Jun 2014 19:37:12 +0930 Subject: [PATCH 1/5] Less shitty undershirt sprites. --- icons/mob/human.dmi | Bin 12474 -> 12438 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/human.dmi b/icons/mob/human.dmi index cb21e0f5021a4ecb2b7a99c0b3bf638e1a57ad0b..c867b0d88623bc8fb25b3b7e137ab9bab97e20ad 100644 GIT binary patch literal 12438 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 From 90e08a15b3d089f1362780f12570aa5ea9f626aa Mon Sep 17 00:00:00 2001 From: Jarcolr Date: Fri, 20 Jun 2014 23:20:45 +0300 Subject: [PATCH 2/5] Fixes #5283 and #5315 All it took was some fancy switches. --- code/game/jobs/job/civilian.dm | 12 ++++++------ code/game/jobs/job/medical.dm | 32 +++++++++++++++++------------- code/game/jobs/job/science.dm | 36 +++++++++++++++++----------------- 3 files changed, 42 insertions(+), 38 deletions(-) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index d8192c5096e..2ed73f8a9d0 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -91,12 +91,12 @@ H.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/device/analyzer/plant_analyzer(H), slot_s_store) H.equip_to_slot_or_del(new /obj/item/device/pda/botanist(H), slot_belt) - if(H.backbag == 3) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_hyd(H), slot_back) - else if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + switch(H.backbag) + if(1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) + if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_hyd(H), slot_back) + if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index d8a60f7b128..0eccf03f3c5 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -71,8 +71,12 @@ H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/virologist(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), slot_wear_mask) - if(H.backbag == 3) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_vir(H), slot_back) + switch(H.backbag) + if(1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) + if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_tox(H), slot_back) + if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) if("Medical Doctor") H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit) @@ -122,12 +126,12 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/chemist(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/chemist(H), slot_wear_suit) - if(H.backbag == 3) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_chem(H), slot_back) - else if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + switch(H.backbag) + if(1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) + if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_chem(H), slot_back) + if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 @@ -153,12 +157,12 @@ H.equip_to_slot_or_del(new /obj/item/device/pda/geneticist(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/genetics(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(H), slot_s_store) - if(H.backbag == 3) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_gen(H), slot_back) - else if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + switch(H.backbag) + if(1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) + if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_gen(H), slot_back) + if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 /*/datum/job/virologist diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 385b3fadbc3..60e30c085d3 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -27,12 +27,12 @@ H.equip_to_slot_or_del(new /obj/item/device/pda/heads/rd(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/weapon/clipboard(H), slot_l_hand) - if(H.backbag == 3) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_tox(H), slot_back) - else if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + switch(H.backbag) + if(1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) + if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_tox(H), slot_back) + if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 @@ -57,12 +57,12 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/science(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/science(H), slot_wear_suit) - if(H.backbag == 3) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_tox(H), slot_back) - else if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + switch(H.backbag) + if(1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) + if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_tox(H), slot_back) + if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 @@ -86,12 +86,12 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/science(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/science(H), slot_wear_suit) - if(H.backbag == 3) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_tox(H), slot_back) - else if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + switch(H.backbag) + if(1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) + if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_tox(H), slot_back) + if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 From b7832f862a91be89150c0b2c7af792dd3d61619e Mon Sep 17 00:00:00 2001 From: Chinsky Date: Sat, 21 Jun 2014 00:58:31 +0400 Subject: [PATCH 3/5] Fixes #5311 --- code/game/objects/structures/mineral_doors.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 38f0563897d..6bcdc7beb37 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -82,6 +82,7 @@ state = 1 update_icon() isSwitchingStates = 0 + update_nearby_tiles() proc/Close() isSwitchingStates = 1 @@ -93,6 +94,7 @@ state = 0 update_icon() isSwitchingStates = 0 + update_nearby_tiles() update_icon() if(state) From 3f9fbc680bd71c1c166a0aca782c58e40256c11d Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sat, 21 Jun 2014 02:07:47 -0400 Subject: [PATCH 4/5] Fixes #5299 --- code/modules/mob/living/carbon/monkey/diona.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/monkey/diona.dm b/code/modules/mob/living/carbon/monkey/diona.dm index cf1ea1ccb6a..0c1b16e72ad 100644 --- a/code/modules/mob/living/carbon/monkey/diona.dm +++ b/code/modules/mob/living/carbon/monkey/diona.dm @@ -207,7 +207,7 @@ src.visible_message("\red [src] flicks out a feeler and neatly steals a sample of [M]'s blood.","\red You flick out a feeler and neatly steal a sample of [M]'s blood.") donors += M.real_name for(var/datum/language/L in M.languages) - languages += L + languages |= L spawn(25) update_progression() From 15536d27a4a89e44c9e3035c7445097a7d2df29c Mon Sep 17 00:00:00 2001 From: Chinsky Date: Sat, 21 Jun 2014 17:52:59 +0400 Subject: [PATCH 5/5] Fixes #5264 Viruses are properly transferred to spilled blood now. Antigens prevent from infection properly. Lowered frequency of blood puddle virus check to cut down on processing. --- code/game/turfs/simulated.dm | 4 +++ code/modules/mob/living/carbon/human/life.dm | 32 ++++++++++---------- code/modules/organs/blood.dm | 3 ++ code/modules/reagents/Chemistry-Reagents.dm | 16 +++++++--- code/modules/virus2/helpers.dm | 3 +- 5 files changed, 37 insertions(+), 21 deletions(-) diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index dd70ad37eae..b62c32b81ab 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -144,8 +144,11 @@ for(var/obj/effect/decal/cleanable/blood/B in contents) if(!B.blood_DNA[M.dna.unique_enzymes]) B.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type + B.virus2 = virus_copylist(M.virus2) return 1 //we bloodied the floor + + //if there isn't a blood decal already, make one. var/obj/effect/decal/cleanable/blood/newblood = new /obj/effect/decal/cleanable/blood(src) @@ -156,6 +159,7 @@ newblood.basecolor = "#A10808" newblood.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type + newblood.virus2 = virus_copylist(M.virus2) newblood.update_icon() return 1 //we bloodied the floor diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 2bec7cc7e3e..cf39160aad8 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -308,11 +308,11 @@ var/datum/gas_mixture/environment = loc.return_air() var/datum/gas_mixture/breath - + // HACK NEED CHANGING LATER if(health < config.health_threshold_crit && !reagents.has_reagent("inaprovaline")) losebreath++ - + if(losebreath>0) //Suffocating so do not take a breath losebreath-- if (prob(10)) //Gasp per 10 ticks? Sounds about right. @@ -1487,21 +1487,21 @@ for (var/ID in virus2) var/datum/disease2/disease/V = virus2[ID] V.cure(src) + if(life_tick % 3) //don't spam checks over all objects in view every tick. + for(var/obj/effect/decal/cleanable/O in view(1,src)) + if(istype(O,/obj/effect/decal/cleanable/blood)) + var/obj/effect/decal/cleanable/blood/B = O + if(B.virus2.len) + for (var/ID in B.virus2) + var/datum/disease2/disease/V = B.virus2[ID] + infect_virus2(src,V.getcopy()) - for(var/obj/effect/decal/cleanable/O in view(1,src)) - if(istype(O,/obj/effect/decal/cleanable/blood)) - var/obj/effect/decal/cleanable/blood/B = O - if(B.virus2.len) - for (var/ID in B.virus2) - var/datum/disease2/disease/V = B.virus2[ID] - infect_virus2(src,V) - - else if(istype(O,/obj/effect/decal/cleanable/mucus)) - var/obj/effect/decal/cleanable/mucus/M = O - if(M.virus2.len) - for (var/ID in M.virus2) - var/datum/disease2/disease/V = M.virus2[ID] - infect_virus2(src,V) + else if(istype(O,/obj/effect/decal/cleanable/mucus)) + var/obj/effect/decal/cleanable/mucus/M = O + if(M.virus2.len) + for (var/ID in M.virus2) + var/datum/disease2/disease/V = M.virus2[ID] + infect_virus2(src,V.getcopy()) if(virus2.len) diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index c100e747259..e9f1563c153 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -159,6 +159,9 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 this.icon_state = pick(iconL) this.blood_DNA = list() this.blood_DNA[dna.unique_enzymes] = dna.b_type + for (var/ID in virus2) + var/datum/disease2/disease/V = virus2[ID] + this.virus2[ID] = V.getcopy() if (species) this.basecolor = species.blood_color this.update_icon() diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 70e442a73da..fc2f420c0e6 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -118,10 +118,15 @@ datum else //injected M.contract_disease(D, 1, 0) if(self.data && self.data["virus2"] && istype(M, /mob/living/carbon))//infecting... - if(method == TOUCH) - infect_virus2(M,self.data["virus2"]) - else - infect_virus2(M,self.data["virus2"],1) //injected, force infection! + var/list/vlist = self.data["virus2"] + if (vlist.len) + for (var/ID in vlist) + var/datum/disease2/disease/V = vlist[ID] + + if(method == TOUCH) + infect_virus2(M,V.getcopy()) + else + infect_virus2(M,V.getcopy(),1) //injected, force infection! if(self.data && self.data["antibodies"] && istype(M, /mob/living/carbon))//... and curing var/mob/living/carbon/C = M C.antibodies |= self.data["antibodies"] @@ -146,6 +151,9 @@ datum blood_prop.viruses += newVirus newVirus.holder = blood_prop + if(self.data["virus2"]) + blood_prop.virus2 = virus_copylist(self.data["virus2"]) + else if(istype(self.data["donor"], /mob/living/carbon/monkey)) var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T diff --git a/code/modules/virus2/helpers.dm b/code/modules/virus2/helpers.dm index 93acbd6ef41..6118dade42e 100644 --- a/code/modules/virus2/helpers.dm +++ b/code/modules/virus2/helpers.dm @@ -68,10 +68,11 @@ proc/airborne_can_reach(turf/source, turf/target) if ("[disease.uniqueID]" in M.virus2) return // if one of the antibodies in the mob's body matches one of the disease's antigens, don't infect - if(M.antibodies & disease.antigen != 0) + if((M.antibodies & disease.antigen) != 0) return if(M.reagents.has_reagent("spaceacillin")) return + if(istype(M,/mob/living/carbon/monkey)) var/mob/living/carbon/monkey/chimp = M if (!(chimp.greaterform in disease.affected_species))