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

adding fuel pump sprites and machinery to the almayer. #6074

Merged
merged 39 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
35009be
adding fuel pomp in the code.
Apr 3, 2024
2216227
fix
Apr 3, 2024
9f9e11c
added fuel pomp to almayer
Apr 3, 2024
8c261f0
add basic animation stuff when it's powered.
Apr 3, 2024
eceabe9
better i think?
Apr 3, 2024
b33ec59
inverse power stuff... to make it so that when power is off it doesn'…
Apr 3, 2024
fda2313
comemnsdfjspqgj
Apr 3, 2024
823f33d
test
Apr 6, 2024
9698f96
tets
Apr 6, 2024
4cbaea8
testing some basic logic...
Apr 6, 2024
9c0ebdf
ttest
Apr 6, 2024
d021040
basic logic change +small map change +addition of tile blocker
Apr 6, 2024
939c073
test with code change
Apr 7, 2024
72d8812
Merge remote-tracking branch 'upstream/master' into fuel_pomp
Apr 7, 2024
cc01da6
fix
Apr 7, 2024
f0a8f9e
reverse change scrapping % of fuel logic retreating to basic implemen…
Apr 7, 2024
108c620
start implement vic solution
Apr 7, 2024
c067b9b
indentation
Apr 7, 2024
909b9b0
fix global list for fuel pump
Apr 7, 2024
849c93c
fix???????????????????????????????
Apr 7, 2024
284c988
fix
Apr 7, 2024
63a1820
finivsipDFPI
Apr 7, 2024
d0106e0
test
Apr 7, 2024
2680ec1
test
Apr 7, 2024
be0b87a
NGIQPGPQRG
Apr 7, 2024
50c7833
fix maybe idk
Apr 8, 2024
dd90b97
chqgasga
Apr 8, 2024
6eb5266
ngiJFHRÖJGor^gjoqqjog
Apr 8, 2024
dad89cc
ergpjqofgjqjgoâôrgo^q
Apr 8, 2024
f715262
indentationnnnnnnnnnnnnnnnnnnnnnnnnn
Apr 8, 2024
fff56f4
oghipzgjpjpof
Apr 8, 2024
61378a3
zgqgg
Apr 8, 2024
cb7a8d5
ahshtsh
Apr 8, 2024
17e7e58
revert everything because i can't make it work and i don't want to pa…
Apr 8, 2024
e45b46e
add a proper blocker made for fuel pump
Apr 8, 2024
ca6217d
adding the blockers on the map
Apr 8, 2024
54f7628
Apply suggestions from code review
Huffie56 Apr 13, 2024
165bd4d
change required by
Apr 14, 2024
8020d01
change the sprite
Apr 14, 2024
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
16 changes: 16 additions & 0 deletions code/game/machinery/machinery.dm
Original file line number Diff line number Diff line change
Expand Up @@ -355,3 +355,19 @@ Class Procs:
icon_state = "autolathe"
density = TRUE
anchored = TRUE

//fuel pomp
Huffie56 marked this conversation as resolved.
Show resolved Hide resolved
/obj/structure/machinery/fuelpump
name = "\improper Fuel Pump"
layer = ABOVE_MOB_LAYER
desc = "It is a machine that pumps fuel around the ship."
icon = 'icons/obj/structures/machinery/fuelpump.dmi'
icon_state = "fuelpump_off"
density = TRUE
anchored = TRUE
Huffie56 marked this conversation as resolved.
Show resolved Hide resolved

/obj/structure/machinery/fuelpump/update_icon()
if(stat & NOPOWER)
icon_state = "fuelpump_off"
Huffie56 marked this conversation as resolved.
Show resolved Hide resolved
else
icon_state = "fuelpump_on"
Huffie56 marked this conversation as resolved.
Show resolved Hide resolved
6 changes: 6 additions & 0 deletions code/game/objects/structures/blocker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,9 @@
icon_state = "purple_line"

visible = TRUE

// for fuel pump since it's a large sprite.

/obj/structure/blocker/fuelpump
name = "\improper Fuel Pump"
desc = "It is a machine that pumps fuel around the ship."
Huffie56 marked this conversation as resolved.
Show resolved Hide resolved
Binary file added icons/obj/structures/machinery/fuelpump.dmi
Huffie56 marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Loading
Loading