From ec387261f919767feb9a150d430a716e23336263 Mon Sep 17 00:00:00 2001 From: Shadow-Quill <44811257+Shadow-Quill@users.noreply.github.com> Date: Thu, 29 Aug 2019 07:56:21 -0500 Subject: [PATCH 1/8] Stop it! Get some help. --- .../living/simple_animal/hostile/mining/necropolis_tendril.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm b/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm index c6bc205627e..1868cb00d9c 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm @@ -17,6 +17,7 @@ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 maxbodytemp = INFINITY + move_resist = INFINITY loot = list(/obj/effect/collapse, /obj/structure/closet/crate/necropolis/tendril) del_on_death = 1 var/gps = null @@ -76,4 +77,4 @@ mob_types = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril) /mob/living/simple_animal/hostile/spawner/lavaland/legion - mob_types = list(/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril) \ No newline at end of file + mob_types = list(/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril) From 6cffcac0daaee4e73bc60c75c5618e10f4d6fb20 Mon Sep 17 00:00:00 2001 From: Shadow Date: Thu, 29 Aug 2019 18:04:32 -0500 Subject: [PATCH 2/8] the anchorening --- .../living/simple_animal/hostile/mining/necropolis_tendril.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm b/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm index 1868cb00d9c..e910bac7ca3 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm @@ -18,6 +18,7 @@ minbodytemp = 0 maxbodytemp = INFINITY move_resist = INFINITY + anchored = TRUE loot = list(/obj/effect/collapse, /obj/structure/closet/crate/necropolis/tendril) del_on_death = 1 var/gps = null From 91a0e50673339429b903aff4e802ba454e3b43d7 Mon Sep 17 00:00:00 2001 From: Shadow Date: Thu, 29 Aug 2019 18:15:24 -0500 Subject: [PATCH 3/8] removal --- .../living/simple_animal/hostile/mining/necropolis_tendril.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm b/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm index e910bac7ca3..1868cb00d9c 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm @@ -18,7 +18,6 @@ minbodytemp = 0 maxbodytemp = INFINITY move_resist = INFINITY - anchored = TRUE loot = list(/obj/effect/collapse, /obj/structure/closet/crate/necropolis/tendril) del_on_death = 1 var/gps = null From aab72a5d5cb23a5c27450181624f778d1fd39309 Mon Sep 17 00:00:00 2001 From: Shadow Date: Thu, 29 Aug 2019 18:22:04 -0500 Subject: [PATCH 4/8] 3 big 5 me --- code/game/objects/structures/crates_lockers/closets.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 2037293d734..4c62334f5d3 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -99,6 +99,8 @@ itemcount++ for(var/mob/M in loc) + if(M.mob_size <= MOB_SIZE_LARGE) // No more stuffing xeno empresses into lockers + return FALSE if(itemcount >= storage_capacity) break if(istype(M, /mob/dead/observer)) From f47716bf5e152ba6b48b1ef61629c9b5e98b18f7 Mon Sep 17 00:00:00 2001 From: Shadow Date: Thu, 29 Aug 2019 18:31:32 -0500 Subject: [PATCH 5/8] EMBIGGENED! --- .../living/simple_animal/hostile/mining/necropolis_tendril.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm b/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm index 1868cb00d9c..75ff6299943 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm @@ -18,6 +18,7 @@ minbodytemp = 0 maxbodytemp = INFINITY move_resist = INFINITY + mob_size = MOB_SIZE_LARGE loot = list(/obj/effect/collapse, /obj/structure/closet/crate/necropolis/tendril) del_on_death = 1 var/gps = null From a4b3030e4a428cbdd751c58750099623151338b8 Mon Sep 17 00:00:00 2001 From: Shadow Date: Thu, 29 Aug 2019 19:14:21 -0500 Subject: [PATCH 6/8] mfw I forget to anchor --- code/game/objects/structures/crates_lockers/closets.dm | 5 ++--- .../simple_animal/hostile/mining/necropolis_tendril.dm | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 4c62334f5d3..9f2f51d0046 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -19,6 +19,7 @@ var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate then open it in a populated area to crash clients. var/material_drop = /obj/item/stack/sheet/metal var/material_drop_amount = 2 + var/mob_size = MOB_SIZE_LARGE /obj/structure/closet/New() ..() @@ -99,15 +100,13 @@ itemcount++ for(var/mob/M in loc) - if(M.mob_size <= MOB_SIZE_LARGE) // No more stuffing xeno empresses into lockers - return FALSE if(itemcount >= storage_capacity) break if(istype(M, /mob/dead/observer)) continue if(istype(M, /mob/living/simple_animal/bot/mulebot)) continue - if(M.buckled) + if(M.buckled || M.anchored) continue M.forceMove(src) diff --git a/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm b/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm index 75ff6299943..51778c40bbe 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm @@ -18,6 +18,7 @@ minbodytemp = 0 maxbodytemp = INFINITY move_resist = INFINITY + anchored = TRUE mob_size = MOB_SIZE_LARGE loot = list(/obj/effect/collapse, /obj/structure/closet/crate/necropolis/tendril) del_on_death = 1 From 82860bc8753752414953b7dcab56766ff7813c1f Mon Sep 17 00:00:00 2001 From: Shadow Date: Thu, 29 Aug 2019 19:34:43 -0500 Subject: [PATCH 7/8] MFW I FORGET TO UNEMBIGGEN --- .../living/simple_animal/hostile/mining/necropolis_tendril.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm b/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm index 51778c40bbe..e910bac7ca3 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm @@ -19,7 +19,6 @@ maxbodytemp = INFINITY move_resist = INFINITY anchored = TRUE - mob_size = MOB_SIZE_LARGE loot = list(/obj/effect/collapse, /obj/structure/closet/crate/necropolis/tendril) del_on_death = 1 var/gps = null From 4da42577562dc00d0eaeb921ec64472c203a674b Mon Sep 17 00:00:00 2001 From: Shadow Date: Thu, 29 Aug 2019 19:51:10 -0500 Subject: [PATCH 8/8] whoops, spilled my meme --- code/game/objects/structures/crates_lockers/closets.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 9f2f51d0046..dba81195e6e 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -19,7 +19,6 @@ var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate then open it in a populated area to crash clients. var/material_drop = /obj/item/stack/sheet/metal var/material_drop_amount = 2 - var/mob_size = MOB_SIZE_LARGE /obj/structure/closet/New() ..()