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

Big moody light update #37296

Closed
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
c286acb
start with some cleanup
SECBATON-GRIFFON Oct 21, 2024
e45348b
unneeded
SECBATON-GRIFFON Oct 21, 2024
991a650
missed a spot
SECBATON-GRIFFON Oct 21, 2024
b7685b2
toggle proc for some cutdown
SECBATON-GRIFFON Oct 22, 2024
d9d450e
makes this work again
SECBATON-GRIFFON Oct 22, 2024
1fb4ed3
gets ones i missed
SECBATON-GRIFFON Oct 22, 2024
9d2e4ba
makes these work again
SECBATON-GRIFFON Oct 22, 2024
ef9ae67
actually works like this
SECBATON-GRIFFON Oct 22, 2024
d2fa934
microwave done
SECBATON-GRIFFON Oct 22, 2024
f3a483c
more stuff for power changes, makes these icons finally used
SECBATON-GRIFFON Oct 22, 2024
a2d4c92
does up SMES
SECBATON-GRIFFON Oct 22, 2024
a6e5e65
reads it right
SECBATON-GRIFFON Oct 22, 2024
39bd4f8
less eyesore
SECBATON-GRIFFON Oct 22, 2024
e3d3e3f
hopefully looks nicer as this
SECBATON-GRIFFON Oct 22, 2024
b4aa45f
canisters
SECBATON-GRIFFON Oct 22, 2024
501536c
forgot this!
SECBATON-GRIFFON Oct 22, 2024
1cfc904
Merge branch 'Bleeding-Edge' into more-moodylights
SECBATON-GRIFFON Oct 22, 2024
b09a8ac
most closets done now
SECBATON-GRIFFON Oct 22, 2024
d0469a1
massive icon cutdown!
SECBATON-GRIFFON Oct 22, 2024
d73e1c8
gets a last one down for consistency sake
SECBATON-GRIFFON Oct 22, 2024
81fb367
possible fix
SECBATON-GRIFFON Oct 22, 2024
a66f979
last few fixes
SECBATON-GRIFFON Oct 22, 2024
f3f53df
fixes these states
SECBATON-GRIFFON Oct 22, 2024
c3dc548
makes these look right too (ALSO WE NEED THAT MECHANIC LOCKER ICON BA…
SECBATON-GRIFFON Oct 22, 2024
c6be2a5
brings this icon back
SECBATON-GRIFFON Oct 22, 2024
8059898
crates get them too now
SECBATON-GRIFFON Oct 22, 2024
f6f0cee
makes them actually work
SECBATON-GRIFFON Oct 22, 2024
410cd65
makes these look better
SECBATON-GRIFFON Oct 22, 2024
0504d2e
some cleanup
SECBATON-GRIFFON Oct 22, 2024
7f1f246
vanquishes this var for good
SECBATON-GRIFFON Oct 22, 2024
1d24f51
the nuke
SECBATON-GRIFFON Oct 22, 2024
6ec673e
hotfix for this thing
SECBATON-GRIFFON Oct 22, 2024
a8d7700
covers this too
SECBATON-GRIFFON Oct 22, 2024
7b9ae1c
fixes these
SECBATON-GRIFFON Oct 22, 2024
4b0f6fa
hit the lights
SECBATON-GRIFFON Oct 22, 2024
5f3adf3
burned lights would look cool with this though
SECBATON-GRIFFON Oct 22, 2024
62384a7
nevermind
SECBATON-GRIFFON Oct 22, 2024
96202b2
makes these now work right
SECBATON-GRIFFON Oct 22, 2024
3fefdd2
maybe it works like this
SECBATON-GRIFFON Oct 22, 2024
df09a93
turns out the problem was in here
SECBATON-GRIFFON Oct 22, 2024
83c36ed
flips these around the right way
SECBATON-GRIFFON Oct 22, 2024
37ad099
freezers
SECBATON-GRIFFON Oct 22, 2024
8ecf5e8
does heaters too
SECBATON-GRIFFON Oct 22, 2024
3b04719
incubator
SECBATON-GRIFFON Oct 22, 2024
5bad4ac
cutdown
SECBATON-GRIFFON Oct 22, 2024
fa8a979
centrifuge stuff
SECBATON-GRIFFON Oct 22, 2024
7057c6e
first pass at the analyser
SECBATON-GRIFFON Oct 22, 2024
db060b0
distinguishes it
SECBATON-GRIFFON Oct 22, 2024
cbb62a1
vents and scrubbers, really easy change here
SECBATON-GRIFFON Oct 22, 2024
81a5293
catches these
SECBATON-GRIFFON Oct 22, 2024
327f55e
Merge branch 'Bleeding-Edge' into more-moodylights
SECBATON-GRIFFON Oct 22, 2024
e8b6964
gas meters
SECBATON-GRIFFON Oct 22, 2024
442be5f
can't forget this
SECBATON-GRIFFON Oct 22, 2024
394a013
comments out these because it's floor stuff
SECBATON-GRIFFON Oct 22, 2024
6f23e88
cleaner than using that big list
SECBATON-GRIFFON Oct 23, 2024
cb2bda3
does it here too to cut these sprites down
SECBATON-GRIFFON Oct 23, 2024
54c0bbc
fixes this state
SECBATON-GRIFFON Oct 23, 2024
f4ae7e8
Merge branch 'Bleeding-Edge' into more-moodylights
SECBATON-GRIFFON Oct 31, 2024
fa4090e
removes this little bit too
SECBATON-GRIFFON Oct 31, 2024
35a1c62
typo fix
SECBATON-GRIFFON Oct 31, 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
Prev Previous commit
Next Next commit
distinguishes it
  • Loading branch information
SECBATON-GRIFFON committed Oct 22, 2024
commit db060b04eb19e8155ee8f231fcc58e60003c27ff
10 changes: 5 additions & 5 deletions code/modules/virus2/dishincubator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@
dish_datum.updates += INCUBATOR_DISH_GROWTH
update = TRUE
alert_noise("ping")
add_overlay("incubator_grown",update,slot)
add_moody_overlay("incubator_grown",update,slot)

overlays += grown_gauge
moody = image(icon,src,grown_gauge.icon_state)
Expand All @@ -382,24 +382,24 @@
if (!(dish_datum.updates & INCUBATOR_DISH_REAGENT))
dish_datum.updates += INCUBATOR_DISH_REAGENT
update = TRUE
add_overlay("incubator_reagents",update,slot)
add_moody_overlay("incubator_reagents",update,slot)

if (dish_datum.updates_new & INCUBATOR_DISH_MAJOR)
var/update = FALSE
if (!(dish_datum.updates & INCUBATOR_DISH_MAJOR))
dish_datum.updates += INCUBATOR_DISH_MAJOR
alert_noise("beep")
update = TRUE
add_overlay("incubator_major",update,slot)
add_moody_overlay("incubator_major",update,slot)

if (dish_datum.updates_new & INCUBATOR_DISH_MINOR)
var/update = FALSE
if (!(dish_datum.updates & INCUBATOR_DISH_MINOR))
dish_datum.updates += INCUBATOR_DISH_MINOR
update = TRUE
add_overlay("incubator_minor",update,slot)
add_moody_overlay("incubator_minor",update,slot)

/obj/machinery/disease2/incubator/proc/add_overlay(var/state, var/update, var/slot)
/obj/machinery/disease2/incubator/proc/add_moody_overlay(var/state, var/update, var/slot)
var/image/overlay = image(icon,"[state][update ? "_update" : ""]")
overlay.pixel_y = -5 * slot
overlays += overlay
Expand Down