From 3218c844bb80d02ee71186e1616252a718faef2f Mon Sep 17 00:00:00 2001
From: Dahlular <55758850+Dahlular@users.noreply.github.com>
Date: Tue, 1 Jun 2021 04:06:42 -0600
Subject: [PATCH] Revert "Something about taming vending machines"

---
 code/modules/vending/_vending.dm | 40 ++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index 65451dfb..b256d861 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -258,6 +258,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 		wires.interact(user)
 		return
 
+
 	else if(istype(I, /obj/item/stack/credits))
 		var/obj/item/stack/credits/cred = I
 		to_chat(usr, "<span class='notice'>You insert [cred] into [src].</span>")
@@ -265,13 +266,38 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 		src.ui_interact(usr)
 		del(cred)
 
+	/* we dont use this currency anymore!
 	else if(istype(I, /obj/item/coin))
-		to_chat(user, "<span class='notice'>[src] doesn't seem to accept this kind of currency anymore.</span>")
+		if(coin)
+			to_chat(user, "<span class='warning'>[src] already has [coin] inserted</span>")
+			return
+		if(bill)
+			to_chat(user, "<span class='warning'>[src] already has [bill] inserted</span>")
+			return
+		if(!premium.len)
+			to_chat(user, "<span class='warning'>[src] doesn't have a coin slot.</span>")
+			return
+		if(!user.transferItemToLoc(I, src))
+			return
+		coin = I
+		to_chat(user, "<span class='notice'>You insert [I] into [src].</span>")
 		return
 	else if(istype(I, /obj/item/stack/spacecash))
-		to_chat(user, "<span class='notice'>[src] doesn't seem to accept this kind of currency anymore.</span>")
+		if(coin)
+			to_chat(user, "<span class='warning'>[src] already has [coin] inserted</span>")
+			return
+		if(bill)
+			to_chat(user, "<span class='warning'>[src] already has [bill] inserted</span>")
+			return
+		var/obj/item/stack/S = I
+		if(!premium.len)
+			to_chat(user, "<span class='warning'>[src] doesn't have a bill slot.</span>")
+			return
+		S.use(1)
+		bill = new S.type(src, 1)
+		to_chat(user, "<span class='notice'>You insert [I] into [src].</span>")
 		return
-
+	*/
 	else if(refill_canister && istype(I, refill_canister))
 		if (!panel_open)
 			to_chat(user, "<span class='notice'>You should probably unscrew the service panel first.</span>")
@@ -292,7 +318,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 			return
 	else
 		. = ..()
-		if(tiltable && !tilted && I.force && user.a_intent != INTENT_HELP) //Now we roll the dice. Thrown items do not trigger this, btw.
+		if(tiltable && !tilted && I.force)
 			switch(rand(1, 100))
 				if(1 to 5)
 					freebie(user, 3)
@@ -374,14 +400,14 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 						// the new paraplegic gets like 4 lines of losing their legs so skip them
 						visible_message("<span class='danger'>[C]'s spinal cord is obliterated with a sickening crunch!</span>", ignored_mobs = list(C))
 						C.gain_trauma(/datum/brain_trauma/severe/paralysis/paraplegic)
-					if(5) // dismember head
+					if(5) // skull squish!
 						var/obj/item/bodypart/head/O = C.get_bodypart(BODY_ZONE_HEAD)
 						if(O)
 							C.visible_message("<span class='danger'>[O] explodes in a shower of gore beneath [src]!</span>", \
 								"<span class='userdanger'>Oh f-</span>")
 							O.dismember()
-							/*O.drop_organs()
-							qdel(O) Deleting people's heads makes them angy*/
+							O.drop_organs()
+							qdel(O)
 							new /obj/effect/gibspawner/human/bodypartless(get_turf(C))
 				C.apply_damage(max(0, squish_damage - crit_rebate), BRUTE)
 				C.AddElement(/datum/element/squish, 60 SECONDS)