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.

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

Spooky's Objects Resprites #2780

Merged
merged 7 commits into from
Mar 13, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
15 changes: 14 additions & 1 deletion code/game/objects/structures/beds_chairs/sofa.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/obj/structure/chair/sofa
name = "old ratty sofa"
name = "sofa"
icon_state = "sofamiddle"
icon = 'icons/obj/sofa.dmi'
buildstackamount = 1
Expand All @@ -13,3 +13,16 @@

/obj/structure/chair/sofa/corner
icon_state = "sofacorner"

/obj/structure/chair/sofa/red
name = "comfortable sofa"
icon_state = "sofamiddle_red"

/obj/structure/chair/sofa/red/left
icon_state = "sofaend_left_red"

/obj/structure/chair/sofa/red/right
icon_state = "sofaend_right_red"

/obj/structure/chair/sofa/red/corner
icon_state = "sofacorner_red"
6 changes: 6 additions & 0 deletions code/modules/paperwork/filingcabinet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,19 @@
/obj/structure/filingcabinet/filingcabinet //not changing the path to avoid unnecessary map issues, but please don't name stuff like this in the future -Pete
icon_state = "tallcabinet"

/obj/structure/filingcabinet/wide
icon_state = "widecabinet"

/obj/structure/filingcabinet/double
name = "filing cabinets"
icon_state = "doublefilingcabinet"

/obj/structure/filingcabinet/double/grey
icon_state = "doubletallcabinet"

/obj/structure/filingcabinet/double/grey
icon_state = "doublewidecabinet"

/obj/structure/filingcabinet/Initialize(mapload)
. = ..()
if(mapload)
Expand Down
Binary file modified icons/obj/atmospherics/pipes/pressure_tank.dmi
Binary file not shown.
Binary file modified icons/obj/bureaucracy.dmi
Binary file not shown.
Binary file modified icons/obj/objects.dmi
Binary file not shown.
Binary file modified icons/obj/sofa.dmi
Binary file not shown.
Binary file modified icons/obj/stationobjs.dmi
Binary file not shown.
2 changes: 1 addition & 1 deletion shiptest.dme
Original file line number Diff line number Diff line change
Expand Up @@ -744,8 +744,8 @@
#include "code\datums\votes\_vote_datum.dm"
#include "code\datums\votes\custom_vote.dm"
#include "code\datums\votes\restart_vote.dm"
#include "code\datums\weather\weather.dm"
#include "code\datums\votes\transfer_vote.dm"
#include "code\datums\weather\weather.dm"
#include "code\datums\weather\weather_controller.dm"
#include "code\datums\weather\weather_types\acid_rain.dm"
#include "code\datums\weather\weather_types\ash_storm.dm"
Expand Down
Loading