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

Feat: New door sprites & Service port from Parashit (Cyberiad) #79

Merged
merged 9 commits into from
Jul 27, 2023
Merged

Feat: New door sprites & Service port from Parashit (Cyberiad) #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a78b35f
service
AyIong Jul 26, 2023
4a551fb
That's a fucking doors
AyIong Jul 26, 2023
d09910f
overlay fix
AyIong Jul 26, 2023
76eabc8
ready?
AyIong Jul 26, 2023
85efae5
fixes
AyIong Jul 27, 2023
e1b8664
fixes fixes fixes
AyIong Jul 27, 2023
053e1a3
last fixes i hope
AyIong Jul 27, 2023
4dc12cf
100% last fix
AyIong Jul 27, 2023
011faef
Update _aesthetics.dme
Furrior Jul 27, 2023
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
12,501 changes: 6,494 additions & 6,007 deletions _maps/map_files220/cyberiad/cyberiad.dmm
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 12 additions & 2 deletions code/game/machinery/doors/airlock.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,11 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays)
else if(emergency)
lights_overlay = get_airlock_overlay("lights_emergency", overlays_file)
lights_underlay = get_airlock_emissive_underlay("lights_emergency_lightmask", overlays_file)
// SS220 ADDITION - START
else
lights_overlay = get_airlock_overlay("lights_poweron", overlays_file)
lights_underlay = get_airlock_emissive_underlay("lights_poweron_lightmask", overlays_file)
// SS220 ADDITION - END
if(note)
note_overlay = get_airlock_overlay(notetype, note_overlay_file)
note_overlay.layer = layer + 0.1
Expand Down Expand Up @@ -521,6 +526,11 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays)

if(AIRLOCK_OPEN)
frame_overlay = get_airlock_overlay("open", icon)
// SS220 ADDITION - START
if(lights && arePowerSystemsOn())
lights_overlay = get_airlock_overlay("lights_poweron_open", overlays_file)
lights_underlay = get_airlock_emissive_underlay("lights_poweron_open_lightmask", overlays_file)
// SS220 ADDITION - END
if(airlock_material)
filling_overlay = get_airlock_overlay("[airlock_material]_open", overlays_file)
else
Expand Down Expand Up @@ -1257,7 +1267,7 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays)
return 0
use_power(360) //360 W seems much more appropriate for an actuator moving an industrial door capable of crushing people
if(forced)
playsound(loc, 'sound/machines/airlockforced.ogg', 30, 1)
playsound(loc, 'modular_ss220/aesthetics/airlocks/sound/open_force.ogg', 30, 1) // SS220 EDIT: ORIGINAL - 'sound/machines/airlockforced.ogg'
else
playsound(loc, doorOpen, 30, 1)
if(closeOther != null && istype(closeOther, /obj/machinery/door/airlock/) && !closeOther.density)
Expand Down Expand Up @@ -1302,7 +1312,7 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays)

use_power(360) //360 W seems much more appropriate for an actuator moving an industrial door capable of crushing people
if(forced)
playsound(loc, 'sound/machines/airlockforced.ogg', 30, 1)
playsound(loc, 'modular_ss220/aesthetics/airlocks/sound/close_force.ogg', 30, 1) // SS220 EDIT: ORIGINAL - 'sound/machines/airlockforced.ogg'
else
playsound(loc, doorClose, 30, 1)
var/obj/structure/window/killthis = (locate(/obj/structure/window) in get_turf(src))
Expand Down
5 changes: 5 additions & 0 deletions modular_ss220/aesthetics/_aesthetics.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,8 @@
#include "intercom\code\intercom.dm"
#include "walls\code\walls.dm"
#include "windows\code\windows.dm"
#include "floors\code\tile_types.dm"
#include "decals\code\decals.dm"
#include "airlocks\code\airlock.dm"
#include "airlocks\code\airlock_types.dm"
#include "airlocks\code\airlock_assembly_types.dm"
9 changes: 9 additions & 0 deletions modular_ss220/aesthetics/airlocks/code/airlock.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/obj/machinery/door/airlock
icon = 'modular_ss220/aesthetics/airlocks/icons/station/public.dmi'
overlays_file = 'modular_ss220/aesthetics/airlocks/icons/station/overlays.dmi'
note_overlay_file = 'modular_ss220/aesthetics/airlocks/icons/station/overlays.dmi'

