Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

J.O.E.Y. [Hyperstyled Edition] #4042

Merged
merged 7 commits into from
Aug 2, 2023
Merged

J.O.E.Y. [Hyperstyled Edition] #4042

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f26af81
Add files via upload
thwompa Jul 29, 2023
5f1f8a3
Add files via upload
thwompa Jul 29, 2023
50d43aa
Add files via upload
thwompa Jul 29, 2023
945bca0
Merge branch 'cmss13-devs:master' into master
thwompa Aug 2, 2023
d3dbed0
Add files via upload
thwompa Aug 2, 2023
2c2bbfd
Add files via upload
thwompa Aug 2, 2023
5eafab3
Update code/game/objects/structures/props.dm
thwompa Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions code/game/objects/structures/props.dm
View file
Open in desktop
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"
thwompa marked this conversation as resolved.
Show resolved Hide resolved
Binary file modified icons/obj/structures/props/props.dmi
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion maps/map_files/USS_Almayer/USS_Almayer.dmm
View file
Open in desktop
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{
thwompa marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "plate"
},
Expand Down
Loading