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.

Sign up for GitHub

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

Jump to bottom

Emissive APCs #7000

Merged
merged 2 commits into from
Aug 23, 2024
Merged

Emissive APCs #7000

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9799a8a
a
Git-Nivrak Aug 22, 2024
3be1734
Linter + Blockers
Git-Nivrak Aug 22, 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
1 change: 1 addition & 0 deletions code/game/objects/items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
mouse_drag_pointer = MOUSE_ACTIVE_POINTER
layer = ITEM_LAYER
light_system = MOVABLE_LIGHT
blocks_emissive = EMISSIVE_BLOCK_GENERIC
/// this saves our blood splatter overlay, which will be processed not to go over the edges of the sprite
var/image/blood_overlay = null
var/randpixel = 6
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/structures/crates_lockers/closets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
icon_state = "closed"
density = TRUE
layer = BELOW_OBJ_LAYER
blocks_emissive = EMISSIVE_BLOCK_GENERIC
var/icon_closed = "closed"
var/icon_opened = "open"
var/opened = 0
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/human/human_defines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/mob/living/carbon/human
light_system = MOVABLE_LIGHT
rotate_on_lying = TRUE
blocks_emissive = EMISSIVE_BLOCK_UNIQUE
//Hair color and style
var/r_hair = 0
var/g_hair = 0
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/mob_defines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
layer = MOB_LAYER
animate_movement = 2
rebounds = TRUE
blocks_emissive = EMISSIVE_BLOCK_GENERIC
var/mob_flags = NO_FLAGS
var/datum/mind/mind

Expand Down
26 changes: 16 additions & 10 deletions code/modules/power/apc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,17 +461,23 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list(
overlays = 0

if(!(stat & (BROKEN|MAINT)) && update_state & UPSTATE_ALLGOOD)
overlays += emissive_appearance(status_overlays_lock[locked + 1].icon, status_overlays_lock[locked + 1].icon_state)
overlays += mutable_appearance(status_overlays_lock[locked + 1].icon, status_overlays_lock[locked + 1].icon_state)
overlays += emissive_appearance(status_overlays_charging[charging + 1].icon, status_overlays_charging[charging + 1].icon_state)
overlays += mutable_appearance(status_overlays_charging[charging + 1].icon, status_overlays_charging[charging + 1].icon_state)
var/image/_lock = status_overlays_lock[locked + 1]
var/image/_charging = status_overlays_charging[charging + 1]
var/image/_equipment = status_overlays_equipment[equipment + 1]
var/image/_lighting = status_overlays_lighting[lighting + 1]
var/image/_environ = status_overlays_environ[environ + 1]
harryob marked this conversation as resolved.
Show resolved Hide resolved

overlays += emissive_appearance(_lock.icon, _lock.icon_state)
overlays += mutable_appearance(_lock.icon, _lock.icon_state)
overlays += emissive_appearance(_charging.icon, _charging.icon_state)
overlays += mutable_appearance(_charging.icon, _charging.icon_state)
if(operating)
overlays += emissive_appearance(status_overlays_equipment[equipment + 1].icon, status_overlays_equipment[equipment + 1].icon_state)
overlays += mutable_appearance(status_overlays_equipment[equipment + 1].icon, status_overlays_equipment[equipment + 1].icon_state)
overlays += emissive_appearance(status_overlays_lighting[lighting + 1].icon, status_overlays_lighting[lighting + 1].icon_state)
overlays += mutable_appearance(status_overlays_lighting[lighting + 1].icon, status_overlays_lighting[lighting + 1].icon_state)
overlays += emissive_appearance(status_overlays_environ[environ + 1].icon, status_overlays_environ[environ + 1].icon_state)
overlays += mutable_appearance(status_overlays_environ[environ + 1].icon, status_overlays_environ[environ + 1].icon_state)
overlays += emissive_appearance(_equipment.icon, _equipment.icon_state)
overlays += mutable_appearance(_equipment.icon, _equipment.icon_state)
overlays += emissive_appearance(_lighting.icon, _lighting.icon_state)
overlays += mutable_appearance(_lighting.icon, _lighting.icon_state)
overlays += emissive_appearance(_environ.icon, _environ.icon_state)
overlays += mutable_appearance(_environ.icon, _environ.icon_state)

switch(charging)
if(APC_NOT_CHARGING)
Expand Down
1 change: 1 addition & 0 deletions code/modules/vehicles/vehicle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
anchored = TRUE
animate_movement = 1
can_buckle = TRUE
blocks_emissive = EMISSIVE_BLOCK_GENERIC

// The mobs that are in each position/seat of the vehicle
var/list/mob/seats = list(
Expand Down
Loading