Skip to content

Commit

Permalink
Spooky's Objects Resprites (#2780)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
A number of assorted resprites for all sorts of objects.

I didn't test this, so I'll let tests run and ensure it compiles fine.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

![image](https://github.com/shiptest-ss13/Shiptest/assets/34109002/d3aaf065-2d58-4923-83c2-fdcd9767581c)

![image](https://github.com/shiptest-ss13/Shiptest/assets/34109002/649effea-0ec0-4b4b-823d-5aa8d2b768d3)

![image](https://github.com/shiptest-ss13/Shiptest/assets/34109002/72670766-a3f2-443e-94bf-f7463482e45f)

![image](https://github.com/shiptest-ss13/Shiptest/assets/34109002/f98b64a2-6bcd-4ac6-beb4-a1a3b539446c)
(Don't worry about the duplicate iconstates I fixed those in the actual
DMI)

![image](https://github.com/shiptest-ss13/Shiptest/assets/34109002/41fa6e79-b158-42b2-843f-de0b1799f0ab)
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl: Spooky
tweak: Assorted resprites.
imageadd: A bunch of re-done sprites for various objects. Notably:
Sofas, filing cabinets, reagent tanks.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
GenericDM authored Mar 13, 2024
1 parent 2bc150d commit 41e9e43
Show file tree
Hide file tree
Showing 14 changed files with 31 additions and 4 deletions.
7 changes: 6 additions & 1 deletion code/game/objects/items/stacks/sheets/sheet_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa, 1, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/left, 1, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/right, 1, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corner, 1, one_per_turf = TRUE, on_floor = TRUE)
new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corner, 1, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("red sofa (middle)", /obj/structure/chair/sofa/red, 1, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("red sofa (left)", /obj/structure/chair/sofa/left, 1, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("red sofa (right)", /obj/structure/chair/sofa/red/right, 1, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("red sofa (corner)", /obj/structure/chair/sofa/red/corner, 1, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("red sofa (internal corner)", /obj/structure/chair/sofa/red/internal_corner, 1, one_per_turf = TRUE, on_floor = TRUE)
)),
null, \
new/datum/stack_recipe("rack parts", /obj/item/rack_parts), \
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/beds_chairs/chair.dm
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
return ..()

/obj/structure/chair/comfy/proc/GetArmrest()
return mutable_appearance('icons/obj/chairs.dmi', "comfychair_armrest")
return mutable_appearance(icon, "[icon_state]_armrest")

/obj/structure/chair/comfy/Destroy()
QDEL_NULL(armrest)
Expand Down
18 changes: 17 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,19 @@

/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"

/obj/structure/chair/sofa/red/internal_corner
icon_state = "sofainternalcorner_red"
2 changes: 1 addition & 1 deletion code/game/objects/structures/flora.dm
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
desc = "A coniferous pine tree."
icon = 'icons/obj/flora/pinetrees.dmi'
icon_state = "pine_1"
var/list/icon_states = list("pine_1", "pine_2", "pine_3")
var/list/icon_states = list("pine_1", "pine_2", "pine_3", "pine_4")

/obj/structure/flora/tree/pine/Initialize()
. = ..()
Expand Down
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/flora/pinetrees.dmi
Binary file not shown.
Binary file modified icons/obj/objects.dmi
Binary file not shown.
Binary file modified icons/obj/robotics.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.
Binary file modified icons/obj/structures.dmi
Binary file not shown.
Binary file modified icons/obj/watercloset.dmi
Binary file not shown.

0 comments on commit 41e9e43

Please sign in to comment.