From 3df671f8d06cb59fff94db9d0aaa6f8b28cda87f Mon Sep 17 00:00:00 2001 From: cib Date: Mon, 18 Feb 2013 22:52:41 +0100 Subject: [PATCH 1/5] Attempt to fix issue #2371 - Halves drone speed - Copied over the exact values from space-carp for spaceproofness, though it should already have worked before - Untested(whooo uni) --- .../mob/living/simple_animal/hostile/retaliate/drone.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm index fe6f3c7ba43..5edb88c7682 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm @@ -19,7 +19,7 @@ stop_automated_movement_when_pulled = 0 health = 300 maxHealth = 300 - speed = 4 + speed = 8 projectiletype = /obj/item/projectile/beam/drone projectilesound = 'sound/weapons/laser3.ogg' destroy_surroundings = 0 @@ -35,11 +35,16 @@ var/disabled = 0 var/exploding = 0 + //Drones aren't affected by atmos. min_oxy = 0 + max_oxy = 0 + min_tox = 0 max_tox = 0 + min_co2 = 0 max_co2 = 0 + min_n2 = 0 + max_n2 = 0 minbodytemp = 0 - maxbodytemp = 600 var/has_loot = 1 faction = "malf_drone" From da8e83710ff533f61f207354629d8a49cb78bfbd Mon Sep 17 00:00:00 2001 From: cib Date: Mon, 18 Feb 2013 23:02:03 +0100 Subject: [PATCH 2/5] Fixes issue #2367 Even characters created before nt_relation option now get to choose. --- code/modules/client/preferences_savefile.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 5727e7b671e..f60a5409da9 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -151,6 +151,7 @@ metadata = sanitize_text(metadata, initial(metadata)) real_name = reject_bad_name(real_name) if(isnull(species)) species = "Human" + if(isnull(nanotrasen_relation)) nanotrasen_relation = initial(nanotrasen_relation) if(!real_name) real_name = random_name() be_random_name = sanitize_integer(be_random_name, 0, 1, initial(be_random_name)) gender = sanitize_gender(gender) From 3877d0c0b8cfcd21ef1909e7fa7ef676baa72c92 Mon Sep 17 00:00:00 2001 From: cib Date: Mon, 18 Feb 2013 23:02:38 +0100 Subject: [PATCH 3/5] Fixes issue #2363 Maptools now points to the right map again. --- maptools/clean_map.bat | 3 +-- maptools/prepare_map.bat | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/maptools/clean_map.bat b/maptools/clean_map.bat index 8ce90510b2e..804c8a41f46 100644 --- a/maptools/clean_map.bat +++ b/maptools/clean_map.bat @@ -1,2 +1 @@ -java -jar MapPatcher.jar -clean ../maps/tgstation.2.0.9.1.dmm.backup ../maps/tgstation.2.0.9.1.dmm ../maps/tgstation.2.0.9.1.dmm -del ../maps/tgstation.2.0.9.1.dmm.backup +java -jar MapPatcher.jar -clean ../maps/tgstation.2.1.0.0.1.dmm.backup ../maps/tgstation.2.1.0.0.1.dmm ../maps/tgstation.2.1.0.0.1.dmm \ No newline at end of file diff --git a/maptools/prepare_map.bat b/maptools/prepare_map.bat index 92a1aa44f7e..dec9fa9ecbc 100644 --- a/maptools/prepare_map.bat +++ b/maptools/prepare_map.bat @@ -1,2 +1,2 @@ cd ../maps -copy tgstation.2.0.9.1.dmm tgstation.2.0.9.1.dmm.backup +copy tgstation.2.1.0.0.1.dmm tgstation.2.1.0.0.1.dmm.backup From 0e70040810cf4d76e198e6d8f3a657eee7e14413 Mon Sep 17 00:00:00 2001 From: cib Date: Mon, 18 Feb 2013 23:30:20 +0100 Subject: [PATCH 4/5] Fix to issue #2371 Increased the simple_animal/hostile/move_to_delay, which seems to be an entirely separate value for speed. This code is so messed up. --- code/modules/mob/living/simple_animal/hostile/hostile.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index abeeb068810..c7b2aa74f9c 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -8,7 +8,7 @@ var/projectiletype var/projectilesound var/casingtype - var/move_to_delay = 2 //delay for the automated movement. + var/move_to_delay = 4 //delay for the automated movement. var/list/friends = list() var/break_stuff_probability = 10 stop_automated_movement_when_pulled = 0 From 18a552af0a940e12a26257c038e2f1e327a8ffce Mon Sep 17 00:00:00 2001 From: cib Date: Mon, 18 Feb 2013 23:35:51 +0100 Subject: [PATCH 5/5] Fixed problem where hostile animals would attack even the dead. --- code/modules/mob/living/simple_animal/simple_animal.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index b8b6d31312b..c34b4af3041 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -446,7 +446,7 @@ /mob/living/simple_animal/proc/SA_attackable(target_mob) if (isliving(target_mob)) var/mob/living/L = target_mob - if(!L.stat || L.health <= 0) + if(!L.stat && L.health >= 0) return (0) if (istype(target_mob,/obj/mecha)) var/obj/mecha/M = target_mob