shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21 from ReoDaProtovali/Fixing-the-fixes

Browse Source 
Plentitide of small fixes part 2: electric boogaloo
This commit is contained in:
evilew
2024-11-17 20:35:18 +01:00
committed by GitHub
parent 5b8db19c80 0d3e6e9a31
commit 10a07b2b0d
77 changed files with 2858 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/airlock.dm
+7 -5
View File
@@ -43,7 +43,7 @@
/obj/machinery/door/airlock
name = "airlock"
icon = 'GainStation13/icons/obj/doors/airlocks/station/public.dmi' //GS13 change (perspective sprites)
icon = 'GainStation13/icons/obj/doors/airlocks/station/public.dmi' //GS13 Edit: perspective sprites
icon_state = "closed"
max_integrity = 300
var/normal_integrity = AIRLOCK_INTEGRITY_N
@@ -87,8 +87,10 @@
var/previous_airlock = /obj/structure/door_assembly //what airlock assembly mineral plating was applied to
var/wiretypepath = /datum/wires/airlock // which set of per round randomized wires this airlock type has.
var/airlock_material //material of inner filling; if its an airlock with glass, this should be set to "glass"
//GS13 Edit Start: perspective sprites
var/overlays_file = 'GainStation13/icons/obj/doors/airlocks/station/overlays.dmi'
var/note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/station/overlays.dmi' //Used for papers and photos pinned to the airlock
//GS13 End
var/cyclelinkeddir = 0
var/obj/machinery/door/airlock/cyclelinkedairlock
@@ -611,22 +613,22 @@
/obj/machinery/door/airlock/proc/check_unres() //unrestricted sides. This overlay indicates which directions the player can access even without an ID
if(hasPower() && unres_sides)
if(unres_sides & NORTH)
var/image/I = image(icon='GainStation13/icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_n") //layer=src.layer+1
var/image/I = image(icon='GainStation13/icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_n") //layer=src.layer+1 //GS13 Edit: perspective sprites
I.pixel_y = 32
set_light(l_range = 2, l_power = 1)
add_overlay(I)
if(unres_sides & SOUTH)
var/image/I = image(icon='GainStation13/icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_s") //layer=src.layer+1
var/image/I = image(icon='GainStation13/icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_s") //layer=src.layer+1 //GS13 Edit: perspective sprites
I.pixel_y = -32
set_light(l_range = 2, l_power = 1)
add_overlay(I)
if(unres_sides & EAST)
var/image/I = image(icon='GainStation13/icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_e") //layer=src.layer+1
var/image/I = image(icon='GainStation13/icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_e") //layer=src.layer+1 //GS13 Edit: perspective sprites
I.pixel_x = 32
set_light(l_range = 2, l_power = 1)
add_overlay(I)
if(unres_sides & WEST)
var/image/I = image(icon='GainStation13/icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_w") //layer=src.layer+1
var/image/I = image(icon='GainStation13/icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_w") //layer=src.layer+1 //GS13 Edit: perspective sprites
I.pixel_x = -32
set_light(l_range = 2, l_power = 1)
add_overlay(I)
code/game/machinery/doors/airlock_types.dm
+56 -58
View File
@@ -2,25 +2,23 @@
Station Airlocks Regular
*/
//GS13 - changed most of these airlock sprite paths to use perspective-oriented airlocks
/obj/machinery/door/airlock/abandoned
abandoned = TRUE
/obj/machinery/door/airlock/command
icon = 'GainStation13/icons/obj/doors/airlocks/station/command.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/command.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_com
wiretypepath = /datum/wires/airlock/command
normal_integrity = 450
/obj/machinery/door/airlock/security
icon = 'GainStation13/icons/obj/doors/airlocks/station/security.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/security.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_sec
wiretypepath = /datum/wires/airlock/security
normal_integrity = 450
/obj/machinery/door/airlock/engineering
icon = 'GainStation13/icons/obj/doors/airlocks/station/engineering.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/engineering.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_eng
wiretypepath = /datum/wires/airlock/engineering
@@ -28,13 +26,13 @@
abandoned = TRUE
/obj/machinery/door/airlock/medical
icon = 'GainStation13/icons/obj/doors/airlocks/station/medical.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/medical.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_med
wiretypepath = /datum/wires/airlock/medical
/obj/machinery/door/airlock/maintenance
name = "maintenance access"
icon = 'GainStation13/icons/obj/doors/airlocks/station/maintenance.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/maintenance.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_mai
normal_integrity = 250
@@ -43,18 +41,18 @@
/obj/machinery/door/airlock/maintenance/external
name = "external airlock access"
icon = 'GainStation13/icons/obj/doors/airlocks/station/maintenanceexternal.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/maintenanceexternal.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_extmai
/obj/machinery/door/airlock/mining
name = "mining airlock"
icon = 'GainStation13/icons/obj/doors/airlocks/station/mining.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/mining.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_min
wiretypepath = /datum/wires/airlock/cargo
/obj/machinery/door/airlock/atmos
name = "atmospherics airlock"
icon = 'GainStation13/icons/obj/doors/airlocks/station/atmos.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/atmos.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_atmo
wiretypepath = /datum/wires/airlock/engineering
@@ -62,22 +60,22 @@
abandoned = TRUE
/obj/machinery/door/airlock/research
icon = 'GainStation13/icons/obj/doors/airlocks/station/research.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/research.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_research
wiretypepath = /datum/wires/airlock/science
/obj/machinery/door/airlock/freezer
name = "freezer airlock"
icon = 'GainStation13/icons/obj/doors/airlocks/station/freezer.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/freezer.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_fre
/obj/machinery/door/airlock/science
icon = 'GainStation13/icons/obj/doors/airlocks/station/science.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/science.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_science
wiretypepath = /datum/wires/airlock/science
/obj/machinery/door/airlock/virology
icon = 'GainStation13/icons/obj/doors/airlocks/station/virology.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/virology.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_viro
wiretypepath = /datum/wires/airlock/medical
@@ -181,7 +179,7 @@
/obj/machinery/door/airlock/gold
name = "gold airlock"
icon = 'GainStation13/icons/obj/doors/airlocks/station/gold.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/gold.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_gold
/obj/machinery/door/airlock/gold/glass
@@ -190,7 +188,7 @@
/obj/machinery/door/airlock/silver
name = "silver airlock"
icon = 'GainStation13/icons/obj/doors/airlocks/station/silver.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/silver.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_silver
/obj/machinery/door/airlock/silver/glass
@@ -199,7 +197,7 @@
/obj/machinery/door/airlock/diamond
name = "diamond airlock"
icon = 'GainStation13/icons/obj/doors/airlocks/station/diamond.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/diamond.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_diamond
normal_integrity = 1000
explosion_block = 2
@@ -211,7 +209,7 @@
/obj/machinery/door/airlock/uranium
name = "uranium airlock"
icon = 'GainStation13/icons/obj/doors/airlocks/station/uranium.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/uranium.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_uranium
var/last_event = 0
@@ -233,7 +231,7 @@
/obj/machinery/door/airlock/plasma
name = "plasma airlock"
desc = "No way this can end badly."
icon = 'GainStation13/icons/obj/doors/airlocks/station/plasma.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/plasma.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_plasma
/obj/machinery/door/airlock/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
@@ -274,7 +272,7 @@
/obj/machinery/door/airlock/bananium
name = "bananium airlock"
desc = "Honkhonkhonk"
icon = 'GainStation13/icons/obj/doors/airlocks/station/bananium.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/bananium.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_bananium
doorOpen = 'sound/items/bikehorn.ogg'
@@ -284,7 +282,7 @@
/obj/machinery/door/airlock/sandstone
name = "sandstone airlock"
icon = 'GainStation13/icons/obj/doors/airlocks/station/sandstone.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/sandstone.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_sandstone
/obj/machinery/door/airlock/sandstone/glass
@@ -293,7 +291,7 @@
/obj/machinery/door/airlock/wood
name = "wooden airlock"
icon = 'GainStation13/icons/obj/doors/airlocks/station/wood.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/wood.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_wood
/obj/machinery/door/airlock/wood/glass
@@ -303,8 +301,8 @@
/obj/machinery/door/airlock/titanium
name = "shuttle airlock"
assemblytype = /obj/structure/door_assembly/door_assembly_titanium
icon = 'GainStation13/icons/obj/doors/airlocks/shuttle/shuttle.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/shuttle/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/shuttle/shuttle.dmi' //GS13 Edit: perspective sprites
overlays_file = 'GainStation13/icons/obj/doors/airlocks/shuttle/overlays.dmi' //GS13 Edit: perspective sprites
normal_integrity = 400
/obj/machinery/door/airlock/titanium/glass
@@ -314,8 +312,8 @@
/obj/machinery/door/airlock/bronze
name = "bronze airlock"
icon = 'GainStation13/icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/clockwork/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi' //GS13 Edit: perspective sprites
overlays_file = 'GainStation13/icons/obj/doors/airlocks/clockwork/overlays.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_bronze
/obj/machinery/door/airlock/bronze/seethru
@@ -329,8 +327,8 @@
*/
/obj/machinery/door/airlock/public
icon = 'GainStation13/icons/obj/doors/airlocks/station2/glass.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/station2/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station2/glass.dmi' //GS13 Edit: perspective sprites
overlays_file = 'GainStation13/icons/obj/doors/airlocks/station2/overlays.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_public
/obj/machinery/door/airlock/public/glass
@@ -358,9 +356,9 @@
/obj/machinery/door/airlock/external
name = "external airlock"
icon = 'GainStation13/icons/obj/doors/airlocks/external/external.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/external/overlays.dmi'
note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/external/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/external/external.dmi' //GS13 Edit: perspective sprites
overlays_file = 'GainStation13/icons/obj/doors/airlocks/external/overlays.dmi' //GS13 Edit: perspective sprites
note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/external/overlays.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_ext
/obj/machinery/door/airlock/external/glass
@@ -373,16 +371,16 @@
*/
/obj/machinery/door/airlock/centcom //Use grunge as a station side version, as these have special effects related to them via phobias and such.
icon = 'GainStation13/icons/obj/doors/airlocks/centcom/centcom.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/centcom/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/centcom/centcom.dmi' //GS13 Edit: perspective sprites
overlays_file = 'GainStation13/icons/obj/doors/airlocks/centcom/overlays.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_centcom
normal_integrity = 1000
security_level = 6
explosion_block = 2
/obj/machinery/door/airlock/grunge
icon = 'GainStation13/icons/obj/doors/airlocks/centcom/centcom.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/centcom/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/centcom/centcom.dmi' //GS13 Edit: perspective sprites
overlays_file = 'GainStation13/icons/obj/doors/airlocks/centcom/overlays.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_grunge
/obj/machinery/door/airlock/grunge/abandoned
@@ -395,8 +393,8 @@
/obj/machinery/door/airlock/vault
name = "vault door"
icon = 'GainStation13/icons/obj/doors/airlocks/vault/vault.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/vault/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/vault/vault.dmi' //GS13 Edit: perspective sprites
overlays_file = 'GainStation13/icons/obj/doors/airlocks/vault/overlays.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_vault
wiretypepath = /datum/wires/airlock/secure
explosion_block = 2
@@ -410,16 +408,16 @@
/obj/machinery/door/airlock/hatch
name = "airtight hatch"
icon = 'GainStation13/icons/obj/doors/airlocks/hatch/centcom.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi'
note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/hatch/centcom.dmi' //GS13 Edit: perspective sprites
overlays_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi' //GS13 Edit: perspective sprites
note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_hatch
/obj/machinery/door/airlock/maintenance_hatch
name = "maintenance hatch"
icon = 'GainStation13/icons/obj/doors/airlocks/hatch/maintenance.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi'
note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/hatch/maintenance.dmi' //GS13 Edit: perspective sprites
overlays_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi' //GS13 Edit: perspective sprites
note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_mhatch
/obj/machinery/door/airlock/maintenance_hatch/abandoned
@@ -432,8 +430,8 @@
/obj/machinery/door/airlock/highsecurity
name = "high tech security airlock"
icon = 'GainStation13/icons/obj/doors/airlocks/highsec/highsec.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/highsec/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/highsec/highsec.dmi' //GS13 Edit: perspective sprites
overlays_file = 'GainStation13/icons/obj/doors/airlocks/highsec/overlays.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_highsecurity
explosion_block = 2
normal_integrity = 500
@@ -447,8 +445,8 @@
/obj/machinery/door/airlock/shuttle
name = "shuttle airlock"
icon = 'GainStation13/icons/obj/doors/airlocks/shuttle/shuttle.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/shuttle/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/shuttle/shuttle.dmi' //GS13 Edit: perspective sprites
overlays_file = 'GainStation13/icons/obj/doors/airlocks/shuttle/overlays.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_shuttle
/obj/machinery/door/airlock/shuttle/glass
@@ -458,10 +456,10 @@
/obj/machinery/door/airlock/abductor
name = "alien airlock"
desc = "With humanity's current technological level, it could take years to hack this advanced airlock... or maybe we should give a screwdriver a try?"
icon = 'GainStation13/icons/obj/doors/airlocks/abductor/abductor_airlock.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/abductor/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/abductor/abductor_airlock.dmi' //GS13 Edit: perspective sprites
overlays_file = 'GainStation13/icons/obj/doors/airlocks/abductor/overlays.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_abductor
note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/external/overlays.dmi'
note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/external/overlays.dmi' //GS13 Edit: perspective sprites
damage_deflection = 30
explosion_block = 3
hackProof = TRUE
@@ -476,8 +474,8 @@
/obj/machinery/door/airlock/cult
name = "cult airlock"
icon = 'GainStation13/icons/obj/doors/airlocks/cult/runed/cult.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/cult/runed/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/cult/runed/cult.dmi' //GS13 Edit: perspective sprites
overlays_file = 'GainStation13/icons/obj/doors/airlocks/cult/runed/overlays.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_cult
hackProof = TRUE
aiControlDisabled = 1
@@ -526,8 +524,8 @@
return FALSE
/obj/machinery/door/airlock/cult/proc/conceal()
icon = 'GainStation13/icons/obj/doors/airlocks/station/maintenance.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/station/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/maintenance.dmi' //GS13 Edit: perspective sprites
overlays_file = 'GainStation13/icons/obj/doors/airlocks/station/overlays.dmi' //GS13 Edit: perspective sprites
name = "airlock"
desc = "It opens and closes."
stealthy = TRUE
@@ -558,8 +556,8 @@
friendly = TRUE
/obj/machinery/door/airlock/cult/unruned
icon = 'GainStation13/icons/obj/doors/airlocks/cult/unruned/cult.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/cult/unruned/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/cult/unruned/cult.dmi' //GS13 Edit: perspective sprites
overlays_file = 'GainStation13/icons/obj/doors/airlocks/cult/unruned/overlays.dmi' //GS13 Edit: perspective sprites
assemblytype = /obj/structure/door_assembly/door_assembly_cult/unruned
openingoverlaytype = /obj/effect/temp_visual/cult/door/unruned
@@ -701,8 +699,8 @@
/obj/machinery/door/airlock/glass_large
name = "large glass airlock"
icon = 'GainStation13/icons/obj/doors/airlocks/glass_large/glass_large.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/glass_large/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/glass_large/glass_large.dmi' //GS13 Edit: perspective sprites
overlays_file = 'GainStation13/icons/obj/doors/airlocks/glass_large/overlays.dmi' //GS13 Edit: perspective sprites
opacity = 0
assemblytype = null
glass = TRUE
code/game/machinery/doors/poddoor.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/machinery/door/poddoor
name = "blast door"
desc = "A heavy duty blast door that opens mechanically."
icon = 'GainStation13/icons/obj/doors/blastdoor.dmi' //GS13
icon = 'GainStation13/icons/obj/doors/blastdoor.dmi' //GS13 Edit: perspective sprites
icon_state = "closed"
var/id = 1
layer = BLASTDOOR_LAYER
code/game/machinery/doors/shutters.dm
+4 -4
View File
@@ -2,7 +2,7 @@
gender = PLURAL
name = "shutters"
desc = "Mechanical metal shutters operated by a button with a magnetic seal, keeping them airtight."
icon = 'GainStation13/icons/obj/doors/shutters.dmi' //GS13
icon = 'icons/obj/doors/shutters.dmi'
layer = SHUTTER_LAYER
closingLayer = SHUTTER_LAYER
armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 75, BOMB = 25, BIO = 100, RAD = 100, FIRE = 100, ACID = 70)
@@ -22,7 +22,7 @@
/obj/machinery/door/poddoor/shutters/old
name = "strong shutters"
desc = "These shutters have an armoured frame; it looks like plasteel. These shutters look robust enough to survive explosions."
icon = 'GainStation13/icons/obj/doors/shutters_old.dmi' //GS13
icon = 'icons/obj/doors/shutters_old.dmi'
icon_state = "closed"
armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 75, BOMB = 30, BIO = 100, RAD = 100, FIRE = 100, ACID = 70)
max_integrity = 300
@@ -37,7 +37,7 @@
/obj/machinery/door/poddoor/shutters/radiation
name = "radiation shutters"
desc = "Lead-lined shutters painted yellow with a radioactive hazard symbol on it. Blocks out most radiation"
icon = 'GainStation13/icons/obj/doors/shutters_radiation.dmi' //GS13
icon = 'icons/obj/doors/shutters_radiation.dmi'
icon_state = "closed"
rad_insulation = 0.2
@@ -60,7 +60,7 @@
/obj/machinery/door/poddoor/shutters/window
name = "windowed shutters"
desc = "Mechanical shutters that have some form of plastic window in them, allowing you to see through the shutters at all times."
icon = 'GainStation13/icons/obj/doors/shutters_window.dmi' //GS13
icon = 'icons/obj/doors/shutters_window.dmi'
icon_state = "closed"
opacity = 0
glass = 1
code/game/objects/effects/decals/cleanable/misc.dm
+5 -3
View File
@@ -277,24 +277,26 @@
icon_state = "salt_pile"
gender = NEUTER
/obj/effect/decal/cleanable/glitter //GS13 - changed glitters to more subtle variants
/obj/effect/decal/cleanable/glitter
name = "generic glitter pile"
desc = "The herpes of arts and crafts."
icon = 'GainStation13/icons/effects/atmospherics.dmi'
icon_state = "glitter"
icon = 'icons/effects/atmospherics.dmi'
gender = NEUTER
mergeable_decal = TRUE
persistent = FALSE
/obj/effect/decal/cleanable/glitter/pink
name = "pink glitter"
icon_state = "plasma_old"
color = "#9e0089"
/obj/effect/decal/cleanable/glitter/white
name = "white glitter"
icon_state = "nitrous_oxide_old"
/obj/effect/decal/cleanable/glitter/blue
name = "blue glitter"
icon_state = "freon_old"
color = "#2dd6ff"
/obj/effect/decal/cleanable/plasma
code/game/objects/structures/beds_chairs/chair.dm
+2 -2
View File
@@ -160,7 +160,7 @@
buildstacktype = null //Custom mats handle this
/obj/structure/chair/wood
icon = 'GainStation13/icons/obj/chairs.dmi'
icon = 'GainStation13/icons/obj/chairs.dmi' //GS13 Edit: Our sprites
icon_state = "wooden_chair"
name = "wooden chair"
desc = "Old is never too old to not be in fashion."
@@ -540,7 +540,7 @@
/obj/item/chair/wood
name = "wooden chair"
icon = 'GainStation13/icons/obj/chairs.dmi'
icon = 'GainStation13/icons/obj/chairs.dmi' //GS13 Edit: Our sprites
icon_state = "wooden_chair_toppled"
item_state = "woodenchair"
resistance_flags = FLAMMABLE