From 89c99a18ddb2b0f35a458d4f0bf307be12bfb5a8 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Sat, 16 Mar 2019 18:16:59 -0700 Subject: [PATCH 01/20] Headpaint icon name fix Name in dmi did not match the code. --- icons/mob/vore/ears_vr.dmi | Bin 19517 -> 19507 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/vore/ears_vr.dmi b/icons/mob/vore/ears_vr.dmi index 08c0c12323972ae1f6e51763beec27d054faea46..bc0c68131aeda3a8c0fc5f7fc2ddc2b8c064d9d3 100644 GIT binary patch delta 482 zcmV<80UiFmm;tkx0gxmr+Im!2bVOxyV{&P5bZKvH004NLm6btn+b|4;&+)Gi+OvkW z>ou35#gLIs7Js9GPmk7nPttw(`tt4Y7M@=Z!#ipv;jj-+pFR(}jpmlaK74r`b{T2O z?fOw0Gz|N2SHE{s#S%q<7rYyGGieR`@HFg_!iqKQ!^1y##n}y;;E7th_$XpVHPK^d zwgry}8jmU)yHFF_q@=hg+LM2iXiwgxq_|PFv)QC17k}jQaFt%sx1CkG$*v_TGT35L9ZrG@1DTjG#r$AmGp@ohi*mK$V`sj^ zEmLz`1E|Y*EgKX-`HhUeG9~%pn}6jT^BXOSwYpSSQi7ODPiaj21s%e`4Vl4FiY(K~u5Ke+N*bXv-AT4+CpL+F+<&@!#*!SK zm9D@TU5d3J+P?jDmLE;HP@z>?9^K)+_i}bY&REXCvwbN}vPG6G%B~(3)H<%9wp*#l z`Ft6V-F{#j)(mRjxi`+Y{TrNV$sb`qBwiey{w9O^qzghCU9D|co1+E9PAaMVAH5GR YZ_nZR^)UPbK9MtHtsOgRvk?L;N}3Gpy8r+H delta 492 zcmVou1lMUjzC7JnTLe0;Rudy? z&?8rnLF0*9?d<0#gqFtwt2v>aVYF+BiVU`xRELwG!ayb_Off&0*o2F4%%WUv_}G~* zam~~m*8u7~oC^>S)r1o=g1WhETYe*>uS`k4`}SWs$NomMVy!OKg_Izs(o>ogX7PD( zow`-qH-B-fcSCM47CS@WR?r~~+>jX@rN}a#?CLhMrKAx$(;a1vc4DL0$Nh)PXDrF# zS?LOl(WO`mqV3xsXZg{D3l&5Bt}{_9uv3J# Date: Sun, 17 Mar 2019 20:03:06 +0100 Subject: [PATCH 02/20] Adding speak chance to normal synxes Adding a baseline hyperactive style of speaking to normal synxes --- code/modules/mob/living/simple_animal/animals/synx.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/simple_animal/animals/synx.dm b/code/modules/mob/living/simple_animal/animals/synx.dm index 7cc67217f9..590aa2c4fe 100644 --- a/code/modules/mob/living/simple_animal/animals/synx.dm +++ b/code/modules/mob/living/simple_animal/animals/synx.dm @@ -9,6 +9,8 @@ icon_living = "synx_living" icon_dead = "synx_dead" + speak_chance = 10 //MAy have forgotten to readd that. + //Synx speech code overrides normal speech code but is still a x in 200 chance of triggereing, as all mobs do. //VAR$ SETUP var/realname = null var/poison_per_bite = 5 From 90aa9a9ff5c3cc655a632cf9d600911af4c94f58 Mon Sep 17 00:00:00 2001 From: Shadowfire117 Date: Sun, 17 Mar 2019 20:34:34 +0100 Subject: [PATCH 03/20] This time we got 4 new plants and 2 new chemicals! We got voltato which is a potato mutant that produces 200 V for all, then we have the solarflower which is a sunflower mutant that glows and can be planted anywhere, perfect for mood lights and blackout! Then we have two lavender mutants, milk dew that produces milk and sweet breeze that produces Serazine! The two new chems are Serazine that is a mild anti toxin that can be used to enhance drugs, which at the current time is bicaridine with some tungsten added in to produce the other new chem called Alizine that is double as effective as bicaridine, though it sadly cant cure internal bleeding when overdosing patients :c --- code/modules/hydroponics/seed_datums.dm | 62 +++++++++++++++++++ code/modules/hydroponics/seed_packets.dm | 12 ++++ .../Chemistry-Reagents-Medicine.dm | 34 ++++++++++ code/modules/reagents/Chemistry-Recipes.dm | 7 +++ 4 files changed, 115 insertions(+) diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index 7c6b2b507e..3b3767077a 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -547,6 +547,7 @@ name = "sunflowers" seed_name = "sunflower" display_name = "sunflowers" + mutants = list("solarflower") /datum/seed/flower/sunflower/New() ..() @@ -558,10 +559,27 @@ set_trait(TRAIT_WATER_CONSUMPTION, 6) set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) +/datum/seed/flower/sunflower/solarflower + name = "solarflower" + seed_name = "solarflower" + display_name = "solarflowers" + mutants = null + +/datum/seed/flower/sunflower/solarflower/New() + ..() + set_trait(TRAIT_PRODUCT_COLOUR,"#4466b3") + set_trait(TRAIT_BIOLUM,1) + set_trait(TRAIT_BIOLUM_COLOUR,"#4e74cc") + set_trait(TRAIT_POTENCY,25) + set_trait(TRAIT_MATURATION,10) + set_trait(TRAIT_YIELD,1) + set_trait(TRAIT_SPREAD,1) + /datum/seed/flower/lavender name = "lavender" seed_name = "lavender" display_name = "lavender" + mutants = list("milkdew") chems = list("nutriment" = list(1,20), "bicaridine" = list(1,10)) /datum/seed/flower/lavender/New() @@ -576,6 +594,34 @@ set_trait(TRAIT_IDEAL_LIGHT, 7) set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.05) set_trait(TRAIT_WATER_CONSUMPTION, 0.5) + +/datum/seed/flower/lavender/milkdew + name = "milkdew" + seed_name = "milk dew" + display_name = "milk dew" + chems = list("nutriment" = list(1,10), "milk" = list(4,5)) + mutants = list("sweetbreeze") + +/datum/seed/flower/lavender/milkdew/New() + ..() + set_trait(TRAIT_PRODUCT_COLOUR,"#DFDFDF") + set_trait(TRAIT_POTENCY,5) + set_trait(TRAIT_YIELD,3) + +/datum/seed/flower/lavender/sweetbreeze + name = "sweetbreeze" + seed_name = "sweet breeze" + display_name = "sweet breeze" + chems = list("nutriment" = list(1,10), "serazine" = list(1,10)) + mutants = null + +/datum/seed/flower/lavender/sweetbreeze/New() + ..() + set_trait(TRAIT_PRODUCT_COLOUR,"#df9898") + set_trait(TRAIT_POTENCY,10) + set_trait(TRAIT_MATURATION,20) + set_trait(TRAIT_PRODUCTION,7) + set_trait(TRAIT_YIELD,3) //Grapes/varieties /datum/seed/grapes @@ -699,6 +745,7 @@ name = "potato" seed_name = "potato" display_name = "potatoes" + mutants = list("voltato") chems = list("nutriment" = list(1,10), "potatojuice" = list(10,10)) kitchen_tag = "potato" @@ -713,6 +760,21 @@ set_trait(TRAIT_PRODUCT_COLOUR,"#D4CAB4") set_trait(TRAIT_PLANT_ICON,"bush2") set_trait(TRAIT_WATER_CONSUMPTION, 6) + +/datum/seed/potato/voltato + name = "voltato" + seed_name = "voltato" + display_name = "voltatos" + chems = list("nutriment" = list(1,10), "shockchem" = list(0,10)) + mutants = null + +/datum/seed/potato/voltato/New() + ..() + set_trait(TRAIT_PRODUCT_COLOUR,"#E4EC2F") + set_trait(TRAIT_POTENCY,30) + set_trait(TRAIT_MATURATION,12) + set_trait(TRAIT_PRODUCTION,3) + set_trait(TRAIT_YIELD,3) /datum/seed/onion name = "onion" diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm index 80654d408b..92242bc3e6 100644 --- a/code/modules/hydroponics/seed_packets.dm +++ b/code/modules/hydroponics/seed_packets.dm @@ -142,6 +142,9 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds) /obj/item/seeds/potatoseed seed_type = "potato" + +/obj/item/seeds/voltatoseed + seed_type = "voltato" /obj/item/seeds/icepepperseed seed_type = "icechili" @@ -196,9 +199,18 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds) /obj/item/seeds/sunflowerseed seed_type = "sunflowers" + +/obj/item/seeds/solarflowerseed + seed_type = "solarflower" /obj/item/seeds/lavenderseed seed_type = "lavender" + +/obj/item/seeds/milkdewseed + seed_type = "milkdew" + +/obj/item/seeds/sweetbreezeseed + seed_type = "sweetbreeze" /obj/item/seeds/brownmold seed_type = "mold" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 7c7529122e..4452cc840c 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -51,6 +51,24 @@ if(W.damage <= 0) O.wounds -= W +/datum/reagent/alizene + name = "Alizene" + id = "alizene" + description = "A derivative from bicaridine enhanced by serazine to more effectively mend flesh, but is ineffective against internal hemorrhage." + taste_description = "bittersweet" + taste_mult = 3 + reagent_state = LIQUID + color = "#b37979" + overdose = REAGENTS_OVERDOSE + scannable = 1 + +/datum/reagent/alizene/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + var/chem_effective = 1 + if(alien == IS_SLIME) + chem_effective = 0.75 + if(alien != IS_DIONA) + M.heal_organ_damage(12 * removed * chem_effective, 0) + /datum/reagent/kelotane name = "Kelotane" id = "kelotane" @@ -107,6 +125,22 @@ M.hallucination = max(0, M.hallucination - 9 * removed * chem_effective) M.adjustToxLoss(-4 * removed * chem_effective) +/datum/reagent/serazine + name = "Serazine" + id = "serazine" + description = "A sweet tasting flower extract, it has very mild anti toxic properties and can be used to make potent drugs." + taste_description = "sweet nectar" + reagent_state = LIQUID + color = "#df9898" + scannable = 1 + +/datum/reagent/serazine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + var/chem_effective = 1 + if(alien != IS_DIONA) + M.drowsyness = max(0, M.drowsyness - 3 * removed * chem_effective) + M.hallucination = max(0, M.hallucination - 6 * removed * chem_effective) + M.adjustToxLoss(-2 * removed * chem_effective) + /datum/reagent/carthatoline name = "Carthatoline" id = "carthatoline" diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 431916dedf..70c6bf3553 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -365,6 +365,13 @@ required_reagents = list("inaprovaline" = 1, "carbon" = 1) inhibitors = list("sugar" = 1) // Messes up with inaprovaline result_amount = 2 + +/datum/chemical_reaction/alizine + name = "Alizine" + id = "alizine" + result = "alizine" + required_reagents = list("bicaridine" = 1, "serazine" = 1, "tungsten" = 1) + result_amount = 3 /datum/chemical_reaction/myelamine name = "Myelamine" From 82454c1b07f6dd603df30de77385c8340f369377 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 02:14:03 +0100 Subject: [PATCH 04/20] Fixing Advanced soap --- code/game/objects/items/weapons/clown_items.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 1bf562320e..a4fcde9c15 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -47,7 +47,10 @@ T.clean(src, user) else if(istype(target,/obj/structure/sink)) to_chat(user, "You wet \the [src] in the sink.") - wet() + if(tile_clean_amount) + wet(tile_clean_amount ) + else + wet(5) else to_chat(user, "You clean \the [target.name].") target.clean_blood() From 6c9ead53060ca2ac14ac12f838a826ad6cc181fb Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 02:29:07 +0100 Subject: [PATCH 05/20] Update clown_items.dm --- code/game/objects/items/weapons/clown_items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index a4fcde9c15..6da1b23deb 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -48,7 +48,7 @@ else if(istype(target,/obj/structure/sink)) to_chat(user, "You wet \the [src] in the sink.") if(tile_clean_amount) - wet(tile_clean_amount ) + wet(tile_clean_amount) else wet(5) else From bf114611ef98df466694f03c60f31760c2194ada Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 02:30:47 +0100 Subject: [PATCH 06/20] Update weapon.dm --- code/defines/obj/weapon.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 75c95d0b0c..67ee71ecd8 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -35,6 +35,7 @@ throwforce = 0 throw_speed = 4 throw_range = 20 + var/tile_clean_amount = 5 /obj/item/weapon/soap/nanotrasen desc = "A NanoTrasen-brand bar of soap. Smells of phoron." From c71715ff366e117ed51d69503dbdb630f384311c Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 02:31:34 +0100 Subject: [PATCH 07/20] Update drone_unify.dm --- code/modules/mob/living/silicon/robot/drone/drone_unify.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone_unify.dm b/code/modules/mob/living/silicon/robot/drone/drone_unify.dm index da88e8d667..106c1351c6 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_unify.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_unify.dm @@ -52,7 +52,7 @@ //TODO: Move Advanced soap here. /obj/item/weapon/soap/drone name = "Advanced Soap" - var/tile_clean_amount = 100 + tile_clean_amount = 100 /obj/item/weapon/soap/drone/New() ..() From 911de606fe543882686caddc5d94f5fb40fb7f33 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sun, 17 Mar 2019 21:06:12 -0500 Subject: [PATCH 08/20] Adds shapeshift abilities for wings, ears, and tails to prometheans_vr.dm Already exist in prometheans.dm, assuming we use the vr version and that's why the verbs don't work. --- .../mob/living/carbon/human/species/station/prometheans_vr.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm b/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm index 135ef2ff28..78c0b64ef2 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm @@ -27,6 +27,9 @@ /mob/living/carbon/human/proc/shapeshifter_select_hair, /mob/living/carbon/human/proc/shapeshifter_select_hair_colors, /mob/living/carbon/human/proc/shapeshifter_select_gender, + /mob/living/carbon/human/proc/shapeshifter_select_wings, //VOREStation Add, + /mob/living/carbon/human/proc/shapeshifter_select_tail, //VOREStation Add, + /mob/living/carbon/human/proc/shapeshifter_select_ears, //VOREStation Add, /mob/living/carbon/human/proc/regenerate, /mob/living/proc/set_size, /mob/living/carbon/human/proc/succubus_drain, From 4e16f779d37e5904aa41e9f95d41d12045d3ee4b Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 03:29:52 +0100 Subject: [PATCH 09/20] Halving can spawn timer for drones from 10 minutes to 5. Still prevents spam but is a more reasonable time --- .../mob/living/silicon/robot/drone/drone_manufacturer.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm index 8ec8dd1d35..87ca33bc2f 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm @@ -145,9 +145,9 @@ pluralcheck = " [deathtimeminutes] minutes and" var/deathtimeseconds = round((deathtime - deathtimeminutes * 600) / 10,1) - if (deathtime < 6000) + if (deathtime < 3000) usr << "You have been dead for[pluralcheck] [deathtimeseconds] seconds." - usr << "You must wait 10 minutes to respawn as a drone!" + usr << "You must wait 5 minutes to respawn as a drone!" return var/list/all_fabricators = list() From 2365a8ba5ecd34ef194af21535cb2ab5edc749ef Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 04:06:37 +0100 Subject: [PATCH 10/20] Update to X Made it stand still longer after performing a hit. New icon. New non meme description Now can not be pulled while stationary what an absolute unit --- .../living/simple_animal/animals/tarrasque.dm | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index 712a3e05e6..a1440b0ac0 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -93,9 +93,9 @@ //MRX Variation /mob/living/simple_animal/hostile/tarrasque/mrx - icon = 'icons/mob/animal.dmi' - name = "X" - desc = "He's gonna give it to you." + icon = 'icons/mobs/64x64' + name = "Entity X" + desc = "The call of the abyss manifested." hasdrops = 0 health = 2000 maxHealth = 2000 @@ -104,10 +104,21 @@ melee_attack_maxDelay = 1 view_range = 420 size_multiplier = 1.5 - icon_living = "faithless" //possibly gonna give him a new sprite in the future - icon_dead = "faithless_dead" + icon_state = "arachnid" + icon_living = "arachnid" + icon_dead = "arachnid_dead" tt_desc = "Unknown Specimen" attacktext = list("whacks","punches","smashes") + melee_damage_lower = 0 //huh not so bad + melee_damage_upper = 50 //oh, oh no + armor = list( + "melee" = 99, + "bullet" = 99, + "laser" = 99, + "energy" = 99, + "bomb" = 99, + "bio" = 100, + "rad" = 100) //time for special MR X kick you in the shins and stands there code /mob/living/simple_animal/hostile/tarrasque/mrx/DoPunch(var/atom/A) @@ -115,8 +126,10 @@ if(.) // If we succeeded in hitting. if(isliving(A)) var/mob/living/L = A - L.Weaken(10) + L.Weaken(5) stop_automated_movement = 1 - spawn(20) + anchored = 1 + spawn(100) stop_automated_movement = 0 + anchored = 0 From a2bb22bad61878467a7faac6275cca1acd90c720 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 04:36:13 +0100 Subject: [PATCH 11/20] Update tarrasque.dm --- .../mob/living/simple_animal/animals/tarrasque.dm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index a1440b0ac0..0aebd5f716 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -108,7 +108,7 @@ icon_living = "arachnid" icon_dead = "arachnid_dead" tt_desc = "Unknown Specimen" - attacktext = list("whacks","punches","smashes") + attacktext = list("whacks","slashes","smashes") melee_damage_lower = 0 //huh not so bad melee_damage_upper = 50 //oh, oh no armor = list( @@ -119,17 +119,27 @@ "bomb" = 99, "bio" = 100, "rad" = 100) + var/litaf = 0 + +/mob/living/simple_animal/hostile/tarrasque/mrx/Life() + ..() + if (litaf) + set_light(l_range = 1.5, l_power = 2, l_color = COLOR_RED) + //time for special MR X kick you in the shins and stands there code /mob/living/simple_animal/hostile/tarrasque/mrx/DoPunch(var/atom/A) . = ..() if(.) // If we succeeded in hitting. + for(var/obj/machinery/light/light in range(5, src)) + light.flicker(10) if(isliving(A)) var/mob/living/L = A L.Weaken(5) stop_automated_movement = 1 anchored = 1 + litaf = 1 spawn(100) stop_automated_movement = 0 anchored = 0 - + litaf = 0 From a02ede4b9324a3c06e874359e1fc97200ddea5aa Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 04:43:01 +0100 Subject: [PATCH 12/20] Update tarrasque.dm --- code/modules/mob/living/simple_animal/animals/tarrasque.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index 0aebd5f716..d8432eeb29 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -125,6 +125,8 @@ ..() if (litaf) set_light(l_range = 1.5, l_power = 2, l_color = COLOR_RED) + for(/obj/machinery/door/airlock/door in range(3, src)) + door.open() //time for special MR X kick you in the shins and stands there code @@ -132,7 +134,7 @@ . = ..() if(.) // If we succeeded in hitting. for(var/obj/machinery/light/light in range(5, src)) - light.flicker(10) + light.flicker(10) if(isliving(A)) var/mob/living/L = A L.Weaken(5) From e3fb06fdf4a257c341e60f951ec4e26e5f439013 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 04:47:05 +0100 Subject: [PATCH 13/20] Update tarrasque.dm --- code/modules/mob/living/simple_animal/animals/tarrasque.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index d8432eeb29..86702a2cdd 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -119,11 +119,10 @@ "bomb" = 99, "bio" = 100, "rad" = 100) - var/litaf = 0 /mob/living/simple_animal/hostile/tarrasque/mrx/Life() ..() - if (litaf) + if (anchored) set_light(l_range = 1.5, l_power = 2, l_color = COLOR_RED) for(/obj/machinery/door/airlock/door in range(3, src)) door.open() @@ -140,8 +139,6 @@ L.Weaken(5) stop_automated_movement = 1 anchored = 1 - litaf = 1 spawn(100) stop_automated_movement = 0 anchored = 0 - litaf = 0 From 812b9f6c2c835852fd6fd09c2142536326579961 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 04:52:28 +0100 Subject: [PATCH 14/20] Update tarrasque.dm --- code/modules/mob/living/simple_animal/animals/tarrasque.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index 86702a2cdd..c51e758fe7 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -122,6 +122,8 @@ /mob/living/simple_animal/hostile/tarrasque/mrx/Life() ..() + if(resting) + resting = !resting if (anchored) set_light(l_range = 1.5, l_power = 2, l_color = COLOR_RED) for(/obj/machinery/door/airlock/door in range(3, src)) From 3d242b1424fbdee80cdb59b68e76eabb3705633f Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 04:54:23 +0100 Subject: [PATCH 15/20] Update tarrasque.dm --- code/modules/mob/living/simple_animal/animals/tarrasque.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index c51e758fe7..ca27d85247 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -128,7 +128,6 @@ set_light(l_range = 1.5, l_power = 2, l_color = COLOR_RED) for(/obj/machinery/door/airlock/door in range(3, src)) door.open() - //time for special MR X kick you in the shins and stands there code /mob/living/simple_animal/hostile/tarrasque/mrx/DoPunch(var/atom/A) From 81637b7d3ac9c19d49fbffd1ec5b823cd655ac48 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 04:56:38 +0100 Subject: [PATCH 16/20] Update tarrasque.dm --- code/modules/mob/living/simple_animal/animals/tarrasque.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index ca27d85247..f6daa8208c 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -127,7 +127,7 @@ if (anchored) set_light(l_range = 1.5, l_power = 2, l_color = COLOR_RED) for(/obj/machinery/door/airlock/door in range(3, src)) - door.open() + door.open() //time for special MR X kick you in the shins and stands there code /mob/living/simple_animal/hostile/tarrasque/mrx/DoPunch(var/atom/A) From bd063cc5bbbf3ef6c789c001584f6a5cc783715f Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 05:36:02 +0100 Subject: [PATCH 17/20] Update tarrasque.dm --- code/modules/mob/living/simple_animal/animals/tarrasque.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index f6daa8208c..39cba224ee 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -93,7 +93,7 @@ //MRX Variation /mob/living/simple_animal/hostile/tarrasque/mrx - icon = 'icons/mobs/64x64' + icon = 'icons/mob/64x64' name = "Entity X" desc = "The call of the abyss manifested." hasdrops = 0 @@ -126,7 +126,7 @@ resting = !resting if (anchored) set_light(l_range = 1.5, l_power = 2, l_color = COLOR_RED) - for(/obj/machinery/door/airlock/door in range(3, src)) + for(var/obj/machinery/door/airlock/door in range(3, src)) door.open() //time for special MR X kick you in the shins and stands there code From 9f397d4c7af9aa1a7f02455aaa4a001e3716dd6a Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 05:46:34 +0100 Subject: [PATCH 18/20] Update tarrasque.dm --- code/modules/mob/living/simple_animal/animals/tarrasque.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index 39cba224ee..9b3cb13828 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -93,7 +93,7 @@ //MRX Variation /mob/living/simple_animal/hostile/tarrasque/mrx - icon = 'icons/mob/64x64' + icon = 'icons/mob/64x64.dmi' name = "Entity X" desc = "The call of the abyss manifested." hasdrops = 0 From daff2ad4cb46e17ecaabb5df06dc703306a7807f Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 05:55:09 +0100 Subject: [PATCH 19/20] Update tarrasque.dm --- code/modules/mob/living/simple_animal/animals/tarrasque.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index 9b3cb13828..0bf6b2eac2 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -128,6 +128,8 @@ set_light(l_range = 1.5, l_power = 2, l_color = COLOR_RED) for(var/obj/machinery/door/airlock/door in range(3, src)) door.open() + spawn(4) + door.lock() //time for special MR X kick you in the shins and stands there code /mob/living/simple_animal/hostile/tarrasque/mrx/DoPunch(var/atom/A) From 9c27987d8dee7cd596dff5ff616855c760589b73 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 05:58:22 +0100 Subject: [PATCH 20/20] Update tarrasque.dm --- code/modules/mob/living/simple_animal/animals/tarrasque.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index 0bf6b2eac2..51be94b90c 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -95,7 +95,7 @@ /mob/living/simple_animal/hostile/tarrasque/mrx icon = 'icons/mob/64x64.dmi' name = "Entity X" - desc = "The call of the abyss manifested." + desc = "The call of the abyss manifested. Doors have proven inefective against it." hasdrops = 0 health = 2000 maxHealth = 2000 @@ -127,9 +127,8 @@ if (anchored) set_light(l_range = 1.5, l_power = 2, l_color = COLOR_RED) for(var/obj/machinery/door/airlock/door in range(3, src)) - door.open() - spawn(4) - door.lock() + door.open(1) + door.lock(1) //time for special MR X kick you in the shins and stands there code /mob/living/simple_animal/hostile/tarrasque/mrx/DoPunch(var/atom/A)