doorOpen = 'modular_ss220/aesthetics/airlocks/sound/open.ogg'
doorClose = 'modular_ss220/aesthetics/airlocks/sound/close.ogg'
boltUp = 'modular_ss220/aesthetics/airlocks/sound/bolts_up.ogg'
boltDown = 'modular_ss220/aesthetics/airlocks/sound/bolts_down.ogg'
133 changes: 133 additions & 0 deletions modular_ss220/aesthetics/airlocks/code/airlock_assembly_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
/obj/structure/door_assembly
icon = 'modular_ss220/aesthetics/airlocks/icons/station/public.dmi'
overlays_file = 'modular_ss220/aesthetics/airlocks/icons/station/overlays.dmi'

/obj/structure/door_assembly/door_assembly_public
icon = 'modular_ss220/aesthetics/airlocks/icons/station2/glass.dmi'
overlays_file = 'modular_ss220/aesthetics/airlocks/icons/station2/overlays.dmi'

/obj/structure/door_assembly/door_assembly_com
icon = 'modular_ss220/aesthetics/airlocks/icons/station/heads/command.dmi'

/obj/structure/door_assembly/door_assembly_cap
icon = 'modular_ss220/aesthetics/airlocks/icons/station/heads/cap.dmi'

/obj/structure/door_assembly/door_assembly_hop
icon = 'modular_ss220/aesthetics/airlocks/icons/station/heads/hop.dmi'

/obj/structure/door_assembly/door_assembly_cmo
icon = 'modular_ss220/aesthetics/airlocks/icons/station/heads/cmo.dmi'

/obj/structure/door_assembly/door_assembly_rd
icon = 'modular_ss220/aesthetics/airlocks/icons/station/heads/rd.dmi'

/obj/structure/door_assembly/door_assembly_hos
icon = 'modular_ss220/aesthetics/airlocks/icons/station/heads/hos.dmi'

/obj/structure/door_assembly/door_assembly_qm
icon = 'modular_ss220/aesthetics/airlocks/icons/station/heads/qm.dmi'

/obj/structure/door_assembly/door_assembly_ce
icon = 'modular_ss220/aesthetics/airlocks/icons/station/heads/ce.dmi'

/obj/structure/door_assembly/door_assembly_sec
icon = 'modular_ss220/aesthetics/airlocks/icons/station/security.dmi'

/obj/structure/door_assembly/door_assembly_eng
icon = 'modular_ss220/aesthetics/airlocks/icons/station/engineering.dmi'

/obj/structure/door_assembly/door_assembly_min
icon = 'modular_ss220/aesthetics/airlocks/icons/station/mining.dmi'

/obj/structure/door_assembly/door_assembly_atmo
icon = 'modular_ss220/aesthetics/airlocks/icons/station/atmos.dmi'

/obj/structure/door_assembly/door_assembly_research
icon = 'modular_ss220/aesthetics/airlocks/icons/station/research.dmi'

/obj/structure/door_assembly/door_assembly_science
icon = 'modular_ss220/aesthetics/airlocks/icons/station/science.dmi'

/obj/structure/door_assembly/door_assembly_med
icon = 'modular_ss220/aesthetics/airlocks/icons/station/medical.dmi'

/obj/structure/door_assembly/door_assembly_viro
icon = 'modular_ss220/aesthetics/airlocks/icons/station/virology.dmi'

/obj/structure/door_assembly/door_assembly_hydro
icon = 'modular_ss220/aesthetics/airlocks/icons/station/botany.dmi'

/obj/structure/door_assembly/door_assembly_eva
icon = 'modular_ss220/aesthetics/airlocks/icons/station/eva.dmi'

