From 5a8c4076b4496750768b3d756bcb63033a948a6d Mon Sep 17 00:00:00 2001 From: thwompa <103964974+thwompa@users.noreply.github.com> Date: Wed, 2 Aug 2023 02:56:19 -0400 Subject: [PATCH] J.O.E.Y. [Hyperstyled Edition] (#4042) # About the pull request Replaces the cigarette vendor in maint bar with the workin' joey prop # Explain why it's good for the game _**V1BRANT S0VL**_ ![image](https://github.com/cmss13-devs/cmss13/assets/103964974/d0d201a3-24a0-4a39-8353-a400f6f9987a) # Changelog :cl: Thwomper maptweak: added Workin' Joey to maint bar. /:cl: --------- Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> --- code/game/objects/structures/props.dm | 6 ++++++ icons/obj/structures/props/props.dmi | Bin 2721 -> 5451 bytes maps/map_files/USS_Almayer/USS_Almayer.dmm | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/props.dm b/code/game/objects/structures/props.dm index c71f9b227668..8c7813b47a72 100644 --- a/code/game/objects/structures/props.dm +++ b/code/game/objects/structures/props.dm @@ -1152,3 +1152,9 @@ icon = 'icons/obj/structures/props/almayer_props.dmi' icon_state = "rope" density = FALSE + +/obj/structure/prop/invuln/joey + name = "Workin' Joey" + desc = "A defunct Seegson-brand Working Joe lifted from deep storage by a crew of marines after the last shore leave. Attempts have been made to modify the janitorial synthetic to serve as a crude bartender, but with little success." + icon = 'icons/obj/structures/props/props.dmi' + icon_state = "joey" diff --git a/icons/obj/structures/props/props.dmi b/icons/obj/structures/props/props.dmi index bd22e985b2aebe38394d5c4a6454b3994c8b1b0c..57485feeaecc9414a68405bfcaebfba83540eb8b 100644 GIT binary patch literal 5451 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 bI>`7xwpUCQPPjJa00000NkvXXu0mjf+p9Bm diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index f8c9cc99d534..b02cd24e2e4e 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -75281,7 +75281,7 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) "wXv" = ( -/obj/structure/machinery/vending/cigarette, +/obj/structure/prop/invuln/joey, /turf/open/floor/almayer{ icon_state = "plate" },