From 893767119e7dae70df4157d3330e8a95460cbb53 Mon Sep 17 00:00:00 2001 From: kcin2001 Date: Fri, 11 Oct 2019 18:37:21 -0700 Subject: [PATCH] makes dirt making a toggle --- code/game/turfs/simulated.dm | 3 ++- code/modules/mob/living/living.dm | 2 +- .../mob/living/simple_animal/animals/parrot.dm | 1 + .../modules/mob/living/simple_animal/animals/slime.dm | 1 + code/modules/mob/living/simple_animal/slime/slime.dm | 1 + code/modules/mob/living/simple_animal/vore/gaslamp.dm | 1 + .../mob/living/simple_animal/vore/metroidsSimple.dm | 11 +++++++---- 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index e156588937..411a1cb975 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -81,7 +81,8 @@ var/mob/living/M = A if(M.lying) return ..() - + if(!M.create_dirt) + return ..() // Dirt overlays. update_dirt() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 7db8e1e7a4..4fed210c8f 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1,6 +1,6 @@ /mob/living //for defining variables which all living mobs needs for various reasons var/entangle_immunity = 0 - + var/create_dirt = 1 /mob/living/New() ..() diff --git a/code/modules/mob/living/simple_animal/animals/parrot.dm b/code/modules/mob/living/simple_animal/animals/parrot.dm index 4582c7bc61..64f9f64af1 100644 --- a/code/modules/mob/living/simple_animal/animals/parrot.dm +++ b/code/modules/mob/living/simple_animal/animals/parrot.dm @@ -37,6 +37,7 @@ icon_living = "parrot_fly" icon_dead = "parrot_dead" intelligence_level = SA_ANIMAL + create_dirt = 0 turns_per_move = 5 pass_flags = PASSTABLE diff --git a/code/modules/mob/living/simple_animal/animals/slime.dm b/code/modules/mob/living/simple_animal/animals/slime.dm index 8c6ef9cf82..156d412e63 100644 --- a/code/modules/mob/living/simple_animal/animals/slime.dm +++ b/code/modules/mob/living/simple_animal/animals/slime.dm @@ -6,6 +6,7 @@ icon_state = "grey baby slime" icon_living = "grey baby slime" icon_dead = "grey baby slime dead" + create_dirt = 0 maxHealth = 100 health = 100 diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index e69d547a93..6ec96b2a3e 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -10,6 +10,7 @@ var/glows = FALSE // If true, will glow in the same color as the color var. var/icon_state_override = null // Used for special slime appearances like the rainbow slime. pass_flags = PASSTABLE + create_dirt = 0 speak_emote = list("chirps") diff --git a/code/modules/mob/living/simple_animal/vore/gaslamp.dm b/code/modules/mob/living/simple_animal/vore/gaslamp.dm index 8df8d216b4..e6f262aaf0 100644 --- a/code/modules/mob/living/simple_animal/vore/gaslamp.dm +++ b/code/modules/mob/living/simple_animal/vore/gaslamp.dm @@ -18,6 +18,7 @@ TODO: Make them light up and heat the air when exposed to oxygen. icon_state = "gaslamp" icon_living = "gaslamp" icon_dead = "gaslamp-dead" + create_dirt = 0 faction = "virgo3b" maxHealth = 100 diff --git a/code/modules/mob/living/simple_animal/vore/metroidsSimple.dm b/code/modules/mob/living/simple_animal/vore/metroidsSimple.dm index 4fe89d8c30..71c418eec6 100644 --- a/code/modules/mob/living/simple_animal/vore/metroidsSimple.dm +++ b/code/modules/mob/living/simple_animal/vore/metroidsSimple.dm @@ -24,6 +24,7 @@ var/global/list/queen_amount = 0 //We only gonna want 1 queen in the world. response_harm = "hits" harm_intent_damage = 5 isEdible = 0 //They cannot be eaten while alive. + create_dirt = 0 var/canEvolve = 1 //A variable for admins to turn off and on for when they like assign a player as a mob. I want to add a verb so that they can do it on command when the conditions are right in the future. var/obj/machinery/atmospherics/unary/vent_pump/entry_vent //Graciously stolen from spider code @@ -129,7 +130,7 @@ var/global/list/queen_amount = 0 //We only gonna want 1 queen in the world. "energy" = -50, "bomb" = 70, "bio" = 100, - "rad" = 100) + "rad" = 100) vore_active = 1 vore_bump_chance = 0 vore_capacity = 3 @@ -159,7 +160,7 @@ var/global/list/queen_amount = 0 //We only gonna want 1 queen in the world. var/obj/belly/B = vore_selected B.digest_burn = 1 B.digest_brute = 0 - + /mob/living/simple_animal/hostile/metroid/mine/death() playsound(src, 'sound/effects/metroiddeath.ogg', 50, 1) @@ -518,6 +519,7 @@ var/global/list/queen_amount = 0 //We only gonna want 1 queen in the world. gender = NEUTER faction = "metroids" move_to_delay = 4 + create_dirt = 1 move_shoot = 1 //Move and shoot at the same time. ranged_cooldown = 0 //What the starting cooldown is on ranged attacks @@ -619,6 +621,7 @@ var/global/list/queen_amount = 0 //We only gonna want 1 queen in the world. rapid = 0 // Three-round-burst fire mode projectiletype = /obj/item/projectile/beam/smalllaser // The projectiles I shoot projectilesound = 'sound/weapons/Flamer.ogg' // The sound I make when I do it + create_dirt = 1 //Unaffected by atmos. minbodytemp = 0 @@ -712,6 +715,7 @@ var/global/list/queen_amount = 0 //We only gonna want 1 queen in the world. rapid = 1 // Three-round-burst fire mode projectiletype = /obj/item/projectile/energy/metroidacid // The projectiles I shoot projectilesound = 'sound/weapons/slashmiss.ogg' // The sound I make when I do it + create_dirt = 1 //Unaffected by atmos. minbodytemp = 0 @@ -875,7 +879,7 @@ var/global/list/queen_amount = 0 //We only gonna want 1 queen in the world. /mob/living/simple_animal/hostile/metroid/evolution/proc/handle_idle() //Do we have a vent ? Good, let's take a look - + for(entry_vent in view(1, src)) if(prob(99)) //1% chance to consider a vent, to try and avoid constant vent switching return @@ -1279,4 +1283,3 @@ var/global/list/queen_amount = 0 //We only gonna want 1 queen in the world. if(target_mob.stat == DEAD) return 1 // Melee (eat) the target if dead, don't shoot it. return ..() - \ No newline at end of file