From 2ad966435a2e70b4f2d1835efddf696b9f971331 Mon Sep 17 00:00:00 2001 From: Archie Date: Mon, 31 May 2021 13:15:35 -0300 Subject: [PATCH 1/3] Something about taming vending machines --- code/modules/vending/_vending.dm | 34 ++++---------------------------- 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index b256d861..590835f9 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -258,7 +258,6 @@ 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, "You insert [cred] into [src].") @@ -266,38 +265,13 @@ 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)) - if(coin) - to_chat(user, "[src] already has [coin] inserted") - return - if(bill) - to_chat(user, "[src] already has [bill] inserted") - return - if(!premium.len) - to_chat(user, "[src] doesn't have a coin slot.") - return - if(!user.transferItemToLoc(I, src)) - return - coin = I - to_chat(user, "You insert [I] into [src].") + to_chat(user, "[src] doesn't seem to accept this kind of currency anymore.") return else if(istype(I, /obj/item/stack/spacecash)) - if(coin) - to_chat(user, "[src] already has [coin] inserted") - return - if(bill) - to_chat(user, "[src] already has [bill] inserted") - return - var/obj/item/stack/S = I - if(!premium.len) - to_chat(user, "[src] doesn't have a bill slot.") - return - S.use(1) - bill = new S.type(src, 1) - to_chat(user, "You insert [I] into [src].") + to_chat(user, "[src] doesn't seem to accept this kind of currency anymore.") return - */ + else if(refill_canister && istype(I, refill_canister)) if (!panel_open) to_chat(user, "You should probably unscrew the service panel first.") @@ -318,7 +292,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C return else . = ..() - if(tiltable && !tilted && I.force) + if(tiltable && !tilted && I.force && user.a_intent != INTENT_HELP) //Now we roll the dice. Thrown items do not trigger this, btw. switch(rand(1, 100)) if(1 to 5) freebie(user, 3) From c31112cc72d6e94733b9e27b695dabf6dc31e614 Mon Sep 17 00:00:00 2001 From: Archie Date: Mon, 31 May 2021 13:24:52 -0300 Subject: [PATCH 2/3] Also that. --- 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 590835f9..8806b798 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -381,7 +381,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C "Oh f-") O.dismember() O.drop_organs() - qdel(O) + //qdel(O) Deleting people's heads makes them angy 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) From 725f8f96de239942fefcfe6cfe7a59a85ee037d1 Mon Sep 17 00:00:00 2001 From: Archie Date: Mon, 31 May 2021 13:37:50 -0300 Subject: [PATCH 3/3] And this. --- code/modules/vending/_vending.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 8806b798..65451dfb 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -374,14 +374,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("[C]'s spinal cord is obliterated with a sickening crunch!", ignored_mobs = list(C)) C.gain_trauma(/datum/brain_trauma/severe/paralysis/paraplegic) - if(5) // skull squish! + if(5) // dismember head var/obj/item/bodypart/head/O = C.get_bodypart(BODY_ZONE_HEAD) if(O) C.visible_message("[O] explodes in a shower of gore beneath [src]!", \ "Oh f-") O.dismember() - O.drop_organs() - //qdel(O) Deleting people's heads makes them angy + /*O.drop_organs() + qdel(O) Deleting people's heads makes them angy*/ 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)