From eb493785759c637546d1f43b99cf58cfb6394e61 Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 11 Nov 2012 18:15:12 +0100 Subject: [PATCH 1/7] Added genetic side effects. --- baystation12.dme | 3 + code/defines/obj/weapon.dm | 13 ++++ .../objects/items/weapons/dna_injector.dm | 2 + code/modules/genetics/side_effects.dm | 72 +++++++++++++++++++ maps/tgstation.2.0.9.1.dmm | 16 ++--- 5 files changed, 98 insertions(+), 8 deletions(-) create mode 100644 code/modules/genetics/side_effects.dm diff --git a/baystation12.dme b/baystation12.dme index 5c481cc856f..63f55fe3b3b 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -131,6 +131,7 @@ #define FILE_DIR "code/modules/DetectiveWork" #define FILE_DIR "code/modules/flufftext" #define FILE_DIR "code/modules/food" +#define FILE_DIR "code/modules/genetics" #define FILE_DIR "code/modules/icon generation" #define FILE_DIR "code/modules/library" #define FILE_DIR "code/modules/liquid" @@ -251,6 +252,7 @@ #define FILE_DIR "icons/vending_icons" #define FILE_DIR "interface" #define FILE_DIR "maps" +#define FILE_DIR "maps/backup" #define FILE_DIR "maps/RandomZLevels" #define FILE_DIR "sound" #define FILE_DIR "sound/AI" @@ -983,6 +985,7 @@ #include "code\modules\flufftext\Hallucination.dm" #include "code\modules\flufftext\TextFilters.dm" #include "code\modules\food\recipes_microwave.dm" +#include "code\modules\genetics\side_effects.dm" #include "code\modules\library\lib_items.dm" #include "code\modules\library\lib_machines.dm" #include "code\modules\library\lib_readme.dm" diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index dbe2d89d519..dbdff2bc7e7 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -1063,6 +1063,19 @@ name = "paper- 'Standard Operating Procedure'" info = "Alert Levels:
\nBlue- Emergency
\n\t1. Caused by fire
\n\t2. Caused by manual interaction
\n\tAction:
\n\t\tClose all fire doors. These can only be opened by reseting the alarm
\nRed- Ejection/Self Destruct
\n\t1. Caused by module operating computer.
\n\tAction:
\n\t\tAfter the specified time the module will eject completely.
\n
\nEngine Maintenance Instructions:
\n\tShut off ignition systems:
\n\tActivate internal power
\n\tActivate orbital balance matrix
\n\tRemove volatile liquids from area
\n\tWear a fire suit
\n
\n\tAfter
\n\t\tDecontaminate
\n\t\tVisit medical examiner
\n
\nToxin Laboratory Procedure:
\n\tWear a gas mask regardless
\n\tGet an oxygen tank.
\n\tActivate internal atmosphere
\n
\n\tAfter
\n\t\tDecontaminate
\n\t\tVisit medical examiner
\n
\nDisaster Procedure:
\n\tFire:
\n\t\tActivate sector fire alarm.
\n\t\tMove to a safe area.
\n\t\tGet a fire suit
\n\t\tAfter:
\n\t\t\tAssess Damage
\n\t\t\tRepair damages
\n\t\t\tIf needed, Evacuate
\n\tMeteor Shower:
\n\t\tActivate fire alarm
\n\t\tMove to the back of ship
\n\t\tAfter
\n\t\t\tRepair damage
\n\t\t\tIf needed, Evacuate
\n\tAccidental Reentry:
\n\t\tActivate fire alrms in front of ship.
\n\t\tMove volatile matter to a fire proof area!
\n\t\tGet a fire suit.
\n\t\tStay secure until an emergency ship arrives.
\n
\n\t\tIf ship does not arrive-
\n\t\t\tEvacuate to a nearby safe area!" +/obj/item/weapon/paper/genetics_side_effects + name = "paper - 'Genetical Side-Effects and Treatments'" + + New() + ..() + for(var/tp in list(typesof(/datum/genetics/side_effect) - /datum/genetics/side_effect)) + var/datum/genetics/side_effect/S = new tp + info += "Name:\t [S.name]
" + info += "Symptom:\t [S.symptom]
" + info += "Treatment:\t [S.treatment]
" + info += "Effect:\t [S.effect]
" + info += "
" + /obj/item/weapon/banhammer desc = "A banhammer" name = "banhammer" diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index fcf82f250a1..faba5dd8171 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -51,6 +51,8 @@ M.dna.struc_enzymes = setblock(M.dna.struc_enzymes,block,dna,3) domutcheck(M, null,1) uses-- + if(prob(5)) + trigger_side_effect(M) spawn(0)//this prevents the collapse of space-time continuum user.drop_from_inventory(src) diff --git a/code/modules/genetics/side_effects.dm b/code/modules/genetics/side_effects.dm new file mode 100644 index 00000000000..71f32aec440 --- /dev/null +++ b/code/modules/genetics/side_effects.dm @@ -0,0 +1,72 @@ +/datum/genetics/side_effect + var/name // name of the side effect, to use as a header in the manual + var/symptom // description of the symptom of the side effect + var/treatment // description of the treatment of the side effect + var/effect // description of what happens when not treated + var/duration = 0 // delay between start() and finish() + + proc/start(mob/living/carbon/human/H) + // start the side effect, this should give some cue as to what's happening, + // such as gasping. These cues need to be unique among side-effects. + + proc/finish(mob/living/carbon/human/H) + // Finish the side-effect. This should first check whether the cure has been + // applied, and if not, cause bad things to happen. + +/datum/genetics/side_effect/genetic_burn + name = "Genetic Burn" + symptom = "Subject's skin turns unusualy red." + treatment = "Inject small dose of dexalin." + effect = "Subject's skin burns." + duration = 10*30 + + start(mob/living/carbon/human/H) + H.emote("me", 1, "starts turning very red..") + + finish(mob/living/carbon/human/H) + if(!H.reagents.has_reagent("dexalin")) + for(var/organ_name in list("chest","l_arm","r_arm","r_leg","l_leg","head","groin")) + var/datum/organ/external/E = H.get_organ(organ_name) + E.take_damage(0, 5, 0) + +/datum/genetics/side_effect/bone_snap + name = "Bone Snap" + symptom = "Subject's limbs tremble notably." + treatment = "Inject small dose of bicaridine." + effect = "Subject's bone breaks." + duration = 10*60 + + start(mob/living/carbon/human/H) + H.emote("me", 1, "'s limbs start shivering uncontrollably.") + + finish(mob/living/carbon/human/H) + if(!H.reagents.has_reagent("bicaridine")) + var/organ_name = pick("chest","l_arm","r_arm","r_leg","l_leg","head","groin") + var/datum/organ/external/E = H.get_organ(organ_name) + E.take_damage(20, 0, 0) + E.fracture() + +/datum/genetics/side_effect/monkey + name = "Monkey" + symptom = "Subject starts drooling uncontrollably." + treatment = "Inject small dose of dylovene." + effect = "Subject turns into monkey." + duration = 10*90 + + start(mob/living/carbon/human/H) + H.emote("me", 1, "has drool running down from his mouth.") + + finish(mob/living/carbon/human/H) + if(!H.reagents.has_reagent("anti_toxin")) + H.monkeyize() + +proc/trigger_side_effect(mob/living/carbon/human/H) + var/tp = pick(typesof(/datum/genetics/side_effect) - /datum/genetics/side_effect) + var/datum/genetics/side_effect/S = new tp + + S.start(H) + spawn(20) + H.Weaken(S.duration) + sleep(S.duration) + H.SetWeakened(0) + S.finish(H) \ No newline at end of file diff --git a/maps/tgstation.2.0.9.1.dmm b/maps/tgstation.2.0.9.1.dmm index 66451d6de2a..ad777ed68bb 100644 --- a/maps/tgstation.2.0.9.1.dmm +++ b/maps/tgstation.2.0.9.1.dmm @@ -3741,7 +3741,7 @@ "btW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "btX" = (/obj/structure/stool/bed/roller,/turf/simulated/floor{tag = "icon-whitehall (WEST)"; icon_state = "whitehall"; dir = 8},/area/medical/medbay) "btY" = (/turf/simulated/wall/r_wall,/area/medical/genetics) -"btZ" = (/obj/structure/table,/obj/item/device/flashlight/pen{pixel_x = 4; pixel_y = 3},/obj/item/device/flashlight/pen{pixel_x = 0},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/medical/genetics) +"btZ" = (/obj/machinery/alarm{pixel_y = 24},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/hallway/secondary/entry) "bua" = (/obj/machinery/light_switch{pixel_y = 28},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "bub" = (/obj/machinery/light{dir = 1},/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/turf/simulated/floor{tag = "icon-whitehall (WEST)"; icon_state = "whitehall"; dir = 8},/area/medical/genetics) "buc" = (/obj/machinery/dna_scannernew,/turf/simulated/floor,/area/medical/genetics) @@ -4253,7 +4253,7 @@ "bDO" = (/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 7; pixel_y = 1},/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 4; pixel_y = -6},/obj/structure/table,/turf/simulated/floor,/area/medical/cryo) "bDP" = (/obj/machinery/atmospherics/unary/cryo_cell,/turf/simulated/floor,/area/medical/cryo) "bDQ" = (/obj/structure/closet/wardrobe/pjs,/turf/simulated/floor,/area/medical/cryo) -"bDR" = (/obj/machinery/camera{c_tag = "Genetics Cloning"; dir = 4; network = "SS13"},/obj/structure/table,/obj/item/weapon/book/manual/medical_cloning{pixel_y = 6},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) +"bDR" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{pixel_x = 7; pixel_y = -3},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = -4; pixel_y = -3},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 3; pixel_y = -2},/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/toxin{pixel_x = 4; pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 5; pixel_y = -2},/obj/item/weapon/storage/pill_bottle/tramadol,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bDS" = (/obj/effect/landmark/start{name = "Geneticist"},/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "bDT" = (/obj/machinery/computer/cloning,/turf/simulated/floor,/area/medical/genetics) "bDU" = (/turf/simulated/wall/r_wall,/area/crew_quarters/hor) @@ -4597,7 +4597,7 @@ "bKu" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bKv" = (/obj/structure/closet/secure_closet/medical3,/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/medical/medbay) "bKw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"bKx" = (/obj/machinery/alarm{pixel_y = 24},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/hallway/secondary/entry) +"bKx" = (/obj/machinery/camera{c_tag = "Genetics Cloning"; dir = 4; network = "SS13"},/obj/structure/table,/obj/item/weapon/book/manual/medical_cloning{pixel_y = 6},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/item/weapon/paper/genetics_side_effects,/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "bKy" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/medical/medbay) "bKz" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bKA" = (/obj/machinery/atmospherics/pipe/manifold{dir = 8; icon_state = "manifold"; level = 2},/turf/simulated/floor{icon_state = "white"},/area/medical/cryo) @@ -5158,7 +5158,7 @@ "bVj" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 1; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/atmos) "bVk" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/turf/simulated/floor/plating,/area/atmos) "bVl" = (/obj/structure/closet/firecloset,/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/atmos) -"bVm" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{pixel_x = 7; pixel_y = -3},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = -4; pixel_y = -3},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 3; pixel_y = -2},/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/toxin{pixel_x = 4; pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 5; pixel_y = -2},/obj/item/weapon/storage/pill_bottle/tramadol,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"bVm" = (/obj/structure/table,/obj/item/device/flashlight/pen{pixel_x = 4; pixel_y = 3},/obj/item/device/flashlight/pen{pixel_x = 0},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/item/weapon/reagent_containers/pill/antitox,/obj/item/weapon/reagent_containers/pill/antitox,/obj/item/weapon/reagent_containers/pill/bicaridine,/obj/item/weapon/reagent_containers/pill/bicaridine,/obj/item/weapon/reagent_containers/pill/dexalin,/obj/item/weapon/reagent_containers/pill/dexalin,/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/medical/genetics) "bVn" = (/obj/machinery/atmospherics/portables_connector{dir = 8},/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/atmos) "bVo" = (/obj/machinery/atmospherics/pipe/manifold{color = "yellow"; dir = 8; icon_state = "manifold-y"; level = 2},/turf/simulated/floor,/area/atmos) "bVp" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; icon_state = "intact-g"; level = 2},/obj/machinery/atmospherics/binary/pump{dir = 8; icon_state = "intact_off"; name = "Plasma to Pure"; on = 0},/turf/simulated/floor,/area/atmos) @@ -9071,7 +9071,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaraarbarcardaraarearfargaraapFapFapFarhariarjarkarlaqpaaaaaaajXaaaamIamIamIamIamIaafamraafamIamIamIamIamIaaaajlaaaaaaaaaaaaaaaaaaaaaaaaarmarmarnarmarmaaaaaaaafaafaagaagaagaroarparoanTarqarrarsaorartaruarvanVanUanZanZarwarxaryarzarAarBarCarDajUarEarFaqHarFapVaqJaqKapVapVarGapVapVapVarHapVapxarIarJarKarLarMarNaqUarOarPapzapzapzapzapzarQarRarSarTaaaaaaajmaaaaafaaaaafaafaaaaaaamkaaaaaaaafaaaaaaaafaaaajlaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaraarUarVarWaraarUarVarWaraarXarYarZarZarZarZasaasbaoYaaaaaaajlaaaaafaaaaafaafaaaaaaascaaaaaaaafaaaaaaaafaaaajlaafaaaaaaaaaaaaaaaaaaaaaasdaseasfasgasdaaaaaaaafaafaagaagaagamvamvamvamvashasiasjasjaskasjasjasjaslasmasnasoasnaspasqasramSassairastapnasuaqHasvapVaswasxasyaszasAasAasBasCasAasDasEasFarJasGasHasIasJasKasLasMapzapzapzapzapzasMasNasOasPaaaaaaajmajmajlaaaaaaaafaaaaaaamkaaaaafaafaafaafajlajlajlaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaqmaraasQasRaqmaraasQasRaqmaqpasSaqpaqpaqpaqpaqpasTapGaaaaaaajlajlajlaaaaaaaafaaaasUasVasUaafaafaafaafajlajlajlaafaafaaaaaaaafaaaaaaaaaasWasXasYasZataaaaamvamvatbatcatdamvamvateatfatgathatiatiatiatjatiatiatkatlatiatiatmatnatnatoatpatqatranpatsaqEattatuaqHatvaqJatwatwatxatyatzatAatxatwatwatBatCatDasGasHasIasJasKatEatFapzapzapzapzapzatFatGasOasPaaaaaaaaaaaaaafaafaaaaafaaaaaaatHaaaaaaaafaaaaaaaafaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatIatJatJatJatKbKxatJatJatLatMatNatOatOatOatOaqpatPapGaaaaafaafaaaaaaaaaaaaaafaaaatQatRatSaafaaaaafaaaaaaaaaaaaaaaaafaafaaaaafaafatTatUatVatWatXatWatYatZatTauaaubaubaubaubaubaubaucaudaueaufaufaufaugaufaufaufaufaufaufaufaufaufaufauhauiaujaukaularEapVapVapVapVaumaunatwatxatzauoatzaupauqaurausautaqRauuauvauwauxauyauzauAapzapzapzapzapzauBauCauDauEaaaaaaaaaaaaaaaaafaaaaafaaaauFauGauFaaaaafaaaaaaaafaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatIatJatJatJatKbtZatJatJatLatMatNatOatOatOatOaqpatPapGaaaaafaafaaaaaaaaaaaaaafaaaatQatRatSaafaaaaafaaaaaaaaaaaaaaaaafaafaaaaafaafatTatUatVatWatXatWatYatZatTauaaubaubaubaubaubaubaucaudaueaufaufaufaugaufaufaufaufaufaufaufaufaufaufauhauiaujaukaularEapVapVapVapVaumaunatwatxatzauoatzaupauqaurausautaqRauuauvauwauxauyauzauAapzapzapzapzapzauBauCauDauEaaaaaaaaaaaaaaaaafaaaaafaaaauFauGauFaaaaafaaaaaaaafaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauHauIatOauJauKatOatOauLauJatOauMauNauOauOauPaqpatPauQaafaafaaaaaaaaaaaaaaaaafauRauSauTauUauVaaaaafaaaaaaaaaaaaaqpaqpaqpaqpaqpaqpatTauWauXauYauZavaavbavcatTavdaveaveaveaveaveaveaveavfavgaufavhaviavjavkavlavmavnavoavpavqavravsaufavtamSavuairavvapnasuarFavwapVaqJavxavyaurauravzavAavBavCavDasEavEavFavGavHavIavJavKavLavMapzapzapzapzapzavNapxapxapxaaaaaaaaaaaaaafaafaafaafaaaavOavPavQaaaaafaaaaaaaafaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaraatIavRatIavSatOatOavTatIavRatIavUauIauKavVaqpavWaqpaqpavXaqsaqsaqsaqsaqtaqpavYavZawaawbavYaqpaqpavXaqsawcaqpaqparlawdaweapFawfatTauZauZauZawgauZawhauZatTavdaveawiawjawkawlawiaveavfanrawmawnawoawpawqawrawrawsawtawuawvawvawwawxavtamSawyairawzaqEaqFaqHaqHawAaqJawBawCavCawDawEawFawGawGawHawGapxawIawJawKawLawMawNapxawOapzapzapzapzapzawOapxaafaaaaaaaaaaaaaaaaafaafaaaaafawPawQawRawSawTaafaaaaaaaafaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafawUaqmawVarVawWawXawYawZaxaawWarVaxbaxcaqmaxdaxeaqpaxfaxgaxgaxgaxgaxgaxgasbaxhaxiavYaxjaxkaxlavYaxmapFapFapFapFapFapFapFapFapFapFapFatTaxnauZaxoaxpaxqaxraxsatTavdaveawiaxtaxuaxvawiaveavfaxwaufaxxaxyaxzaxAawvaxBaxCaxDaxEawvawvaxFaxGavtamSaxHairawzapRarFaqHarFapVaswaxIawGawGawGawGawGawGaxJaxKaxLawGapxapxapxapxaxMapxapxawOapzapzapzapzapzawOapxaaaaaaaaaaaaaaeaaaaaaaaaaaaaafaxNaxOaxPaxQaxNaafaaaaaaaafaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -9109,7 +9109,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaablublublublublublublublublublublublublublublublubluaaaaaaaaaaaaaaaaaeaaaaaaaaabiybiybiybiybiybiybiyboIboJboIboKboLbfBbfBbfBbfBbfBbjYbjZboMblEboNbfBbfBbfBbfBboObkbboPbfBboQboRboSboTboUboVboWboXboYboYboYboZbpaboYbpbbpcbpdbpebpfbpgbphblNbphbnybpibpjbpjbkybpkbplbpmbpnbpobnCbppbpqbpraGcaGcbpsbcZbcZbptbdabpubpvbpwbpxbpybpzbbzbpAbpBbpCbbzbpDbpEbpFbpGbnPbpHbpIbpJbpKbgjbpLbpMbgjbpNbgjbgjbgjbpObpPbpQbpRbpSbpTbpQbpUbpVbpWbpXbpYbpZbqabqbbqbbqcbqdbqbbqebqfbqgbqhbqibqjbqgbqkbqlbqmbqnbqobqnbqpbqnbqobqnbqqbqnbqobqnbqrbqnbqobqsbqtbqubqvbqwbqxbqybqzbdCbdCaaaaaaagQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaablublublublublublublublublublublublublublublublublubluaaaaaaaaaaaaaaaaaaaaaaaaaaabiybiybiybiybiybiybiybqAblwbqBbqCbfBbfBbfBbfBbfBbfBbjYbfBbfBaVrbqDbfBbfBbfBbfBbqEblEbfBbfBbkgbfBblDbkbaZOaGcbqFbkkbqGbnrbnrbnrbnrbnrbqHbqIbqJbqKbqLbqMbnzbqNbqObqPbqQbqRbqSbkybqTbplbqUbqVbpobnCbqWbqXbpraGcaGcbqYbbzbbzbbzbqZbrabqZbbzbbzbbzbbzbbzbbzbbzbbzbbzbrbbrcbrdbrebrfbrfbrgbrhbribrjbrkbrlbrmbrnbrobrobrpbrqbrrbbSbrsbrtbrubbSbrvbrwbrxbldbrybrzbrAbrBbrBbrCbrCbrCbrDbrDbrDbrDbrDbrAbrAbrAbrEbrFbrGbeZbfabjIbrGbeZbfabjIbrGbeZbfabjIbrGbeZbfabdCbdCbdCbdCbdCbdCbdCbdCaafaaaaaaaZuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaablublublublublublublublublublublublublublublublublubluaaaaaaaaaaaaaaaaaaaaaaaaaaabiybiybiybiybiybiybiyboIboJboIbnlbrHbfBbfBbfBbfBbrHbjYbfBbfBbrIbrJbfBbfBbfBbfBbfBbrKbfBbfBbkgbfBblDbjWaZOaGcaNQbkkbrLbrMbrNbrObrPbrPbrQbqIbrRbrSbrTbrUbrVbrWbrXbrYbrZbsabsbbscbsdbnCbsebsebnCbnCbsfbsgbpraGcaGcbqYbshbsibsjbsjbskbdabslbbzbsmbsmbsnbsobspbspbsqbsrbkLbdmbssbstbsubsvbswbsxbnWbsybdmbszbsAbsBbsCbsDbsEbsFbbSbbSbbSbbSbbSbldbldbldbldbsGbsHbrCbrCbrCbrCbsIbsJbsJbsKbsLbsMbrDaafaafbjHbsNbjHaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaablublublublublublublublublublublublublublublublublubluaaaaaaaaaaaaaaaaaaaaaaaaaaabiybiybiybiybiybiybiybsObsPbsObsQbsQbsQbsQbsQbsRbsQbsSbsTbsUbsVbsWbsXbsYbsZbtabfBbtbbtcboSbtdbteblDblEbtfbetbetbkkbrLbrMbtgbthbtibtjbtkbqIbtlbtmbtnbtobtpbtqbtrbtsbttbtubtvbkybtwbtxbtybtzbtAbtBbtCbtDbtEbtFbtGbtHbtIbtJbdabtKbtKbdabdabbzbtLbtLbtLbspbtMbspbsqbtNbkLbtObtObtObtObtPbtObtQbtRbtQbtSbtSbtTbtUbtSbtSbtVbtWbtXbtYbtZbuabubbucbudbuebufbugbuhbrCbuibujbukbsIbsJbsJbsKbsLbsMbrDaafaafbljbsNbljaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaZuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaablublublublublublublublublublublublublublublublublubluaaaaaaaaaaaaaaaaaaaaaaaaaaabiybiybiybiybiybiybiybsObsPbsObsQbsQbsQbsQbsQbsRbsQbsSbsTbsUbsVbsWbsXbsYbsZbtabfBbtbbtcboSbtdbteblDblEbtfbetbetbkkbrLbrMbtgbthbtibtjbtkbqIbtlbtmbtnbtobtpbtqbtrbtsbttbtubtvbkybtwbtxbtybtzbtAbtBbtCbtDbtEbtFbtGbtHbtIbtJbdabtKbtKbdabdabbzbtLbtLbtLbspbtMbspbsqbtNbkLbtObtObtObtObtPbtObtQbtRbtQbtSbtSbtTbtUbtSbtSbtVbtWbtXbtYbVmbuabubbucbudbuebufbugbuhbrCbuibujbukbsIbsJbsJbsKbsLbsMbrDaafaafbljbsNbljaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaZuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaablublublublublublublublublublublublubluaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabiybiybiybiybiybiybiybulbumbunbuobupblwblwblwblwbuqaVraVraVraVrburaVrbusbutbuubuvbuwbuxbuybuzbuAbuubuubuBbuCbuCbkkbkkbkkbuDbuEbuFbuFbuFbuGbuHbuIbuJbuHbuKbuLbuMbuNbuObuObuObuPbuQbkAbkAbuRbuSbuTbkAbkBbuUbuCbuCbqYbuVbuWbuXbuYbuZbvabdabbzbvbbtLbsmbtLbspbspbvcbvdbvebvfbvgbvhbvibvjbvkbsxbnWbsxbvlbvmbvnbvobvpbtSbvqbvrbtXbtYbvsbvtbvubvvbvwbvxbvybvzbvAbvBbvCbvDbvEbvEbvFbvEbvGbvHbvIbrDaafaafbljbsNbljaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaagQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaablublublublublublublublublublublubluaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabiybiybiybiybiybiybiyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabvJbvKbvLbvMbvNbvObvPbvQbvRbvSbvTbvUbvVbvWbuubvXbvYbvYbvYbvZbwabvYbwbbvYbvYbvYbvYbwcbwdbwabwebwfbwgbwhbwibwjbvYbwkbwlbvYbvYbvYbwmbvYbvYbvYbwnbwobvYbvYbwpbwqbwrbuXbuYbuYbvabwsbbzbtLbtLbtLbtLbtLbwtbsqbwubkLbwvbwwbwxbwybwzbwAbsxbnWbsxbwBbwCbwDbwEbwFbvlbwGbwHbwIbwJbwKbwLbwLbwLbwMbwNbufbsGbwObrCbrCbwPbwQbwRbwRbwRbwSbwRbwTbrDaafaafbljbsNbljaafaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaagQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaDwaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaablublublublublublublublublublublublubluaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabiybiybiybiybiybiybiyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabvJbwUbwVbwVbwWbwXbwYbvQbvQbwZbxabxbbxcbxdbuubxebxfbvYbvYbvYbwabvYbvYbvYbvYbvYbvYbvYbwdbwabvYbxgbxhbxibvYbvYbvYbvYbwlbvYbvYbvYbwmbvYbvYbxjbxkbwobxlbxmbxnbxobxpbdabxqbxrbdabdabbzbxsbxtbxubxvbxwbxxbsqbwubxybtPbxzbxAbxBbxCbxDbxEbxFbsxbwBbwCbxGbxHbxIbxJbxKbxLbxMbxNbxObxPbxQbxRbxSbxTbufbxUbxVbxWbxXbxYbxZbyabybbycbydbyebyfbrDaafaafbljbsNbljaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaZuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -9117,12 +9117,12 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaablublublublublublublublublublublublublublublublublubluaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaabvJbzdbwWbwXbuubuubzebzfbzgbzgbzhbuubuubzibzjbzkbzlbzlbzmbznbzobzobzpbzqbzrbzobzobzsbztbuCbuCbuCbzubzvbzvbzvbzwbzxbzvbzvbzvbzvbzybzzbyFbzAbzBbzCbbGbzDbzEbzFbzGbzGbzFbzHbzIbzJbzKbzLbzybzMbzNbzObwubzPbtPbzQbzRbyJbzSbvkbsxbzTbzUbzVbzWbzXbzYbzZbtYbAabAbbAcbAdbAebAcbAfbAgbAgbAgbAhbAibAjbAkbAkbAkbAkbAkbAkbAlbAmbAlbAlbAlbAlaafbcbbAnbcbaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafbAobApbApbAqbArbArbAsbAsbAsbAsbAsaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaablublublublublublublublublublublublublublublublublubluaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaabvJbwVbwWbAtbAubAvbAwbAxbAybAzbAAbuuaaaaaaaaabABbACbADbAEaaaaafaaabAFbAGbAHaaaaafaaabAIbAJbvYbvYbzBbzvbAKbALbAMbANbAObAPbAQbARbASbATbAUbAVbAVbAVbAWbAXbAYbAZbBabBbbBcbBdbBebBfbBabBabBabBgbBhbBibwubkLbtPbtObBjbyJbBkbBlbsxbdobdobBmbBnbBobBpbBqbtYbBrbBsbBtbBtbBubBvbwLbBwbwLbwLbBxbsGbBybAkbBzbBAbBBbBCbBDbBEbBFbBEbBGbBHbBIaafbcbbsNbjHaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafbBJbBKbBLbBKbArbAsbAsbBMbBNbBMbAsbAsaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaablublublublublublublublublublublublublublublublubluaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafbvJbvJbvJbBObBPbBQbuubBRbBSbBTbBUbBVbuuaaaaaaaaabABbACbBWbBXaafbBYbBYbBYbBZbBYbBYbBYaafbCabAJbvYbvYbzAbzvbCbbCcbCdbCebCfbCgbzvbzvbChbCibCjbCkbClbCmbzFbCnbCobkLbzybzybzybzybCpbCqbzGbzGbCrbCsbzMbCtbwubpEbCubCvbCwbCxbCybwAbsxbdobCzbtSbtSbtSbtSbtSbtYbCAbCBbySbucbtYbCCbCDbufbCEbCFbufbCGbCHbCIbCJbCKbCLbCMbCKbCNbCObCPbCQbCQbBIaafbcbbsNbljaagaagaagaagaagaagaagaagaagaagaagaagaagaagaagaagaagaagaagaagaagaagaagbCRbBKbBKbCSbAsbAsbBMbBMbCTbBMbBMbAsbAsaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaablublublublublublublublublublublublublublubluaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaabCUbCVbCWbCVbCXaaaaaaaaaaaabvJbACbCYbCZbDabDbbuubDcbDdbuubDebDfbuubDgbDhbDhbDibACbDjbBXaaabBYbDkbDlbDmbDnbDobBYaaabCabAJbvYbvYbzCbzvbDpbDqbDrbDsbDtbDubDvbBcbDwbDxbDybDzbDAbBabBcbDBbDCbDDbzyaafaafbDEbDFbzybzybzybzybDGbDHbDIbDJbDKbtPbtObtObtObtObtObDLbdobDMbDNbDObDPbDPbDQbufbDRbCBbDSbDTbtYbDUbDUbDUbDUbDUbDUbsGbDVbDWbDXbDYbDZbEabEbbBEbEcbBEbEdbCQbBIaafbcbbsNbzcaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaabEebAsbCRbAsbAsbBMbBMbBMbBMbBMbBMbBMbAsbAsaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaablublublublublublublublublublublublublublubluaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaabCUbCVbCWbCVbCXaaaaaaaaaaaabvJbACbCYbCZbDabDbbuubDcbDdbuubDebDfbuubDgbDhbDhbDibACbDjbBXaaabBYbDkbDlbDmbDnbDobBYaaabCabAJbvYbvYbzCbzvbDpbDqbDrbDsbDtbDubDvbBcbDwbDxbDybDzbDAbBabBcbDBbDCbDDbzyaafaafbDEbDFbzybzybzybzybDGbDHbDIbDJbDKbtPbtObtObtObtObtObDLbdobDMbDNbDObDPbDPbDQbufbKxbCBbDSbDTbtYbDUbDUbDUbDUbDUbDUbsGbDVbDWbDXbDYbDZbEabEbbBEbEcbBEbEdbCQbBIaafbcbbsNbzcaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaabEebAsbCRbAsbAsbBMbBMbBMbBMbBMbBMbBMbAsbAsaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaablublublublublublublublublublublubluaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabEfbEgbEhbEhbEfbEibDhbEjbvJbvJbEkbElbElbEmbEnbEobEpbEqbErbEsbEtbEubEvbEwbExbEybEzbEAbEBaafbBYbECbEDbDmbDnbEEbBYaafbCabAJbvYbEFbzubzvbzvbEGbzvbzvbEHbzvbzvbzMbEIbEJbEKbELbzybzybEMbENbEObEPbzyaafaafbEQaafaafbERbESbERbzMbzMbETbEUbEVbEWbEXbEYbEZbFabdmbFbbdobdobDNbFcbFdbFdbFebufbFfbFgbySbFhbtYbFibFjbFkbFlbFmbFnbFobFpbFqbFrbFsbFtbFubFvbFwbFxbAlbAlbAlbAlbAlbcbbFybcbbAlbAlbAlbAlbAlaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafbArbAsbFzbFAbFAbBMbBMbBMbBMbBMbBMbBMbBMbAsbAsaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabCWbFBbFBbEhbCWbFCbFDbFEbvJbFFbACbACbACbACbACbFGbACbFHbFIbFJbFKbFLbFMbFNbFObFPbFQbDjbFRaaabBYbFSbEDbFTbDnbFUbBYaaabCabFVbFWbFXbFYbFZbGabGbbzGbzGbzGbzGbzGbzGbGcbzGbGdbGebzyaaaaaabhxbGfaaaaaaaaaaaabEQaaaaaabzybzybzybzybzybzybzybEVbGgbGhbgjbGibGjbGkbGlbGmbdobGnbGobGpbGqbGrbufbGsbGtbGsbtYbtYbGubGvbGwbGxbGxbGybGzbgybGAbGBbGCbGDbGEbGEbGFbGFbGGbGHbGFbGIbGJbGKbGLbGMbGNbGObGPbGQbGRaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaabAsbAsbGSbBMbBMbBMbBMbBMbBMbBMbBMbBMbBMbBMbAsbAsaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabEfbEhbEhbEhbGTbGUbACbACbGVbACbACbACbACbFGbACbACbACbGWbvJbvJbvJbvJbvJbGXbGYbGZbHabHbbHcbHdbHebHfbHgbHhbHibHjbHebHdbHkbHlbHmbHnbHobHpbHobHobHqbHrbHsbHtbzLbzMbzMbHubHvbHwbAVbHxbHxbHybHzbHAbHAbHAbHAbHBbHAbHAbHAbHAbHAbHAbHAbHAbHCbHDbHEbHFbdobdobHGbnSbdobHHbHIbxDbHJbHKbHJbHLbHMbGobGobHNbDUbHObHPbHQbHRbHSbHTbHUbHVbgybHWbHXbHXbHXbHXbHXbCKbCKbCKbCKbCKbHYbHZbIabIbbIcbGNbCKbIdbGQbIeaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafbAsbBMbBMbBMbBMbBMbBMbIfbBMbIgbBMbBMbBMbBMbBMbAsbAsaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabCWbFBbFBbFBbCWbIhbIibIjbvJbIkbACbIlbACbACbACbACbACbImbvJbInbIobIobIpbIqbIrbIsbItbIubBYaaabBYbIvbBYbBYbBYbBYbBYaaabIwbIxbIybIzbHrbIAbIBbICbIDbIEbIEbIEbIEbIEbIEbIFbIGbIEbIEbIHbIIbIJbIKbIKbIKbIKbILbEQaaaaaaaaaaaaaaaaafaafaafbjHbIMbINbIObIPbIQbIRbISbIQbITbIPbIUbIVbIWbIXbIYbIZbGobJabJbbDUbJcbGxbGxbJdbJebJfbJgbJhbJibAkbJjbJjbJjbJkbJlbJmbJnbJobJpbJqbAlbAlbcbbFybcbbAlbJrbJsbJtbAlaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaafaaaaaabAsbJubJubJubJubJubJubJvbBMbJwbJubIgbBMbBMbBMbBMbAsaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabEfbJxbJybJzbEfbJAbDhbEjbvJbvJbJBbJCbJDbJEbJFbJGbJGbJGbvJbJHbJIbJJbJKbJLbJMbJNbJObJKbBYaaaaafbJPbJQbJRbJSbJTbJUbJUbJVbJWbJXbJYbHrbIAbIBbJZbKabKbbKcbKdbKebKfbKgbKhbKibKjbKkbKlbKmbKnbKobKpbKqbKrbKsbKtaaaaaaaaaaaeaaaaafaaaaaabljbKubEWbKvbKwbdobVmbKybdobKzbKwbGnbGobKAbKBbKCbKDbKEbGobHNbDUbKFbKGbGxbKHbKIbKJbDUbGzbKKbKLbKLbKLbKLbKLbKLbKLbKLbKLbKLbKMbKNbKObKPbKQbKRbAlbKSbKTbKUbKVaagaagaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabKWbBKbBKbBKbBKbBKbBKbBKbKXbBNbBMbBMbBMbBMbKYbBNbAsaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabEfbJxbJybJzbEfbJAbDhbEjbvJbvJbJBbJCbJDbJEbJFbJGbJGbJGbvJbJHbJIbJJbJKbJLbJMbJNbJObJKbBYaaaaafbJPbJQbJRbJSbJTbJUbJUbJVbJWbJXbJYbHrbIAbIBbJZbKabKbbKcbKdbKebKfbKgbKhbKibKjbKkbKlbKmbKnbKobKpbKqbKrbKsbKtaaaaaaaaaaaeaaaaafaaaaaabljbKubEWbKvbKwbdobDRbKybdobKzbKwbGnbGobKAbKBbKCbKDbKEbGobHNbDUbKFbKGbGxbKHbKIbKJbDUbGzbKKbKLbKLbKLbKLbKLbKLbKLbKLbKLbKLbKMbKNbKObKPbKQbKRbAlbKSbKTbKUbKVaagaagaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabKWbBKbBKbBKbBKbBKbBKbBKbKXbBNbBMbBMbBMbBMbKYbBNbAsaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabKZbCVbLabCVbLbaaaaafaaaaafbvJbvJbLcbLdbLdbLdbLdbLebvJbvJbLfbLgbLhbJKbLibLjbLkbLlbLmbLnbLobLobLpbLqbLrbLobLsbLtbLtbLubLvbLwbLxbLybLzbLAbLBbLCbKbbLDbLEbLFbLFbLEbLGbKibLHbLIbLJbLGbLFbLKbLFbLLbLMbLNaafbLObLObLObLObLOaafaaaaaabljbKubEWbLPbLQbdobdobLRbdobKzbLSbDNbLTbLUbLUbLVbKDbGobLWbHNbDUbLXbLYbLZbMabMbbMcbLXbMdbMebMfbMgbMhbMibMjbMkbMlbMmbMnbMobMpbKNbjGbsNbcbbcbbAlbAlbAlbAlbAlaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaabAsbFAbFAbFAbFAbFAbFAbMqbBMbFzbFAbMrbBMbBMbBMbBMbAsaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaaaaaaaaaaafaafaaaaafaaaaaaaaaaafbJKbLibMsbJKbJObJKbBYbBYbBYbJSbMtbMubJSbJSbMvbMwbMxbMybMzbMAbMBbMCbMDbLFbMEbMFbLFbLFbLFbLFbMGbMHbMIbMJbLIbMKbLFbMLbMMbMNbMObMPbMQbMRbMSbMTbMUbMVbLOaafaafaafbljbKubEWbMWbMXbMYbMZbdmbdobKzbKwbNabNabNabNabNabNbbNcbNabNabNabLXbNdbNebNfbNgbNhbLXbGzbNibNjbNkbNlbNmbNlbNlbNnbNobMobNobMobKNbNpbsNbNqaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafbAsbBMbBMbBMbBMbBMbBMbIfbBMbMrbBMbBMbBMbBMbBMbAsbAsaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaafaaaaafaaaaaaaaaaafbJKbLibNrbNsbNtbNsbNsbNubzmbNvbNwbNxbNybNzbMvbNAbNBbvYbMzbNCbNDbNEbNFbLFbNGbKbbNHbLFbLFbLFbNIbLFbLFbLFbNJbKlbNKbNLbNMbNNbNObNPbNQaafbNRbNSbMVbNTbLOaafaaaaaabNUbKubEWbdmbdmbdmbdmbdmbyKbNVbNWbNabNXbNYbNZbOabObbOcbOdbOebOfbLXbOgbOhbOibOhbOgbLXbGzbvAbOjbOkbOlbNlbNlbOmbNjbOnbOobOobOpbKNbKNbsNbOqaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaabAsbAsbGSbBMbBMbBMbBMbBMbBMbBMbBMbBMbBMbBMbAsbAsaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa From de95f7e8ccd033637f6f301351c9405eca4b39ac Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 11 Nov 2012 18:23:44 +0100 Subject: [PATCH 2/7] Small bug fix for side effect list generation. --- code/defines/obj/weapon.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index dbdff2bc7e7..00d1d18a09b 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -1068,8 +1068,9 @@ New() ..() - for(var/tp in list(typesof(/datum/genetics/side_effect) - /datum/genetics/side_effect)) + for(var/tp in typesof(/datum/genetics/side_effect) - /datum/genetics/side_effect) var/datum/genetics/side_effect/S = new tp + info = "" info += "Name:\t [S.name]
" info += "Symptom:\t [S.symptom]
" info += "Treatment:\t [S.treatment]
" From d62aa1425f4036e45922bb0cab33c70dbdf7c66f Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 11 Nov 2012 18:41:40 +0100 Subject: [PATCH 3/7] Fixed a few more bugs with genetic side effects. --- code/defines/obj/weapon.dm | 2 +- code/modules/genetics/side_effects.dm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 00d1d18a09b..8bf17c2e040 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -1068,9 +1068,9 @@ New() ..() + info = "" for(var/tp in typesof(/datum/genetics/side_effect) - /datum/genetics/side_effect) var/datum/genetics/side_effect/S = new tp - info = "" info += "Name:\t [S.name]
" info += "Symptom:\t [S.symptom]
" info += "Treatment:\t [S.treatment]
" diff --git a/code/modules/genetics/side_effects.dm b/code/modules/genetics/side_effects.dm index 71f32aec440..b8a4a6b80e4 100644 --- a/code/modules/genetics/side_effects.dm +++ b/code/modules/genetics/side_effects.dm @@ -61,6 +61,7 @@ H.monkeyize() proc/trigger_side_effect(mob/living/carbon/human/H) + if(!istype(H)) return var/tp = pick(typesof(/datum/genetics/side_effect) - /datum/genetics/side_effect) var/datum/genetics/side_effect/S = new tp From fb295ee0cfb2b75c77989646477004cce524b240 Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 11 Nov 2012 18:51:02 +0100 Subject: [PATCH 4/7] Balancing for genetics side-effects: - The knockdown is now much shorter, meaning a geneticist may be able to give themselves the cure in time. - Reduced radiation created from syringes, since there are other side-effects now. --- code/game/objects/items/weapons/dna_injector.dm | 2 +- code/modules/genetics/side_effects.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index faba5dd8171..84bb13c3a69 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -23,7 +23,7 @@ /obj/item/weapon/dnainjector/proc/inject(mob/M as mob, mob/user as mob) if(istype(M,/mob/living)) - M.radiation += rand(20,50) + M.radiation += rand(5,20) if (!(NOCLONE in M.mutations)) // prevents drained people from having their DNA changed if (dnatype == "ui") diff --git a/code/modules/genetics/side_effects.dm b/code/modules/genetics/side_effects.dm index b8a4a6b80e4..83f9bdda792 100644 --- a/code/modules/genetics/side_effects.dm +++ b/code/modules/genetics/side_effects.dm @@ -61,13 +61,13 @@ H.monkeyize() proc/trigger_side_effect(mob/living/carbon/human/H) - if(!istype(H)) return + if(!istype(H)) returngit a var/tp = pick(typesof(/datum/genetics/side_effect) - /datum/genetics/side_effect) var/datum/genetics/side_effect/S = new tp S.start(H) spawn(20) - H.Weaken(S.duration) + H.Weaken(rand(0, S.duration / 20)) sleep(S.duration) H.SetWeakened(0) S.finish(H) \ No newline at end of file From a79ca39838f46da265fa93260d69f1fe5252e011 Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 11 Nov 2012 19:01:32 +0100 Subject: [PATCH 5/7] Forgot a spawn in trigger_side_effects --- code/modules/genetics/side_effects.dm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/code/modules/genetics/side_effects.dm b/code/modules/genetics/side_effects.dm index 83f9bdda792..f3b69b54b5b 100644 --- a/code/modules/genetics/side_effects.dm +++ b/code/modules/genetics/side_effects.dm @@ -61,13 +61,17 @@ H.monkeyize() proc/trigger_side_effect(mob/living/carbon/human/H) - if(!istype(H)) returngit a - var/tp = pick(typesof(/datum/genetics/side_effect) - /datum/genetics/side_effect) - var/datum/genetics/side_effect/S = new tp + spawn + if(!istype(H)) return + var/tp = pick(typesof(/datum/genetics/side_effect) - /datum/genetics/side_effect) + var/datum/genetics/side_effect/S = new tp - S.start(H) - spawn(20) - H.Weaken(rand(0, S.duration / 20)) - sleep(S.duration) - H.SetWeakened(0) - S.finish(H) \ No newline at end of file + S.start(H) + spawn(20) + if(!istype(H)) return + H.Weaken(rand(0, S.duration / 50)) + sleep(S.duration) + + if(!istype(H)) return + H.SetWeakened(0) + S.finish(H) \ No newline at end of file From 621fa1dd557c52c41d3ffa6f5f48aee38fd18ed5 Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 11 Nov 2012 19:12:43 +0100 Subject: [PATCH 6/7] Updated changelog. --- html/changelog.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/html/changelog.html b/html/changelog.html index 6d272ef81ee..dbfbcce1b1a 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,14 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit though. Thanks. --> +
+

