From 519d821a5c78dd462e4b49ad3e1016b2fd5f7833 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Sat, 15 Jan 2022 17:00:37 -0500 Subject: [PATCH 1/9] Add missing wire I even triple checked the line but I missed it. Fixes https://github.com/VOREStation/VOREStation/issues/12073 --- maps/stellardelight/stellar_delight3.dmm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maps/stellardelight/stellar_delight3.dmm b/maps/stellardelight/stellar_delight3.dmm index f3bc83c4ab..6fcffa8ca6 100644 --- a/maps/stellardelight/stellar_delight3.dmm +++ b/maps/stellardelight/stellar_delight3.dmm @@ -13027,6 +13027,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "Ve" = ( From c700309efd6b47f07bbef5bbbe64f5838b889d37 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 16 Jan 2022 16:12:14 +1000 Subject: [PATCH 2/9] Fixes wrench dropping when deconstructing low wall + allows normal climbing --- code/game/objects/structures/low_wall.dm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/low_wall.dm b/code/game/objects/structures/low_wall.dm index 267585a044..f50ea247b5 100644 --- a/code/game/objects/structures/low_wall.dm +++ b/code/game/objects/structures/low_wall.dm @@ -99,6 +99,7 @@ if(do_after(user, 40, src)) to_chat(user, "You dissasembled the low wall!") dismantle() + return // Handle placing things if(isrobot(user)) @@ -121,7 +122,14 @@ return FALSE return TRUE -/obj/structure/low_wall/MouseDrop_T(obj/O, mob/user, src_location, over_location, src_control, over_control, params) +/obj/structure/low_wall/MouseDrop_T(atom/movable/AM, mob/user, src_location, over_location, src_control, over_control, params) + if(AM == user) + var/mob/living/H = user + if(istype(H) && can_climb(H)) + do_climb(AM) + var/obj/O = AM + if(!istype(O)) + return if(istype(O, /obj/structure/window)) var/obj/structure/window/W = O if(Adjacent(W) && !W.anchored) From 4ab7516c164aae34feb43be84b4098360837b2d2 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 16 Jan 2022 16:20:31 +1000 Subject: [PATCH 3/9] Makes pocky not leave behind trash gum --- code/game/objects/items/weapons/chewables.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm index 93a2df1615..181db77e91 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -254,6 +254,7 @@ desc = "A chocolate-coated biscuit stick." icon_state = "pockystick" item_state = "pocky" + type_butt = null /obj/item/clothing/mask/chewable/candy/pocky/process() chew() From 71081477f09d2b0307d29523f33c8f0fc7b84d62 Mon Sep 17 00:00:00 2001 From: TheDavestDave <30513964+TheDavestDave@users.noreply.github.com> Date: Mon, 17 Jan 2022 00:17:52 +0000 Subject: [PATCH 4/9] Update misc_vr.dm --- code/datums/supplypacks/misc_vr.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/supplypacks/misc_vr.dm b/code/datums/supplypacks/misc_vr.dm index 8e5ae55125..8aa289e949 100644 --- a/code/datums/supplypacks/misc_vr.dm +++ b/code/datums/supplypacks/misc_vr.dm @@ -169,4 +169,5 @@ access_security,) one_access = TRUE - containername = "sword crate" \ No newline at end of file + containername = "sword crate" + containertype = /obj/structure/closet/crate/secure/gear \ No newline at end of file From 8fc931f35de26bdec6866067382b8158c8770a54 Mon Sep 17 00:00:00 2001 From: liache <76535603+liache@users.noreply.github.com> Date: Tue, 18 Jan 2022 15:51:41 -0500 Subject: [PATCH 5/9] Update alienwhitelist.txt https://forum.vore-station.net/viewtopic.php?f=46&t=2054&sid=93071f70ea07b4512929d45af3e76001 --- config/alienwhitelist.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt index de650d4105..f50ee7fb5a 100644 --- a/config/alienwhitelist.txt +++ b/config/alienwhitelist.txt @@ -103,6 +103,7 @@ thedavestdave - Protean timidvi - Diona trifireblade - Protean trikonei - Protean +umbraferros - Protean umbrenos - Black-Eyed Shadekin varonis - Xenochimera verkister - Xenochimera From 2e550be4293ecdf529268fea67d04d15ec81ae38 Mon Sep 17 00:00:00 2001 From: Heroman Date: Wed, 19 Jan 2022 10:18:01 +1000 Subject: [PATCH 6/9] Fixes robot icon breaking when canceling during sprite selection --- code/modules/mob/living/silicon/robot/robot.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 0a27ff8899..815ba3a598 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1026,6 +1026,8 @@ icontype = module_sprites[1] else icontype = tgui_input_list(usr, "Select an icon! [triesleft ? "You have [triesleft] more chance\s." : "This is your last try."]", "Robot Icon", module_sprites) + if(!icontype) + icontype = module_sprites[1] if(notransform) //VOREStation edit start: sprite animation to_chat(src, "Your current transformation has not finished yet!") choose_icon(icon_selection_tries, module_sprites) From 1cbf4d51baa3ebdfa2de814928550430512f4853 Mon Sep 17 00:00:00 2001 From: Heroman Date: Wed, 19 Jan 2022 12:05:40 +1000 Subject: [PATCH 7/9] Fixes AI subsystem locking up on trying to process null entries --- code/controllers/subsystems/ai.dm | 11 +++++++---- code/modules/ai/ai_holder.dm | 12 +++++++++--- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/code/controllers/subsystems/ai.dm b/code/controllers/subsystems/ai.dm index 9df293f417..41fb3a7e29 100644 --- a/code/controllers/subsystems/ai.dm +++ b/code/controllers/subsystems/ai.dm @@ -10,7 +10,7 @@ SUBSYSTEM_DEF(ai) var/list/currentrun = list() var/slept_mobs = 0 - var/list/process_z = list() + var/list/process_z = list() /datum/controller/subsystem/ai/stat_entry(msg_prefix) ..("P: [processing.len] | S: [slept_mobs]") @@ -32,10 +32,13 @@ SUBSYSTEM_DEF(ai) while(currentrun.len) var/datum/ai_holder/A = currentrun[currentrun.len] --currentrun.len - var/mob/living/L = A.holder //VOREStation Edit Start - if(!A || QDELETED(A) || !L?.loc || A.busy) // Doesn't exist or won't exist soon or not doing it this tick + if(!A || QDELETED(A) || A.busy) // Doesn't exist or won't exist soon or not doing it this tick continue - + + var/mob/living/L = A.holder //VOREStation Edit Start + if(!L?.loc) + continue + if(process_z[get_z(L)] || !L.low_priority) //VOREStation Edit End A.handle_strategicals() else diff --git a/code/modules/ai/ai_holder.dm b/code/modules/ai/ai_holder.dm index 86ab848733..8a101decd7 100644 --- a/code/modules/ai/ai_holder.dm +++ b/code/modules/ai/ai_holder.dm @@ -131,7 +131,7 @@ IF_VV_OPTION("mass_edit_finish") if(!check_rights(R_ADMIN)) return - + var/list/before = snapshot //This PROBABLY works, right? snapshot = null var/list/after = vars.Copy() //'vars' appears to be special in that vars.Copy produces a flat list of keys with no values. It seems that 'vars[key]' is handled somewhere in the byond engine differently than normal lists. @@ -183,7 +183,7 @@ found += M choices["[typechoice] ([found.len])"] = found // Prettified name for the user input below) searching = found // Now we only search the list we just made, because of the order of our types list, each subsequent list will be a subset of the one we just finished - + var/choice = tgui_input_list(usr,"Based on your AI holder's mob location, we'll edit mobs on Z [levels_working.Join(",")]. What types do you want to alter?", "Types", choices) if(!choice) href_list["datumrefresh"] = "\ref[src]" @@ -201,7 +201,7 @@ L.ai_holder.vars[newvar] = after[newvar] else to_chat(usr,"Skipping unavailable var '[newvar]' on: [L] [ADMIN_COORDJMP(L)]") - + to_chat(usr,"Mass AI edit done.") href_list["datumrefresh"] = "\ref[src]" @@ -291,6 +291,9 @@ // 'Tactical' processes such as moving a step, meleeing an enemy, firing a projectile, and other fairly cheap actions that need to happen quickly. /datum/ai_holder/proc/handle_tactics() + if(!istype(holder) || QDELETED(holder)) + qdel(src) + return if(holder.key && !autopilot) return handle_special_tactic() @@ -298,6 +301,9 @@ // 'Strategical' processes that are more expensive on the CPU and so don't get run as often as the above proc, such as A* pathfinding or robust targeting. /datum/ai_holder/proc/handle_strategicals() + if(!istype(holder) || QDELETED(holder)) + qdel(src) + return if(holder.key && !autopilot) return handle_special_strategical() From 520de6a506aaf622e06d90c23e3c1d5e8cf20d17 Mon Sep 17 00:00:00 2001 From: faaaay <69845288+faaaay@users.noreply.github.com> Date: Thu, 20 Jan 2022 19:57:13 +0000 Subject: [PATCH 8/9] add coolcrow420 (BE-shadekin) --- config/alienwhitelist.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt index de650d4105..564f6491e8 100644 --- a/config/alienwhitelist.txt +++ b/config/alienwhitelist.txt @@ -20,6 +20,7 @@ chargae - Protean chemlight - Xenochimera chillyfang - Black-Eyed Shadekin comradenitro - Protean +coolcrow420 - Black-Eyed Shadekin crossexonar - Protean detectivegoogle - Protean digitalsquirrel95 - Black-Eyed Shadekin From 40dcebf3705630a592ad3bb1a99ba824a6ad359d Mon Sep 17 00:00:00 2001 From: TankTheBirb <96669534+TankTheBirb@users.noreply.github.com> Date: Thu, 20 Jan 2022 15:24:03 -0500 Subject: [PATCH 9/9] Adding tankthebirb and satinisle Both apps for Black-Eyed Shadekin accepted recently. tankthebirb - https://forum.vore-station.net/viewtopic.php?f=46&t=2082 satinisle - https://forum.vore-station.net/viewtopic.php?f=46&t=2078 --- config/alienwhitelist.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt index 1d13be8f3f..7c81af4e25 100644 --- a/config/alienwhitelist.txt +++ b/config/alienwhitelist.txt @@ -83,6 +83,7 @@ rubyflamewing - Protean rykkastormheart - Xenochimera ryumi - Protean ryumi - Xenochimera +satinisle - Black-Eyed Shadekin scoutisafolflol - Xenochimera seiga - Vox sepulchre - Vox @@ -94,6 +95,7 @@ spirit1299 - Black-Eyed Shadekin stackerrobot - Protean storesund97 - Protean syzygyrior - Black-Eyed Shadekin +tankthebirb - Black-Eyed Shadekin tastypred - Black-Eyed Shadekin tastypred - Protean tastypred - Xenochimera