From 43abc839f0b9daff961640f15c29c76eb4da7adb Mon Sep 17 00:00:00 2001 From: Casey Date: Sun, 18 Sep 2022 05:34:21 -0400 Subject: [PATCH 1/2] Adjusts emagged booze --- .../mob/living/silicon/robot/robot_modules/station.dm | 3 ++- .../living/silicon/robot/robot_modules/station_vr.dm | 10 ++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm index 4babec0baa..76a479a80d 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -680,7 +680,8 @@ var/global/list/robot_modules = list( src.emag.reagents = R R.my_atom = src.emag R.add_reagent("beer2", 50) - src.emag.name = "Mickey Finn's Special Brew" + src.emag.name = "Auntie Hong's Final Sip" + src.emag.desc = "A bottle of very special mix of alcohol and poison. Some may argue that there's alcohol to die for, but Auntie Hong took it to next level." /obj/item/weapon/robot_module/robot/clerical/general name = "clerical robot module" diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm index 128bffbc09..1da416ec6b 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm @@ -1084,13 +1084,7 @@ src.modules += new /obj/item/weapon/tray/robotray(src) src.modules += new /obj/item/weapon/reagent_containers/borghypo/service(src) - src.emag = new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer(src) - var/datum/reagents/N = new/datum/reagents(50) - src.emag.reagents = N - N.my_atom = src.emag - N.add_reagent("beer2", 50) - src.emag.name = "Mickey Finn's Special Brew" R.icon = 'icons/mob/widerobot_colors_vr.dmi' R.wideborg_dept = 'icons/mob/widerobot_colors_vr.dmi' R.hands.icon = 'icons/mob/screen1_robot_vr.dmi' @@ -1109,6 +1103,7 @@ /obj/item/weapon/robot_module/robot/booze/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) var/obj/item/weapon/reagent_containers/food/condiment/enzyme/E = locate() in src.modules +<<<<<<< HEAD E.reagents.add_reagent("enzyme", 2 * amount) if(src.emag) var/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/B = src.emag @@ -1207,3 +1202,6 @@ R.verbs -= /mob/living/silicon/robot/proc/rest_style ..() // CH changes - Unity Hound end +======= + E.reagents.add_reagent("enzyme", 2 * amount) +>>>>>>> 9976b61395... Merge pull request #13732 from Heroman3003/emag-booze From 9bc48ac881447e0f9f1d9014921dde9f4327a375 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Thu, 22 Sep 2022 20:12:26 -0700 Subject: [PATCH 2/2] powder that makes you say yes --- .../mob/living/silicon/robot/robot_modules/station_vr.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm index 1da416ec6b..0127068772 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm @@ -1103,11 +1103,7 @@ /obj/item/weapon/robot_module/robot/booze/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) var/obj/item/weapon/reagent_containers/food/condiment/enzyme/E = locate() in src.modules -<<<<<<< HEAD E.reagents.add_reagent("enzyme", 2 * amount) - if(src.emag) - var/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/B = src.emag - B.reagents.add_reagent("beer2", 2 * amount) //CHOMP addition start BORGHYPO /obj/item/weapon/reagent_containers/borghypo/service/booze @@ -1201,7 +1197,3 @@ R.verbs -= /mob/living/proc/shred_limb R.verbs -= /mob/living/silicon/robot/proc/rest_style ..() -// CH changes - Unity Hound end -======= - E.reagents.add_reagent("enzyme", 2 * amount) ->>>>>>> 9976b61395... Merge pull request #13732 from Heroman3003/emag-booze