Skip to content

Commit

Permalink
Resprites Most Chairs! (#2160)
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
Hello everyone!

This PR updates most of the chairs to use new sprites made by me in
/tg/station originally, but with a twist! Most of them have been
re-shaded by a wiser yours truly, as well as keeping some of the
aesthetic ideas of the previous chairs!


![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/5999b68f-aeae-416c-a3b9-123aad7a3a6b)

<!-- 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
The previous ones were wildly inconsistent, so hopefully this makes the
chairs more cohesive as well as providing a more clean aesthetic to our
server!
<!-- 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: PositiveEntropy
imageadd: Redoes a good majority of chairs!
/: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
Imaginos16 authored Jul 14, 2023
1 parent 9979b7b commit 7d744c7
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2062,7 +2062,7 @@
/area/ruin/unpowered/icecropolis/gold)
"LQ" = (
/obj/structure/stone_tile/slab,
/obj/structure/chair/bronze{
/obj/structure/chair/comfy/shuttle/bronze{
dir = 8
},
/turf/open/indestructible/boss/air,
Expand Down Expand Up @@ -2178,7 +2178,7 @@
/turf/open/indestructible/boss/air,
/area/ruin/unpowered/icecropolis/gold)
"Os" = (
/obj/structure/chair/bronze{
/obj/structure/chair/comfy/shuttle/bronze{
dir = 8
},
/turf/open/floor/wood/icecropolis,
Expand Down
8 changes: 4 additions & 4 deletions _maps/RandomRuins/ReebeRuins/reebe_arena.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/turf/open/floor/bronze,
/area/ruin/reebe)
"hO" = (
/obj/structure/chair/bronze{
/obj/structure/chair/comfy/shuttle/bronze{
dir = 4
},
/turf/open/floor/bronze,
Expand Down Expand Up @@ -55,7 +55,7 @@
/turf/open/floor/bronze,
/area/ruin/reebe)
"qC" = (
/obj/structure/chair/bronze,
/obj/structure/chair/comfy/shuttle/bronze,
/obj/item/nullrod/spear,
/turf/open/floor/bronze,
/area/ruin/reebe)
Expand Down Expand Up @@ -84,7 +84,7 @@
/turf/open/chasm/reebe_void,
/area/ruin/reebe)
"zu" = (
/obj/structure/chair/bronze{
/obj/structure/chair/comfy/shuttle/bronze{
dir = 8
},
/turf/open/floor/bronze,
Expand Down Expand Up @@ -170,7 +170,7 @@
/turf/open/floor/bronze,
/area/ruin/reebe)
"JC" = (
/obj/structure/chair/bronze{
/obj/structure/chair/comfy/shuttle/bronze{
dir = 1
},
/turf/open/floor/bronze,
Expand Down
12 changes: 6 additions & 6 deletions _maps/RandomRuins/RockRuins/rockplanet_clock.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
/area/ruin/powered)
"kd" = (
/obj/structure/fluff/clockwork/alloy_shards/medium_gearbit,
/obj/structure/chair/bronze{
/obj/structure/chair/comfy/shuttle/bronze{
dir = 4
},
/turf/open/floor/bronze,
Expand All @@ -90,7 +90,7 @@
/turf/open/floor/bronze,
/area/ruin/powered)
"mG" = (
/obj/structure/chair/bronze,
/obj/structure/chair/comfy/shuttle/bronze,
/turf/open/floor/bronze,
/area/ruin/powered)
"nM" = (
Expand Down Expand Up @@ -177,7 +177,7 @@
/turf/open/floor/plating/asteroid/rockplanet/lit,
/area/overmap_encounter/planetoid/rockplanet/explored)
"xV" = (
/obj/structure/chair/bronze{
/obj/structure/chair/comfy/shuttle/bronze{
dir = 4
},
/obj/effect/decal/cleanable/blood/old,
Expand All @@ -188,7 +188,7 @@
/turf/open/floor/bronze,
/area/ruin/powered)
"zz" = (
/obj/structure/chair/bronze,
/obj/structure/chair/comfy/shuttle/bronze,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/bronze,
/area/ruin/powered)
Expand Down Expand Up @@ -297,7 +297,7 @@
/turf/closed/wall/mineral/bronze,
/area/ruin/powered)
"Rt" = (
/obj/structure/chair/bronze{
/obj/structure/chair/comfy/shuttle/bronze{
dir = 4
},
/turf/open/floor/bronze,
Expand Down Expand Up @@ -365,7 +365,7 @@
/turf/open/floor/plating/asteroid/rockplanet/lit,
/area/overmap_encounter/planetoid/rockplanet/explored)
"ZY" = (
/obj/structure/chair/bronze{
/obj/structure/chair/comfy/shuttle/bronze{
dir = 8
},
/turf/open/floor/bronze,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/shiptest/independent_rube_goldberg.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2114,7 +2114,7 @@
/turf/open/floor/plating/airless,
/area/ship/hallway)
"vw" = (
/obj/structure/chair/bronze,
/obj/structure/chair/comfy/shuttle/bronze,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/turf/open/floor/mineral/titanium,
/area/ship/bridge)
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/shiptest/radio_funny.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
/turf/open/floor/carpet/nanoweave/red,
/area/ship/bridge)
"cS" = (
/obj/structure/chair/bronze{
/obj/structure/chair/comfy/shuttle/bronze{
dir = 1
},
/turf/open/floor/carpet/nanoweave/blue,
Expand All @@ -67,7 +67,7 @@
/turf/open/floor/carpet/nanoweave/blue,
/area/ship/bridge)
"io" = (
/obj/structure/chair/bronze,
/obj/structure/chair/comfy/shuttle/bronze,
/obj/machinery/door/window{
dir = 1
},
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/stacks/sheets/sheet_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
new/datum/stack_recipe("bronze suit", /obj/item/clothing/suit/bronze), \
new/datum/stack_recipe("bronze boots", /obj/item/clothing/shoes/bronze), \
null,
new/datum/stack_recipe("bronze chair", /obj/structure/chair/bronze, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("bronze chair", /obj/structure/chair/comfy/shuttle/bronze, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("Marx Bust", /obj/structure/statue/bronze/marx, 15, one_per_turf = 1, on_floor = 1), \
))

Expand Down
13 changes: 8 additions & 5 deletions code/game/objects/structures/beds_chairs/chair.dm
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@
icon_state = "chairold"
item_chair = null

/obj/structure/chair/bronze
/obj/structure/chair/comfy/shuttle/bronze
name = "brass chair"
desc = "A spinny chair made of bronze. It has little cogs for wheels!"
anchored = FALSE
Expand All @@ -386,23 +386,26 @@
item_chair = null
var/turns = 0

/obj/structure/chair/bronze/Destroy()
/obj/structure/chair/comfy/shuttle/bronze/GetArmrest()
return mutable_appearance('icons/obj/chairs.dmi', "brass_chair_armrest")

/obj/structure/chair/comfy/shuttle/bronze/Destroy()
STOP_PROCESSING(SSfastprocess, src)
. = ..()

/obj/structure/chair/bronze/process()
/obj/structure/chair/comfy/shuttle/bronze/process()
setDir(turn(dir,-90))
playsound(src, 'sound/effects/servostep.ogg', 50, FALSE)
turns++
if(turns >= 8)
STOP_PROCESSING(SSfastprocess, src)

/obj/structure/chair/bronze/Moved()
/obj/structure/chair/comfy/shuttle/bronze/Moved()
. = ..()
if(has_gravity())
playsound(src, 'sound/machines/clockcult/integration_cog_install.ogg', 50, TRUE)

/obj/structure/chair/bronze/AltClick(mob/living/user)
/obj/structure/chair/comfy/shuttle/bronze/AltClick(mob/living/user)
turns = 0
if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
return
Expand Down
Binary file modified icons/obj/chairs.dmi
Binary file not shown.

0 comments on commit 7d744c7

Please sign in to comment.