From 0ae89330e74acce98e3573af158cf0c56e4dbd0c Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 14 Jun 2022 00:17:14 -0500 Subject: [PATCH 1/7] Allows mappers to spawn tilted vending machines --- code/modules/vending/_vending.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index dab16589aeef..82b77793eeda 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -171,6 +171,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C * * TRUE - all other cases */ /obj/machinery/vending/Initialize(mapload) + if(tilted) + src.tilt() // We don't need to set tilted to false before tilt because it will handle it. var/build_inv = FALSE if(!refill_canister) circuit = null From 8a8400edd1f1326b3ab644990a658efc89120624 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 14 Jun 2022 00:50:17 -0500 Subject: [PATCH 2/7] Foolproofs tipped vending machine spawn --- code/modules/vending/_vending.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 82b77793eeda..09bd4ed8e155 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -465,6 +465,9 @@ GLOBAL_LIST_EMPTY(vending_products) break /obj/machinery/vending/proc/tilt(mob/fatty, crit=FALSE) + var/no_tipper = FALSE + if(!fatty) + no_tipper = TRUE visible_message("[src] tips over!") tilted = TRUE layer = ABOVE_MOB_LAYER @@ -476,7 +479,7 @@ GLOBAL_LIST_EMPTY(vending_products) if(forcecrit) crit_case = forcecrit - if(in_range(fatty, src)) + if(in_range(fatty, src) || no_tipper) for(var/mob/living/L in get_turf(fatty)) var/mob/living/carbon/C = L From 58cf2b9ecd892fb778665d24a9fef0d742a44266 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 14 Jun 2022 00:52:03 -0500 Subject: [PATCH 3/7] Update _vending.dm --- code/modules/vending/_vending.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 09bd4ed8e155..c29d22f29162 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -547,7 +547,7 @@ GLOBAL_LIST_EMPTY(vending_products) M.Turn(pick(90, 270)) transform = M - if(get_turf(fatty) != get_turf(src)) + if(fatty && get_turf(fatty) != get_turf(src)) throw_at(get_turf(fatty), 1, 1, spin=FALSE) /obj/machinery/vending/proc/untilt(mob/user) From f80f541504d7e6072043266a9d5af512500ad686 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 14 Jun 2022 01:00:36 -0500 Subject: [PATCH 4/7] whoops, unneeded --- code/modules/vending/_vending.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index c29d22f29162..77c1c2f913ca 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -479,7 +479,7 @@ GLOBAL_LIST_EMPTY(vending_products) if(forcecrit) crit_case = forcecrit - if(in_range(fatty, src) || no_tipper) + if(in_range(fatty, src)) for(var/mob/living/L in get_turf(fatty)) var/mob/living/carbon/C = L From 111c8b452502d0a2bb6c4940a46790bd48eef923 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 14 Jun 2022 01:02:01 -0500 Subject: [PATCH 5/7] meant to do this --- code/modules/vending/_vending.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 77c1c2f913ca..6cc053bb6d2a 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -479,7 +479,7 @@ GLOBAL_LIST_EMPTY(vending_products) if(forcecrit) crit_case = forcecrit - if(in_range(fatty, src)) + if(fatty && in_range(fatty, src)) for(var/mob/living/L in get_turf(fatty)) var/mob/living/carbon/C = L From d608587f47d185e24a1cb627d0c99dc6840f9eeb Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 14 Jun 2022 01:04:09 -0500 Subject: [PATCH 6/7] Why did I create this variable --- code/modules/vending/_vending.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 6cc053bb6d2a..41affe2f9735 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -465,9 +465,6 @@ GLOBAL_LIST_EMPTY(vending_products) break /obj/machinery/vending/proc/tilt(mob/fatty, crit=FALSE) - var/no_tipper = FALSE - if(!fatty) - no_tipper = TRUE visible_message("[src] tips over!") tilted = TRUE layer = ABOVE_MOB_LAYER From d46a4124f038ba46535719f58ac7d46dcaa84f61 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 14 Jun 2022 10:01:29 -0500 Subject: [PATCH 7/7] No longer drunk so am able to see why I needed it --- code/modules/vending/_vending.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 41affe2f9735..4298c723052e 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -465,6 +465,9 @@ GLOBAL_LIST_EMPTY(vending_products) break /obj/machinery/vending/proc/tilt(mob/fatty, crit=FALSE) + var/no_tipper = FALSE + if(!fatty) + no_tipper = TRUE visible_message("[src] tips over!") tilted = TRUE layer = ABOVE_MOB_LAYER @@ -476,7 +479,7 @@ GLOBAL_LIST_EMPTY(vending_products) if(forcecrit) crit_case = forcecrit - if(fatty && in_range(fatty, src)) + if(no_tipper || in_range(fatty, src)) for(var/mob/living/L in get_turf(fatty)) var/mob/living/carbon/C = L