From e71a04a9911635db488a8843631643096a8b6738 Mon Sep 17 00:00:00 2001 From: Casey Date: Mon, 21 Mar 2022 16:20:22 -0400 Subject: [PATCH 1/5] Merge pull request #12504 from GhostActual/Robs-You-In-Public Robs You In Public --- code/game/objects/random/misc.dm | 39 ++- .../loadout/loadout_general.dm | 48 +++- .../modules/food/drinkingglass/glass_boxes.dm | 2 +- code/modules/food/drinkingglass/mugs.dm | 251 ++++++++++++++++++ code/modules/food/food/drinks.dm | 7 - code/modules/food/food/drinks_vr.dm | 7 - icons/obj/drinks_mugs.dmi | Bin 0 -> 6712 bytes icons/obj/drinks_mugs_tall.dmi | Bin 0 -> 1766 bytes maps/offmap_vr/talon/talon_v2.dmm | 13 +- vorestation.dme | 2 +- 10 files changed, 350 insertions(+), 19 deletions(-) create mode 100644 code/modules/food/drinkingglass/mugs.dm delete mode 100644 code/modules/food/food/drinks_vr.dm create mode 100644 icons/obj/drinks_mugs.dmi create mode 100644 icons/obj/drinks_mugs_tall.dmi diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index ea559171d9..4a9f03f483 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -995,4 +995,41 @@ prob(6);/obj/item/device/flashlight/color/orange, prob(6);/obj/item/device/flashlight/color/yellow, prob(2);/obj/item/device/flashlight/maglight - ) \ No newline at end of file + ) + +/obj/random/mug + name = "Random Mug" + desc = "This is a random coffee mug." + icon = 'icons/obj/drinks_mugs.dmi' + icon_state = "coffeecup_spawner" + +/obj/random/mug/item_to_spawn() + return pick(/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/sol, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fleet, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fivearrows, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/psc, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/alma, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/almp, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/nt, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal/wulf, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/gilthari, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/zeng, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/wt, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/aether, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/bishop, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/oculum, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/one, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/puni, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/heart, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/pawn, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/diona, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/britcup, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/flame, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/blue, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/black, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green/dark, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/rainbow, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/talon) \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 74a69d46e0..71d8b8c37d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -148,4 +148,50 @@ /datum/gear/wizoffguide display_name = "WizOff Guide" path = /obj/item/weapon/book/manual/wizzoffguide - description = "The guide to playing the ever popular card game: Wiz-Off!" \ No newline at end of file + description = "The guide to playing the ever popular card game: Wiz-Off!" + +/datum/gear/coffeemug + display_name = "coffee mugs" + description = "A coffee mug in various designs." + cost = 1 + path = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug + +/datum/gear/coffeemug/New() + ..() + var/list/coffeemugs = list() + coffeemugs["plain coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug + coffeemugs["SCG coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/sol + coffeemugs["Fleet coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fleet + coffeemugs["Five Arrows coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fivearrows + coffeemugs["Pearlshield coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/psc + coffeemugs["Almach Association coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/alma + coffeemugs["Almach Protectorate coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/almp + coffeemugs["NT coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/nt + coffeemugs["Wulf Aeronautics mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal/wulf + coffeemugs["Gilthari Exports coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/gilthari + coffeemugs["Zeng-Hu coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/zeng + coffeemugs["Ward-Takahashi coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/wt + coffeemugs["Aether Atmospherics coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/aether + coffeemugs["Bishop Cybernetics coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/bishop + coffeemugs["Oculum Broadcast coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/oculum + coffeemugs["#1 coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/one + coffeemugs["#1 monkey coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/puni + coffeemugs["heart coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/heart + coffeemugs["pawn coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/pawn + coffeemugs["diona coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/diona + coffeemugs["british coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/britcup + coffeemugs["flame coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/flame + coffeemugs["blue coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/blue + coffeemugs["black coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/black + coffeemugs["green coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green + coffeemugs["dark green coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green/dark + coffeemugs["rainbow coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/rainbow + coffeemugs["metal coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal + coffeemugs["glass coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/glass + coffeemugs["tall coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall + coffeemugs["tall black coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/black + coffeemugs["tall metal coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/metal + coffeemugs["tall rainbow coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/rainbow + coffeemugs["Talon coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/talon + gear_tweaks += new /datum/gear_tweak/path(coffeemugs) + gear_tweaks += new /datum/gear_tweak/reagents(lunchables_drink_reagents()) \ No newline at end of file diff --git a/code/modules/food/drinkingglass/glass_boxes.dm b/code/modules/food/drinkingglass/glass_boxes.dm index acd69382c6..e7dd4b5dc7 100644 --- a/code/modules/food/drinkingglass/glass_boxes.dm +++ b/code/modules/food/drinkingglass/glass_boxes.dm @@ -81,4 +81,4 @@ /obj/item/weapon/storage/box/glasses/coffeemug name = "box of coffee mugs" - starts_with = list(/obj/item/weapon/reagent_containers/food/drinks/britcup = 7) \ No newline at end of file + starts_with = list(/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug = 7) \ No newline at end of file diff --git a/code/modules/food/drinkingglass/mugs.dm b/code/modules/food/drinkingglass/mugs.dm new file mode 100644 index 0000000000..07a0873a30 --- /dev/null +++ b/code/modules/food/drinkingglass/mugs.dm @@ -0,0 +1,251 @@ +/* Warm Mugs! + * + * Contains: + * Britcup + * Text Mug + * Coffee Mugs + * Tall Mugs + */ + +/* + * Britcup + */ +/obj/item/weapon/reagent_containers/food/drinks/britcup + name = "cup" + desc = "A cup with the British flag emblazoned on it." + icon_state = "britcup" + volume = 30 + center_of_mass = list("x"=15, "y"=13) + +/obj/item/weapon/reagent_containers/food/drinks/britcup/on_reagent_change() + ..() + +/* + * Text Mug + */ +/obj/item/weapon/reagent_containers/food/drinks/textmug + name = "mug with text" + desc = "A mug with something written on it." + icon = 'icons/obj/drinks_vr.dmi' + icon_state = "textmug" + volume = 30 + center_of_mass = list("x"=15, "y"=13) + +/* + * Coffee Mugs + */ +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug + name = "coffee mug" + base_name = "mug" + desc = "A plain white coffee mug." + icon = 'icons/obj/drinks_mugs.dmi' + base_icon = "coffeecup" + volume = 30 + var/fillsource = "coffeecup" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/update_icon() + cut_overlays() + + if(reagents.total_volume) + var/image/filling = image('icons/obj/drinks_mugs.dmi', src, null) + var/percent = round((reagents.total_volume / volume) * 100) + switch(percent) + if(0 to 39) + filling.icon_state = null + return + if(40 to 79) filling.icon_state = "[fillsource]40" + if(80 to 99) filling.icon_state = "[fillsource]80" + if(100 to INFINITY) filling.icon_state = "[fillsource]100" + filling.color = reagents.get_color() + add_overlay(filling) + +// Government +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/sol + name = "\improper SCG coffee mug" + desc = "A blue coffee mug emblazoned with the crest of the Solar Confederate Government." + base_icon = "coffeecup_sol" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fleet + name = "\improper SCG Fleet coffee cup" + desc = "A coffee mug imprinted with the emblem of the Solar Confederate Fleet." + base_icon = "coffeecup_fleet" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fivearrows + name = "\improper Five Arrows coffee mug" + desc = "A coffee mug with the flag of the Five Arrows proudly displayed on it." + base_icon = "coffeecup_fivearrows" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/alma + name = "\improper Almach Association coffee cup" + desc = "A grey coffee cup emblazoned with the star of the Almach Association." + icon_state = "coffeecup_alma" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/almp + name = "\improper Almach Protectorate coffee cup" + desc = "A purple coffee cup emblazoned with the star of the Almach Protectorate." + icon_state = "coffeecup_almp" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/psc + name = "\improper Pearlshield coffee mug" + desc = "A coffee mug bearing the symbol of the Pearlshield Coalition." + base_icon = "coffeecup_psc" + +// Corporations +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/nt + name = "\improper NT coffee mug" + desc = "A blue NanoTrasen coffee mug." + base_icon = "coffeecup_NT" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal/wulf + name = "\improper Wulf Aeronautics coffee mug" + desc = "A metal coffee mug bearing the livery of Wulf Aeronautics." + base_icon = "coffeecup_wulf" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/gilthari + name = "\improper Gilthari Exports coffee mug" + desc = "A coffee mug bearing golden G of Gilthari Exports." + base_icon = "coffeecup_gilth" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/wt + name = "\improper Ward-Takahashi coffee mug" + desc = "A coffee mug in a geometric Ward-Takahashi design." + base_icon = "coffeecup_wt" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/aether + name = "\improper Aether Atmospherics coffee mug" + desc = "A coffee mug in Aether Atmospherics colours." + base_icon = "coffeecup_aether" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/zeng + name = "\improper Zeng-Hu coffee cup" + desc = "A coffee cup bearing the Zeng-Hu logo." + icon_state = "coffeecup_zeng" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/bishop + name = "\improper Bishop coffee mug" + desc = "A black coffee mug adorned with Bishop's logo." + base_icon = "coffeecup_bishop" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/oculum + name = "pawn coffee mug" + desc = "A black and blue coffee mug decorated with the logo of Oculum Broadcast." + base_icon = "coffeecup_oculum" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/talon + name = "\improper Talon coffee mug" + desc = "A teal colored coffee mug with the Talon star logo on its face." + base_icon = "coffeecup_talon" + +// Symbols, markings +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/one + name = "#1 coffee mug" + desc = "A white coffee mug, prominently featuring a #1." + base_icon = "coffeecup_one" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/puni + name = "#1 monkey coffee mug" + desc = "A white coffee mug, prominently featuring a \"#1 monkey\" decal." + base_icon = "coffeecup_puni" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/heart + name = "heart coffee mug" + desc = "A white coffee mug, it prominently features a red heart." + base_icon = "coffeecup_heart" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/pawn + name = "pawn coffee mug" + desc = "A black coffee mug adorned with the image of a red chess pawn." + base_icon = "coffeecup_pawn" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/diona + name = "diona nymph coffee mug" + desc = "A green coffee mug featuring the image of a diona nymph." + base_icon = "coffeecup_diona" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/britcup + name = "british coffee mug" + desc = "A coffee mug with the British flag emblazoned on it." + base_icon = "coffeecup_brit" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/flame + name = "flame coffee cup" + desc = "A coffee cup with the a flame emblazoned on it." + icon_state = "coffeecup_flame" + +// Pure colors & other +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/black + name = "black coffee mug" + desc = "A sleek black coffee mug." + base_icon = "coffeecup_black" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green + name = "green coffee mug" + desc = "A pale green and pink coffee mug." + base_icon = "coffeecup_green" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green/dark + desc = "A dark green coffee mug." + base_icon = "coffeecup_corp" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/blue + name = "blue coffee mug" + desc = "A blue coffee mug." + base_icon = "coffeecup_blue" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/rainbow + name = "rainbow coffee mug" + desc = "A rainbow coffee mug. The colors are almost as blinding as a welder." + base_icon = "coffeecup_rainbow" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal + name = "metal coffee mug" + desc = "A metal coffee mug. You're not sure which metal." + base_icon = "coffeecup_metal" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/glass + name = "glass coffee mug" + desc = "A glass coffee mug, using space age technology to keep it cool for use." + base_icon = "glasscoffeecup" + fillsource = "glasscoffeecup" + +/* + * Tall Mugs + */ +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall + name = "tall coffee mug" + desc = "An unreasonably tall coffee mug, for when you really need to wake up in the morning." + icon = 'icons/obj/drinks_mugs_tall.dmi' + base_icon = "coffeecup_tall" + fillsource = "coffeecup_tall" + volume = 60 + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/update_icon() + cut_overlays() + + if(reagents.total_volume) + var/image/filling = image('icons/obj/drinks_mugs_tall.dmi', src, null) + var/percent = round((reagents.total_volume / volume) * 100) + switch(percent) + if(0 to 69) + filling.icon_state = null + return + if(70 to 89) filling.icon_state = "[fillsource]70" + if(90 to 99) filling.icon_state = "[fillsource]90" + if(100 to INFINITY) filling.icon_state = "[fillsource]100" + filling.color = reagents.get_color() + add_overlay(filling) + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/black + name = "tall black coffee mug" + desc = "An unreasonably tall coffee mug, for when you really need to wake up in the morning. This one is black." + base_icon = "coffeecup_tall_black" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/metal + name = "tall metal coffee mug" + desc = "An unreasonably tall coffee mug, for when you really need to wake up in the morning. This one is made of metal." + base_icon = "coffeecup_tall_metal" + +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/rainbow + name = "tall rainbow coffee mug" + desc = "An unreasonably tall coffee mug, for when you really need to wake up in the morning. This one is rainbow colored." + base_icon = "coffeecup_tall_rainbow" \ No newline at end of file diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index ca9dc49115..c30f5053cf 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -420,10 +420,3 @@ volume = 60 center_of_mass = list("x"=15, "y"=4) -/obj/item/weapon/reagent_containers/food/drinks/britcup - name = "cup" - desc = "A cup with the British flag emblazoned on it." - icon_state = "britcup" - volume = 30 - center_of_mass = list("x"=15, "y"=13) - diff --git a/code/modules/food/food/drinks_vr.dm b/code/modules/food/food/drinks_vr.dm deleted file mode 100644 index 37dcb58c5f..0000000000 --- a/code/modules/food/food/drinks_vr.dm +++ /dev/null @@ -1,7 +0,0 @@ -/obj/item/weapon/reagent_containers/food/drinks/textmug - name = "mug with text" - desc = "A mug with something written on it." - icon = 'icons/obj/drinks_vr.dmi' - icon_state = "textmug" - volume = 30 - center_of_mass = list("x"=15, "y"=13) \ No newline at end of file diff --git a/icons/obj/drinks_mugs.dmi b/icons/obj/drinks_mugs.dmi new file mode 100644 index 0000000000000000000000000000000000000000..6cdf814462b4f1d7989fc517c94bf11362de396f GIT binary patch literal 6712 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

