From f6d3114d6e05dfc957df724f57063942478cb2ad Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Sat, 9 Feb 2013 01:13:30 +1000 Subject: [PATCH] mice no longer have universal speak, carp and giant spiders will no longer carve through the station, removed unused item Signed-off-by: Cael_Aislinn --- code/modules/mob/living/simple_animal/friendly/mouse.dm | 3 ++- code/modules/mob/living/simple_animal/hostile/carp.dm | 1 + .../mob/living/simple_animal/hostile/giant_spider.dm | 1 + code/modules/mob/living/simple_animal/hostile/hostile.dm | 7 +++++-- code/modules/research/xenoarchaeology/artifact_misc.dm | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index f195004f890..16a101f0717 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -24,6 +24,7 @@ min_oxy = 16 //Require atleast 16kPA oxygen minbodytemp = 223 //Below -50 Degrees Celcius maxbodytemp = 323 //Above 50 Degrees Celcius + universal_speak = 0 /mob/living/simple_animal/mouse/Life() ..() @@ -168,4 +169,4 @@ mob/living/simple_animal/mouse/restrained() //Hotfix to stop mice from doing thi desc = "Jerry the cat is not amused." response_help = "pets" response_disarm = "gently pushes aside" - response_harm = "splats" + response_harm = "splats" diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 2f53a5a2e17..aca196f84db 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -16,6 +16,7 @@ speed = -1 maxHealth = 25 health = 25 + destroy_surroundings = 0 harm_intent_damage = 8 melee_damage_lower = 15 diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 9f5c97117bb..fb5190e08bd 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -33,6 +33,7 @@ var/busy = 0 pass_flags = PASSTABLE move_to_delay = 6 + destroy_surroundings = 0 //nursemaids - these create webs and eggs /mob/living/simple_animal/hostile/giant_spider/nurse diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 7619830a6ed..d823a4bcbd0 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -11,6 +11,7 @@ var/move_to_delay = 2 //delay for the automated movement. var/list/friends = list() stop_automated_movement_when_pulled = 0 + var/destroy_surroundings = 1 /mob/living/simple_animal/hostile/proc/FindTarget() @@ -116,11 +117,13 @@ target_mob = FindTarget() if(HOSTILE_STANCE_ATTACK) - DestroySurroundings() + if(destroy_surroundings) + DestroySurroundings() MoveToTarget() if(HOSTILE_STANCE_ATTACKING) - DestroySurroundings() + if(destroy_surroundings) + DestroySurroundings() AttackTarget() /mob/living/simple_animal/hostile/proc/OpenFire(target_mob) diff --git a/code/modules/research/xenoarchaeology/artifact_misc.dm b/code/modules/research/xenoarchaeology/artifact_misc.dm index 4cb75be9289..e30bba2f890 100644 --- a/code/modules/research/xenoarchaeology/artifact_misc.dm +++ b/code/modules/research/xenoarchaeology/artifact_misc.dm @@ -4,7 +4,7 @@ desc = "A sealed bio suit capable of resisting exotic alien energies and low pressure environments." icon_state = "engspace_suit" item_state = "engspace_suit" - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/pickaxe/hand_pick) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen) /obj/item/clothing/head/bio_hood/anomaly name = "Anomaly Hood"