/obj/structure/door_assembly/door_assembly_service
icon = 'modular_ss220/aesthetics/airlocks/icons/station/service.dmi'

/obj/structure/door_assembly/door_assembly_psych
icon = 'modular_ss220/aesthetics/airlocks/icons/station/psych.dmi'

/obj/structure/door_assembly/door_assembly_bathroom
icon = 'modular_ss220/aesthetics/airlocks/icons/station/bathroom.dmi'

/obj/structure/door_assembly/door_assembly_lawyer
icon = 'modular_ss220/aesthetics/airlocks/icons/station/corporate.dmi'

/obj/structure/door_assembly/door_assembly_mai
icon = 'modular_ss220/aesthetics/airlocks/icons/station/maintenance.dmi'

/obj/structure/door_assembly/door_assembly_extmai
icon = 'modular_ss220/aesthetics/airlocks/icons/station/maintenanceexternal.dmi'

/obj/structure/door_assembly/door_assembly_ext
icon = 'modular_ss220/aesthetics/airlocks/icons/external/external.dmi'
overlays_file = 'modular_ss220/aesthetics/airlocks/icons/external/overlays.dmi'

/obj/structure/door_assembly/door_assembly_fre
icon = 'modular_ss220/aesthetics/airlocks/icons/station/freezer.dmi'

/obj/structure/door_assembly/door_assembly_hatch
icon = 'modular_ss220/aesthetics/airlocks/icons/hatch/centcom.dmi'
overlays_file = 'modular_ss220/aesthetics/airlocks/icons/hatch/overlays.dmi'

/obj/structure/door_assembly/door_assembly_mhatch
icon = 'modular_ss220/aesthetics/airlocks/icons/hatch/maintenance.dmi'
overlays_file = 'modular_ss220/aesthetics/airlocks/icons/hatch/overlays.dmi'

/obj/structure/door_assembly/door_assembly_highsecurity
icon = 'modular_ss220/aesthetics/airlocks/icons/highsec/highsec.dmi'
overlays_file = 'modular_ss220/aesthetics/airlocks/icons/highsec/overlays.dmi'

/obj/structure/door_assembly/multi_tile
icon = 'modular_ss220/aesthetics/airlocks/icons/glass_large/glass_large.dmi'
overlays_file = 'modular_ss220/aesthetics/airlocks/icons/glass_large/overlays.dmi'

/obj/structure/door_assembly/door_assembly_centcom
icon = 'modular_ss220/aesthetics/airlocks/icons/centcom/centcom.dmi'
overlays_file = 'modular_ss220/aesthetics/airlocks/icons/centcom/overlays.dmi'

/obj/structure/door_assembly/door_assembly_gold
icon = 'modular_ss220/aesthetics/airlocks/icons/station/gold.dmi'

/obj/structure/door_assembly/door_assembly_silver
icon = 'modular_ss220/aesthetics/airlocks/icons/station/silver.dmi'

/obj/structure/door_assembly/door_assembly_diamond
icon = 'modular_ss220/aesthetics/airlocks/icons/station/diamond.dmi'

/obj/structure/door_assembly/door_assembly_uranium
icon = 'modular_ss220/aesthetics/airlocks/icons/station/uranium.dmi'

/obj/structure/door_assembly/door_assembly_plasma
icon = 'modular_ss220/aesthetics/airlocks/icons/station/plasma.dmi'

/obj/structure/door_assembly/door_assembly_bananium
icon = 'modular_ss220/aesthetics/airlocks/icons/station/bananium.dmi'

/obj/structure/door_assembly/door_assembly_tranquillite
icon = 'modular_ss220/aesthetics/airlocks/icons/station/tranquilite.dmi'

/obj/structure/door_assembly/door_assembly_sandstone
icon = 'modular_ss220/aesthetics/airlocks/icons/station/sandstone.dmi'

/obj/structure/door_assembly/door_assembly_wood
icon = 'modular_ss220/aesthetics/airlocks/icons/station/wood.dmi'
Loading