>5@yH8n8~ju+I1V>X&%E&q1kZt$Cy zW9LZj{cUfniugXP*un#9?CGqYA;-yG4x3diW)x5PQ_#p zsnp|wU+ZG7$@_bn4wJl4LAj}?M24%hGd|`LS$fY)CUawg(3H^`sl4SiP3D}RiTtKD zMy=|Fu5R{a^TIK&mHNfmdjJ@_eVlH>(gtnHs%Whal{K10S$MeZYfWEFSC*bPY`Z?x z;6HQS5z^R`!cVs|?I`6^w>#1EbYic`;g)f0{8!eQyeTSrZ7Ab1m?Hj*7R0W(K*vtb z54%^#bHO=K*j5$Lw^U1an^i`&Ln*qLZ7r7AB}27gN5dupl&YOJ0-RtfV*^)@Od2~K zaHf?P_MtzJ0pgbuNCMy(FKV#D^Djs(XSB!iGUpN2(@}d%CGaP_A8pC|HAH2CGH(26 z*Xk-AuMY*&zBChd-DU40=R)Jzvo9bo6ljS6D1Q110h~mO{iN#IxqYG^#x2~ETc-$A zVY5;IwX5~BXIX%mOSk6(KvFVnS(MSO{fEc!KNdTmcw^dTN#C*TGlI7@-?O#IIk=?% zz$QzlU9&f$?#5(FM)n=p#T2K~k1|-|&y{=FbFtP0=mPy>z& zi^Lpy@VcC|Nfh93V4HdVALmZ!HeUvhX4@mv&^{CXYW~lXE8TB|t;dlVN6m|8s^1Jg zhF8KC*EdBVF=^gnU4zoW70A_(-*33XbilY9{XYmqMnP@->T1-h^plXQxPQanrGeDF zxAq^F(2DM*9V_V?l1LbWM~}FCKD4&B_Do{ps+;C>>$RCC)Jodamm`aBVl4!pMGJ0{ z!}P(e!TgXJ&m(1bxvR)ja%u`wGh#2sdDc49U1=#gZ5BR75X0fgchZ&Ltk5AlrpTAgZt)CFqKZ3RJ(Xjm=*O71gC>a+yoL zN*U;{)J;WNkBP%pR0)&u$X&OBIIL`@!Lyj*V4M8tE_7w;pX)EhVjjR_Ooh<{En$|x4Hq- z_Qm|ob${Bzm%sj$7Y(JSD|QejPU6aiI_lYWg}X;m zZfIsl0iZSh(iYinsF&zOoMW#8g(+Hb|;uX6mP`FUPsE5D}p>?xXZv!I~xhGc-Zcw3AcT>}dT2!&p5 UCl-t`8;=VF`V;)>e5skg19+z-MgRZ+ literal 0 HcmV?d00001 diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm index c705e6a64e..2268ea9c82 100644 --- a/maps/offmap_vr/talon/talon_v2.dmm +++ b/maps/offmap_vr/talon/talon_v2.dmm @@ -1458,7 +1458,14 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/weapon/paper/dockingcodes, +/obj/item/weapon/paper/dockingcodes{ + pixel_x = 5; + pixel_y = -1 + }, +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/talon{ + pixel_x = -13; + pixel_y = 7 + }, /turf/simulated/floor/carpet/blucarpet, /area/talon_v2/crew_quarters/cap_room) "ep" = ( @@ -15657,6 +15664,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/talon{ + pixel_x = 6; + pixel_y = -1 + }, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/meditation) "XO" = ( diff --git a/vorestation.dme b/vorestation.dme index aff46b565d..c697a2a236 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2410,6 +2410,7 @@ #include "code\modules\food\drinkingglass\metaglass.dm" #include "code\modules\food\drinkingglass\metaglass_ch.dm" #include "code\modules\food\drinkingglass\metaglass_vr.dm" +#include "code\modules\food\drinkingglass\mugs.dm" #include "code\modules\food\drinkingglass\serving_glasses.dm" #include "code\modules\food\drinkingglass\shaker.dm" #include "code\modules\food\drinkingglass\shaker_vr.dm" @@ -2417,7 +2418,6 @@ #include "code\modules\food\food\cans_ch.dm" #include "code\modules\food\food\condiment.dm" #include "code\modules\food\food\drinks.dm" -#include "code\modules\food\food\drinks_vr.dm" #include "code\modules\food\food\lunch.dm" #include "code\modules\food\food\sandwich.dm" #include "code\modules\food\food\snacks.dm" From 83caabb9c7266c10e68dec8feb6b45e089d3e061 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Fri, 25 Mar 2022 18:32:51 -0400 Subject: [PATCH 3/5] powder that makes you say yes --- code/game/objects/random/misc.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 4a9f03f483..d39fc25c31 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -1031,5 +1031,4 @@ /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green, /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green/dark, /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/rainbow, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/talon) \ No newline at end of file + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal) //CHOMPedit: deleted talon mug From 8ad19a97dd05929d7522d90b9c08ef670d1d4de4 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Fri, 25 Mar 2022 18:47:44 -0400 Subject: [PATCH 4/5] powder that makes you say yes --- code/modules/food/drinkingglass/mugs.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/food/drinkingglass/mugs.dm b/code/modules/food/drinkingglass/mugs.dm index 07a0873a30..22c038c8a7 100644 --- a/code/modules/food/drinkingglass/mugs.dm +++ b/code/modules/food/drinkingglass/mugs.dm @@ -131,10 +131,12 @@ desc = "A black and blue coffee mug decorated with the logo of Oculum Broadcast." base_icon = "coffeecup_oculum" +/* //CHOMPedit /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/talon name = "\improper Talon coffee mug" desc = "A teal colored coffee mug with the Talon star logo on its face." base_icon = "coffeecup_talon" +*/ // Symbols, markings /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/one @@ -248,4 +250,4 @@ /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/rainbow name = "tall rainbow coffee mug" desc = "An unreasonably tall coffee mug, for when you really need to wake up in the morning. This one is rainbow colored." - base_icon = "coffeecup_tall_rainbow" \ No newline at end of file + base_icon = "coffeecup_tall_rainbow" From 61f2f98dc8a32f87905fc5cd84fc30d6ee7634fd Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Fri, 25 Mar 2022 18:49:16 -0400 Subject: [PATCH 5/5] powder that makes you say yes --- .../client/preference_setup/loadout/loadout_general.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 71d8b8c37d..53caa5bc8b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -192,6 +192,6 @@ coffeemugs["tall black coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/black coffeemugs["tall metal coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/metal coffeemugs["tall rainbow coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/rainbow - coffeemugs["Talon coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/talon + //coffeemugs["Talon coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/talon //CHOMPedit gear_tweaks += new /datum/gear_tweak/path(coffeemugs) - gear_tweaks += new /datum/gear_tweak/reagents(lunchables_drink_reagents()) \ No newline at end of file + gear_tweaks += new /datum/gear_tweak/reagents(lunchables_drink_reagents())