Skip to content

Commit

Permalink
Ship gravity generator (#2705)
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

Adds support for ship-based gravity generators, ships no longer have
gravity by default and need to have an active generator. Currently
haven't had it added to maps, but the board is printable at an
autolathe.

Planets & the outpost now have a virtual z-wide gravity, allowing landed
ships to inherit planetary gravity.


https://github.com/shiptest-ss13/Shiptest/assets/24857008/a6ee357e-265b-4d1f-9602-7d11d81ca0ea


## Why It's Good For The Game

Dev wishlist, ships being effected by planetary gravity feels cool

## Changelog

:cl:
tweak: ships no longer have intrinsic gravity
add: new gravity generator machine for ships
tweak: planetary gravity is now stored level-wide, a ship landing at a
planet will be effected by the planet's gravity
/: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. -->

---------

Signed-off-by: Theos <[email protected]>
Co-authored-by: Latentish <[email protected]>
  • Loading branch information
SomeguyManperson and Latentish authored Apr 16, 2024
1 parent be90b8e commit a68c277
Show file tree
Hide file tree
Showing 55 changed files with 736 additions and 168 deletions.
6 changes: 5 additions & 1 deletion _maps/RandomRuins/JungleRuins/jungle_interceptor.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4891,6 +4891,10 @@
},
/turf/open/floor/plating,
/area/ruin/jungle/interceptor/porthall)
"Pi" = (
/obj/item/circuitboard/machine/ship_gravity,
/turf/open/floor/plating/rust,
/area/overmap_encounter/planetoid/jungle/explored)
"Pk" = (
/obj/effect/turf_decal/corner/opaque/purple/three_quarters{
icon_state = "borderfloor_white";
Expand Down Expand Up @@ -7954,7 +7958,7 @@ aG
SC
Mw
EJ
wH
Pi
sV
Mw
Bb
Expand Down
2 changes: 2 additions & 0 deletions _maps/shuttles/independent/independent_beluga.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2093,6 +2093,8 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/obj/structure/cable/yellow,
/obj/machinery/power/ship_gravity,
/turf/open/floor/plating,
/area/ship/engineering)
"tR" = (
Expand Down
8 changes: 6 additions & 2 deletions _maps/shuttles/independent/independent_box.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2484,6 +2484,9 @@
/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
dir = 4
},
/obj/structure/cable{
icon_state = "2-4"
},
/turf/open/floor/plating,
/area/ship/engineering)
"KI" = (
Expand Down Expand Up @@ -2554,8 +2557,9 @@
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 9
},
/obj/structure/salvageable/computer{
dir = 8
/obj/machinery/power/ship_gravity,
/obj/structure/cable{
icon_state = "0-8"
},
/turf/open/floor/plating,
/area/ship/engineering)
Expand Down
34 changes: 22 additions & 12 deletions _maps/shuttles/independent/independent_boyardee.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,10 @@
icon_state = "2-8"
},
/obj/item/radio/intercom/directional/east,
/obj/structure/table/reinforced,
/obj/item/stock_parts/cell/high/plus,
/obj/item/stock_parts/cell/high/plus,
/obj/machinery/cell_charger,
/turf/open/floor/plating,
/area/ship/maintenance)
"iB" = (
Expand Down Expand Up @@ -665,12 +669,14 @@
/turf/open/floor/carpet/red_gold,
/area/ship/crew/canteen)
"mH" = (
/obj/machinery/power/port_gen/pacman,
/obj/effect/turf_decal/box,
/obj/structure/cable/yellow{
icon_state = "0-2"
icon_state = "2-4"
},
/obj/effect/turf_decal/box,
/obj/item/stack/sheet/mineral/plasma/five,
/obj/structure/reagent_dispensers/watertank/high,
/obj/item/reagent_containers/glass/bucket,
/obj/item/reagent_containers/glass/bucket,
/obj/item/mop,
/turf/open/floor/plating,
/area/ship/maintenance)
"nc" = (
Expand Down Expand Up @@ -1573,11 +1579,12 @@
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
"CV" = (
/obj/structure/reagent_dispensers/watertank/high,
/obj/item/reagent_containers/glass/bucket,
/obj/item/reagent_containers/glass/bucket,
/obj/item/mop,
/obj/effect/turf_decal/box,
/obj/machinery/power/port_gen/pacman,
/obj/item/stack/sheet/mineral/plasma/five,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
/turf/open/floor/plating,
/area/ship/maintenance)
"Da" = (
Expand Down Expand Up @@ -2496,10 +2503,10 @@
/turf/open/floor/plasteel,
/area/ship/crew/canteen)
"TN" = (
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high/plus,
/obj/item/stock_parts/cell/high/plus,
/obj/structure/cable{
icon_state = "0-8"
},
/obj/machinery/power/ship_gravity,
/turf/open/floor/plating,
/area/ship/maintenance)
"Uf" = (
Expand Down Expand Up @@ -2627,6 +2634,9 @@
icon_state = "2-8"
},
/obj/effect/turf_decal/box,
/obj/structure/cable{
icon_state = "2-4"
},
/turf/open/floor/plating,
/area/ship/maintenance)
"VR" = (
Expand Down
28 changes: 21 additions & 7 deletions _maps/shuttles/independent/independent_bubble.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -480,13 +480,9 @@
/turf/open/floor/plasteel,
/area/ship/bridge)
"uw" = (
/obj/item/pipe_dispenser,
/obj/structure/closet/crate,
/obj/item/construction/plumbing,
/obj/item/construction/rcd/arcd,
/obj/item/stack/sheet/plasteel/fifty,
/obj/item/construction/rcd/combat,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/cable,
/obj/machinery/power/ship_gravity,
/turf/open/floor/plating/rust,
/area/ship/maintenance/aft)
"uE" = (
Expand Down Expand Up @@ -636,6 +632,9 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plating/rust,
/area/ship/maintenance/aft)
"Ay" = (
Expand Down Expand Up @@ -988,6 +987,21 @@
"Ob" = (
/turf/closed/wall,
/area/ship/maintenance/aft)
"OR" = (
/obj/machinery/power/terminal{
dir = 8
},
/obj/structure/cable{
icon_state = "0-4"
},
/obj/structure/closet/crate,
/obj/item/stack/sheet/plasteel/fifty,
/obj/item/pipe_dispenser,
/obj/item/construction/rcd/arcd,
/obj/item/construction/rcd/combat,
/obj/item/construction/plumbing,
/turf/open/floor/plating,
/area/ship/maintenance/aft)
"OY" = (
/obj/structure/cable{
icon_state = "1-2"
Expand Down Expand Up @@ -1345,7 +1359,7 @@ bv
MZ
jI
MW
VA
OR
Ob
Ob
VB
Expand Down
4 changes: 4 additions & 0 deletions _maps/shuttles/independent/independent_dwayne.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,10 @@
dir = 4
},
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/machinery/power/ship_gravity,
/obj/structure/cable/yellow{
icon_state = "0-2"
},
/turf/open/floor/plating,
/area/ship/engineering)
"gm" = (
Expand Down
8 changes: 7 additions & 1 deletion _maps/shuttles/independent/independent_kilo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,6 @@
"cY" = (
/obj/effect/decal/cleanable/greenglow,
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
},
Expand All @@ -632,6 +631,10 @@
pixel_x = -23;
id = "kiloengine"
},
/obj/structure/cable{
icon_state = "0-4"
},
/obj/machinery/power/ship_gravity,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"cZ" = (
Expand Down Expand Up @@ -1841,6 +1844,9 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
/obj/structure/cable{
icon_state = "1-8"
},
/turf/open/floor/plating,
/area/ship/engineering/engine)
"Nq" = (
Expand Down
9 changes: 8 additions & 1 deletion _maps/shuttles/independent/independent_lagoon.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -741,8 +741,11 @@
/turf/open/floor/plasteel/dark,
/area/ship/security)
"eS" = (
/obj/structure/reagent_dispensers/watertank,
/obj/machinery/light/directional/west,
/obj/machinery/power/ship_gravity,
/obj/structure/cable{
icon_state = "0-4"
},
/turf/open/floor/plating,
/area/ship/engineering)
"eT" = (
Expand Down Expand Up @@ -4074,6 +4077,7 @@
/obj/structure/cable{
icon_state = "2-8"
},
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
/area/ship/engineering)
"Bg" = (
Expand Down Expand Up @@ -7449,6 +7453,9 @@
/obj/structure/cable{
icon_state = "1-4"
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/ship/engineering)
"Yu" = (
Expand Down
16 changes: 10 additions & 6 deletions _maps/shuttles/independent/independent_mudskipper.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@
name = "Engine Shutters"
},
/obj/machinery/cell_charger,
/obj/item/storage/toolbox/mechanical,
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/engine)
"dN" = (
Expand Down Expand Up @@ -384,6 +385,9 @@
/obj/structure/cable{
icon_state = "1-8"
},
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plating,
/area/ship/engineering/engine)
"ib" = (
Expand Down Expand Up @@ -876,10 +880,10 @@
/obj/structure/railing{
dir = 8
},
/obj/structure/table/reinforced{
color = "#c1b6a5"
/obj/structure/cable{
icon_state = "0-1"
},
/obj/item/storage/toolbox/mechanical,
/obj/machinery/power/ship_gravity,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engine)
"sT" = (
Expand Down Expand Up @@ -1638,9 +1642,6 @@
/area/ship/hallway/aft)
"KA" = (
/obj/structure/window/reinforced/spawner,
/obj/structure/table/reinforced{
color = "#c1b6a5"
},
/obj/item/paper_bin,
/obj/item/analyzer{
pixel_y = 3;
Expand All @@ -1653,6 +1654,9 @@
/obj/structure/cable{
icon_state = "1-8"
},
/obj/structure/table/reinforced{
color = "#c1b6a5"
},
/turf/open/floor/plasteel/tech/grid,
/area/ship/engineering/engine)
"KT" = (
Expand Down
37 changes: 25 additions & 12 deletions _maps/shuttles/independent/independent_rigger.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -760,10 +760,16 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/crew)
"jx" = (
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable{
icon_state = "0-4"
icon_state = "4-8"
},
/obj/structure/closet/wall/orange/directional/north{
name = "fuel supply"
},
/obj/item/stack/sheet/mineral/uranium/five,
/obj/item/stack/sheet/mineral/plasma/fifty,
/obj/effect/turf_decal/radiation,
/obj/effect/turf_decal/industrial/outline/yellow,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engine)
"jy" = (
Expand Down Expand Up @@ -2334,8 +2340,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
/obj/machinery/light/small/directional/north,
/obj/structure/catwalk/over,
/obj/machinery/light/small/directional/north,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"BZ" = (
Expand Down Expand Up @@ -2462,13 +2468,17 @@
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering)
"DE" = (
/obj/effect/spawner/lootdrop/maintenance,
/obj/structure/sign/warning/nosmoking{
pixel_y = 32
},
/obj/effect/turf_decal/industrial/warning{
dir = 8
},
/obj/structure/cable{
icon_state = "4-10"
},
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable{
icon_state = "0-4"
},
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engine)
"DG" = (
Expand Down Expand Up @@ -4036,11 +4046,11 @@
/obj/structure/cable/yellow{
icon_state = "1-4"
},
/obj/structure/closet/crate,
/obj/item/stack/sheet/mineral/uranium/five,
/obj/item/stack/sheet/mineral/plasma/fifty,
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/effect/turf_decal/radiation,
/obj/machinery/power/ship_gravity,
/obj/structure/cable{
icon_state = "0-5"
},
/obj/effect/turf_decal/industrial/hatch/yellow,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engine)
"Vo" = (
Expand Down Expand Up @@ -4184,6 +4194,9 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/sign/warning/nosmoking{
pixel_y = 32
},
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engine)
"WO" = (
Expand Down
Loading

0 comments on commit a68c277

Please sign in to comment.