November 11th

+

CIB updated:

+
    +
  • DNA injectors now have a small chance(5%) to trigger a genetic side-effect. See the paper in the genetics lobby for recognition and treatment.
    • +
+
+

November 9th

AterIgnis updated:

From a14ea29df32886037237e6d49f3425be78b005cb Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 11 Nov 2012 19:35:01 +0100 Subject: [PATCH 7/7] Replaced monkey with confusion effect. Feature is new and don't want surprise monkeys. --- code/modules/genetics/side_effects.dm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/code/modules/genetics/side_effects.dm b/code/modules/genetics/side_effects.dm index f3b69b54b5b..e82bb3457f6 100644 --- a/code/modules/genetics/side_effects.dm +++ b/code/modules/genetics/side_effects.dm @@ -46,7 +46,7 @@ E.take_damage(20, 0, 0) E.fracture() -/datum/genetics/side_effect/monkey +/*/datum/genetics/side_effect/monkey name = "Monkey" symptom = "Subject starts drooling uncontrollably." treatment = "Inject small dose of dylovene." @@ -58,7 +58,21 @@ finish(mob/living/carbon/human/H) if(!H.reagents.has_reagent("anti_toxin")) - H.monkeyize() + H.monkeyize()**/ + +/datum/genetics/side_effect/confuse + name = "Confuse" + symptom = "Subject starts drooling uncontrollably." + treatment = "Inject small dose of dylovene." + effect = "Subject becomes confused." + duration = 10*30 + + start(mob/living/carbon/human/H) + H.emote("me", 1, "has drool running down from his mouth.") + + finish(mob/living/carbon/human/H) + if(!H.reagents.has_reagent("anti_toxin")) + H.confused += 100 proc/trigger_side_effect(mob/living/carbon/human/H) spawn