Skip to content

Commit

Permalink
J.O.E.Y. [Hyperstyled Edition] (#4042)
Browse files Browse the repository at this point in the history
# About the pull request

Replaces the cigarette vendor in maint bar with the workin' joey prop

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# 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 <[email protected]>
  • Loading branch information
thwompa and BeagleGaming1 committed Aug 2, 2023
1 parent 60ca3cd commit 5a8c407
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions code/game/objects/structures/props.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Binary file modified icons/obj/structures/props/props.dmi
Binary file not shown.
2 changes: 1 addition & 1 deletion maps/map_files/USS_Almayer/USS_Almayer.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down

0 comments on commit 5a8c407

Please sign in to comment.