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

Merge pull request #14 from sheepishgoat/fixes-and-maps

Browse Source 
plentitude of small fixes
This commit is contained in:
sheepishgoat
2024-10-30 14:15:55 -04:00
committed by GitHub
parent c91abc56f7 096df974f5
commit 81d700f1a7
120 changed files with 377 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/airlock.dm
+7 -7
View File
@@ -43,7 +43,7 @@
/obj/machinery/door/airlock
name = "airlock"
icon = 'icons/obj/doors/airlocks/station/public.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/public.dmi' //GS13 change (perspective sprites)
icon_state = "closed"
max_integrity = 300
var/normal_integrity = AIRLOCK_INTEGRITY_N
@@ -87,8 +87,8 @@
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"
var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //Used for papers and photos pinned to the airlock
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
var/cyclelinkeddir = 0
var/obj/machinery/door/airlock/cyclelinkedairlock
@@ -611,22 +611,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='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
I.pixel_y = 32
set_light(l_range = 2, l_power = 1)
add_overlay(I)
if(unres_sides & SOUTH)
var/image/I = image(icon='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
I.pixel_y = -32
set_light(l_range = 2, l_power = 1)
add_overlay(I)
if(unres_sides & EAST)
var/image/I = image(icon='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
I.pixel_x = 32
set_light(l_range = 2, l_power = 1)
add_overlay(I)
if(unres_sides & WEST)
var/image/I = image(icon='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
I.pixel_x = -32
set_light(l_range = 2, l_power = 1)
add_overlay(I)
code/game/machinery/doors/airlock_types.dm
+58 -56
View File
@@ -2,23 +2,25 @@
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 = 'icons/obj/doors/airlocks/station/command.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/command.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_com
wiretypepath = /datum/wires/airlock/command
normal_integrity = 450
/obj/machinery/door/airlock/security
icon = 'icons/obj/doors/airlocks/station/security.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/security.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_sec
wiretypepath = /datum/wires/airlock/security
normal_integrity = 450
/obj/machinery/door/airlock/engineering
icon = 'icons/obj/doors/airlocks/station/engineering.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/engineering.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_eng
wiretypepath = /datum/wires/airlock/engineering
@@ -26,13 +28,13 @@
abandoned = TRUE
/obj/machinery/door/airlock/medical
icon = 'icons/obj/doors/airlocks/station/medical.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/medical.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_med
wiretypepath = /datum/wires/airlock/medical
/obj/machinery/door/airlock/maintenance
name = "maintenance access"
icon = 'icons/obj/doors/airlocks/station/maintenance.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/maintenance.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_mai
normal_integrity = 250
@@ -41,18 +43,18 @@
/obj/machinery/door/airlock/maintenance/external
name = "external airlock access"
icon = 'icons/obj/doors/airlocks/station/maintenanceexternal.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/maintenanceexternal.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_extmai
/obj/machinery/door/airlock/mining
name = "mining airlock"
icon = 'icons/obj/doors/airlocks/station/mining.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/mining.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_min
wiretypepath = /datum/wires/airlock/cargo
/obj/machinery/door/airlock/atmos
name = "atmospherics airlock"
icon = 'icons/obj/doors/airlocks/station/atmos.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/atmos.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_atmo
wiretypepath = /datum/wires/airlock/engineering
@@ -60,22 +62,22 @@
abandoned = TRUE
/obj/machinery/door/airlock/research
icon = 'icons/obj/doors/airlocks/station/research.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/research.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_research
wiretypepath = /datum/wires/airlock/science
/obj/machinery/door/airlock/freezer
name = "freezer airlock"
icon = 'icons/obj/doors/airlocks/station/freezer.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/freezer.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_fre
/obj/machinery/door/airlock/science
icon = 'icons/obj/doors/airlocks/station/science.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/science.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_science
wiretypepath = /datum/wires/airlock/science
/obj/machinery/door/airlock/virology
icon = 'icons/obj/doors/airlocks/station/virology.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/virology.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_viro
wiretypepath = /datum/wires/airlock/medical
@@ -179,7 +181,7 @@
/obj/machinery/door/airlock/gold
name = "gold airlock"
icon = 'icons/obj/doors/airlocks/station/gold.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/gold.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_gold
/obj/machinery/door/airlock/gold/glass
@@ -188,7 +190,7 @@
/obj/machinery/door/airlock/silver
name = "silver airlock"
icon = 'icons/obj/doors/airlocks/station/silver.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/silver.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_silver
/obj/machinery/door/airlock/silver/glass
@@ -197,7 +199,7 @@
/obj/machinery/door/airlock/diamond
name = "diamond airlock"
icon = 'icons/obj/doors/airlocks/station/diamond.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/diamond.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_diamond
normal_integrity = 1000
explosion_block = 2
@@ -209,7 +211,7 @@
/obj/machinery/door/airlock/uranium
name = "uranium airlock"
icon = 'icons/obj/doors/airlocks/station/uranium.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/uranium.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_uranium
var/last_event = 0
@@ -231,7 +233,7 @@
/obj/machinery/door/airlock/plasma
name = "plasma airlock"
desc = "No way this can end badly."
icon = 'icons/obj/doors/airlocks/station/plasma.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/plasma.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_plasma
/obj/machinery/door/airlock/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
@@ -272,7 +274,7 @@
/obj/machinery/door/airlock/bananium
name = "bananium airlock"
desc = "Honkhonkhonk"
icon = 'icons/obj/doors/airlocks/station/bananium.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/bananium.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_bananium
doorOpen = 'sound/items/bikehorn.ogg'
@@ -282,7 +284,7 @@
/obj/machinery/door/airlock/sandstone
name = "sandstone airlock"
icon = 'icons/obj/doors/airlocks/station/sandstone.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/sandstone.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_sandstone
/obj/machinery/door/airlock/sandstone/glass
@@ -291,7 +293,7 @@
/obj/machinery/door/airlock/wood
name = "wooden airlock"
icon = 'icons/obj/doors/airlocks/station/wood.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/wood.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_wood
/obj/machinery/door/airlock/wood/glass
@@ -301,8 +303,8 @@
/obj/machinery/door/airlock/titanium
name = "shuttle airlock"
assemblytype = /obj/structure/door_assembly/door_assembly_titanium
icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi'
overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/shuttle/shuttle.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/shuttle/overlays.dmi'
normal_integrity = 400
/obj/machinery/door/airlock/titanium/glass
@@ -312,8 +314,8 @@
/obj/machinery/door/airlock/bronze
name = "bronze airlock"
icon = 'icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi'
overlays_file = 'icons/obj/doors/airlocks/clockwork/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/clockwork/overlays.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_bronze
/obj/machinery/door/airlock/bronze/seethru
@@ -327,8 +329,8 @@
*/
/obj/machinery/door/airlock/public
icon = 'icons/obj/doors/airlocks/station2/glass.dmi'
overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station2/glass.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/station2/overlays.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_public
/obj/machinery/door/airlock/public/glass
@@ -356,9 +358,9 @@
/obj/machinery/door/airlock/external
name = "external airlock"
icon = 'icons/obj/doors/airlocks/external/external.dmi'
overlays_file = 'icons/obj/doors/airlocks/external/overlays.dmi'
note_overlay_file = 'icons/obj/doors/airlocks/external/overlays.dmi'
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'
assemblytype = /obj/structure/door_assembly/door_assembly_ext
/obj/machinery/door/airlock/external/glass
@@ -371,16 +373,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 = 'icons/obj/doors/airlocks/centcom/centcom.dmi'
overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/centcom/centcom.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/centcom/overlays.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_centcom
normal_integrity = 1000
security_level = 6
explosion_block = 2
/obj/machinery/door/airlock/grunge
icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi'
overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/centcom/centcom.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/centcom/overlays.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_grunge
/obj/machinery/door/airlock/grunge/abandoned
@@ -393,8 +395,8 @@
/obj/machinery/door/airlock/vault
name = "vault door"
icon = 'icons/obj/doors/airlocks/vault/vault.dmi'
overlays_file = 'icons/obj/doors/airlocks/vault/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/vault/vault.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/vault/overlays.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_vault
wiretypepath = /datum/wires/airlock/secure
explosion_block = 2
@@ -408,16 +410,16 @@
/obj/machinery/door/airlock/hatch
name = "airtight hatch"
icon = 'icons/obj/doors/airlocks/hatch/centcom.dmi'
overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi'
note_overlay_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi'
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'
assemblytype = /obj/structure/door_assembly/door_assembly_hatch
/obj/machinery/door/airlock/maintenance_hatch
name = "maintenance hatch"
icon = 'icons/obj/doors/airlocks/hatch/maintenance.dmi'
overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi'
note_overlay_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi'
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'
assemblytype = /obj/structure/door_assembly/door_assembly_mhatch
/obj/machinery/door/airlock/maintenance_hatch/abandoned
@@ -430,8 +432,8 @@
/obj/machinery/door/airlock/highsecurity
name = "high tech security airlock"
icon = 'icons/obj/doors/airlocks/highsec/highsec.dmi'
overlays_file = 'icons/obj/doors/airlocks/highsec/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/highsec/highsec.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/highsec/overlays.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_highsecurity
explosion_block = 2
normal_integrity = 500
@@ -445,8 +447,8 @@
/obj/machinery/door/airlock/shuttle
name = "shuttle airlock"
icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi'
overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/shuttle/shuttle.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/shuttle/overlays.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_shuttle
/obj/machinery/door/airlock/shuttle/glass
@@ -456,10 +458,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 = 'icons/obj/doors/airlocks/abductor/abductor_airlock.dmi'
overlays_file = 'icons/obj/doors/airlocks/abductor/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/abductor/abductor_airlock.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/abductor/overlays.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_abductor
note_overlay_file = 'icons/obj/doors/airlocks/external/overlays.dmi'
note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/external/overlays.dmi'
damage_deflection = 30
explosion_block = 3
hackProof = TRUE
@@ -474,8 +476,8 @@
/obj/machinery/door/airlock/cult
name = "cult airlock"
icon = 'icons/obj/doors/airlocks/cult/runed/cult.dmi'
overlays_file = 'icons/obj/doors/airlocks/cult/runed/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/cult/runed/cult.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/cult/runed/overlays.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_cult
hackProof = TRUE
aiControlDisabled = 1
@@ -524,8 +526,8 @@
return FALSE
/obj/machinery/door/airlock/cult/proc/conceal()
icon = 'icons/obj/doors/airlocks/station/maintenance.dmi'
overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/station/maintenance.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/station/overlays.dmi'
name = "airlock"
desc = "It opens and closes."
stealthy = TRUE
@@ -556,8 +558,8 @@
friendly = TRUE
/obj/machinery/door/airlock/cult/unruned
icon = 'icons/obj/doors/airlocks/cult/unruned/cult.dmi'
overlays_file = 'icons/obj/doors/airlocks/cult/unruned/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/cult/unruned/cult.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/cult/unruned/overlays.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_cult/unruned
openingoverlaytype = /obj/effect/temp_visual/cult/door/unruned
@@ -699,8 +701,8 @@
/obj/machinery/door/airlock/glass_large
name = "large glass airlock"
icon = 'icons/obj/doors/airlocks/glass_large/glass_large.dmi'
overlays_file = 'icons/obj/doors/airlocks/glass_large/overlays.dmi'
icon = 'GainStation13/icons/obj/doors/airlocks/glass_large/glass_large.dmi'
overlays_file = 'GainStation13/icons/obj/doors/airlocks/glass_large/overlays.dmi'
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 = 'icons/obj/doors/blastdoor.dmi'
icon = 'GainStation13/icons/obj/doors/blastdoor.dmi' //GS13
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 = 'icons/obj/doors/shutters.dmi'
icon = 'GainStation13/icons/obj/doors/shutters.dmi' //GS13
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 = 'icons/obj/doors/shutters_old.dmi'
icon = 'GainStation13/icons/obj/doors/shutters_old.dmi' //GS13
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 = 'icons/obj/doors/shutters_radiation.dmi'
icon = 'GainStation13/icons/obj/doors/shutters_radiation.dmi' //GS13
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 = 'icons/obj/doors/shutters_window.dmi'
icon = 'GainStation13/icons/obj/doors/shutters_window.dmi' //GS13
icon_state = "closed"
opacity = 0
glass = 1
code/game/objects/effects/decals/cleanable/misc.dm
+5 -5
View File
@@ -277,25 +277,25 @@
icon_state = "salt_pile"
gender = NEUTER
/obj/effect/decal/cleanable/glitter
/obj/effect/decal/cleanable/glitter //GS13 - changed glitters to more subtle variants
name = "generic glitter pile"
desc = "The herpes of arts and crafts."
icon = 'icons/effects/atmospherics.dmi'
icon = 'GainStation13/icons/effects/atmospherics.dmi'
icon_state = "glitter"
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
name = "stabilized plasma"
code/game/objects/structures/barsigns.dm
+5
View File
@@ -291,6 +291,11 @@
icon = "thehive"
desc = "Comb in for some sweet drinks! Not known for serving any sappy drink."
/datum/barsign/the_busted_belt //gs13
name = "The Busted Belt"
icon = "thebustedbelt"
desc = "GATO is not liable for any pieces of broken wardrobe."
/datum/barsign/hiddensigns
hidden = TRUE
code/game/objects/structures/beds_chairs/chair.dm
+2
View File
@@ -160,6 +160,7 @@
buildstacktype = null //Custom mats handle this
/obj/structure/chair/wood
icon = 'GainStation13/icons/obj/chairs.dmi'
icon_state = "wooden_chair"
name = "wooden chair"
desc = "Old is never too old to not be in fashion."
@@ -539,6 +540,7 @@
/obj/item/chair/wood
name = "wooden chair"
icon = 'GainStation13/icons/obj/chairs.dmi'
icon_state = "wooden_chair_toppled"
item_state = "woodenchair"
resistance_flags = FLAMMABLE
code/modules/events/anomaly_pyro.dm
+1 -1
View File
@@ -3,7 +3,7 @@
typepath = /datum/round_event/anomaly/anomaly_pyro
min_players = 10 //GS13 tweak
max_occurrences = 5
max_occurrences = 0
weight = 20
description = "This anomaly sets things on fire, and creates a pyroclastic slime."
code/modules/events/brain_trauma.dm
+2 -1
View File
@@ -2,7 +2,8 @@
name = "Spontaneous Brain Trauma"
typepath = /datum/round_event/brain_trauma
weight = 25
min_players = 8 //GS13 - somewhat harmless ig
min_players = 20 //GS13 - somewhat harmless ig
max_occurrences = 0
category = EVENT_CATEGORY_HEALTH
description = "A crewmember gains a random trauma."
code/modules/events/brand_intelligence.dm
+1 -1
View File
@@ -4,7 +4,7 @@
weight = 5
min_players = 15
max_occurrences = 1
max_occurrences = 0
category = EVENT_CATEGORY_AI
description = "Vending machines will attack people until the Patient Zero is disabled."
code/modules/events/disease_outbreak.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/round_event_control/disease_outbreak
name = "Disease Outbreak"
typepath = /datum/round_event/disease_outbreak
max_occurrences = 3
max_occurrences = 0
min_players = 5
weight = 5
category = EVENT_CATEGORY_HEALTH
code/modules/events/electrical_storm.dm
+3 -2
View File
@@ -1,15 +1,16 @@
/datum/round_event_control/electrical_storm
name = "Electrical Storm"
typepath = /datum/round_event/electrical_storm
earliest_start = 20 MINUTES
earliest_start = 30 MINUTES
min_players = 5
weight = 40
max_occurrences = 2
category = EVENT_CATEGORY_ENGINEERING
description = "Destroys all lights in a large area."
/datum/round_event/electrical_storm
var/lightsoutAmount = 1
var/lightsoutRange = 25
var/lightsoutRange = 10
announce_when = 1
/datum/round_event/electrical_storm/announce(fake)
code/modules/events/mice_migration.dm
+2 -2
View File
@@ -6,8 +6,8 @@
description = "A horde of mice arrives, and perhaps even the Rat King themselves."
/datum/round_event/mice_migration
var/minimum_mice = 5
var/maximum_mice = 15
var/minimum_mice = 3
var/maximum_mice = 8
/datum/round_event/mice_migration/announce(fake)
var/cause = pick("space-winter", "budget-cuts", "Ragnarok",
code/modules/events/shuttle_loan.dm
+28 -9
View File
@@ -1,12 +1,13 @@
#define HIJACK_SYNDIE 1
#define RUSKY_PARTY 2
#define SPIDER_GIFT 3
#define DEPARTMENT_RESUPPLY 4
#define ANTIDOTE_NEEDED 5
#define PIZZA_DELIVERY 6
#define ITS_HIP_TO 7
#define MY_GOD_JC 8
#define DELTA_CRATES 9
#define SNACK_ATTACK 1 //GS13
#define HIJACK_SYNDIE 2
#define RUSKY_PARTY 3
#define SPIDER_GIFT 4
#define DEPARTMENT_RESUPPLY 5
#define ANTIDOTE_NEEDED 6
#define PIZZA_DELIVERY 7
#define ITS_HIP_TO 8
#define MY_GOD_JC 9
#define DELTA_CRATES 10
/datum/round_event_control/shuttle_loan
name = "Shuttle Loan"
@@ -32,6 +33,9 @@
var/message = "Cargo: I just wanna tell you techs good luck, we are all counting on you."
var/title = "CentCom Free Real Estate"
switch(dispatch_type)
if(SNACK_ATTACK) //GS13
message = "Cargo: Our science division took couple too many samples from one the local candy biohabitats. Would you care to dispose of the unneeded specimen?"
title = "CentCom Science Division"
if(HIJACK_SYNDIE)
message = "Cargo: The syndicate are trying to infiltrate your station. If you let them hijack your cargo shuttle, you'll save us a headache."
title = "CentCom Counter Intelligence"
@@ -81,6 +85,8 @@
SSshuttle.supply.setTimer(3000)
switch(dispatch_type)
if(SNACK_ATTACK) //GS13
SSshuttle.centcom_message += "Snack attack en route."
if(HIJACK_SYNDIE)
SSshuttle.centcom_message += "Syndicate hijack team incoming."
if(RUSKY_PARTY)
@@ -125,6 +131,19 @@
var/list/shuttle_spawns = list()
switch(dispatch_type)
if(SNACK_ATTACK) //GS13
shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime)
shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime)
shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast)
if(prob(50))
shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast)
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco)
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco)
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco)
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/chocoorange)
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/chocoorange)
shuttle_spawns.Add(/obj/item/paper/fluff/chocoslime_research)
if(HIJACK_SYNDIE)
var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/emergency/specialops]
pack.generate(pick_n_take(empty_shuttle_turfs))
code/modules/holiday/halloween/jacqueen.dm
+1 -1
View File
@@ -34,7 +34,7 @@
/mob/living/simple_animal/jacq
name = "Jacqueline the Pumpqueen"
real_name = "Jacqueline"
icon = 'icons/obj/halloween_items.dmi'
icon = 'GainStation13/icons/obj/halloween_items.dmi'
icon_state = "jacqueline"
maxHealth = 25
health = 25
code/modules/mob/dead/new_player/new_player.dm
+1 -1
View File
@@ -493,7 +493,7 @@
if(!arrivals_docked)
var/atom/movable/screen/splash/Spl = new(character.client, TRUE)
Spl.Fade(TRUE)
character.playsound_local(get_turf(character), 'sound/voice/ApproachingTG.ogg', 25)
character.playsound_local(get_turf(character), 'GainStation13/sound/voice/Approaching.ogg', 25) //GS13 - "now approaching, general station 13"
job.standard_assign_skills(character.mind)
code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm
+1 -1
View File
@@ -66,7 +66,7 @@
if(mob_size == MOB_SIZE_LARGE)
cuff_icon += "_[caste]"
dmi_file = 'icons/mob/alienqueen.dmi'
dmi_file = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites
var/mutable_appearance/cuffs = mutable_appearance(dmi_file, cuff_icon, -HANDCUFF_LAYER)
cuffs.color = handcuffed.color
code/modules/mob/living/carbon/alien/humanoid/queen.dm
+2 -2
View File
@@ -1,6 +1,6 @@
/mob/living/carbon/alien/humanoid/royal
//Common stuffs for Praetorian and Queen
icon = 'icons/mob/alienqueen.dmi'
icon = 'hyperstation/icons/mobs/alienqueen.dmi'
status_flags = 0
unique_name = 0
pixel_x = -16
@@ -17,7 +17,7 @@
meleeSlashHumanPower = 30
meleeSlashSAPower = 60
var/alt_inhands_file = 'icons/mob/alienqueen.dmi'
var/alt_inhands_file = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites
/mob/living/carbon/alien/humanoid/royal/can_inject(mob/user, error_msg, target_zone, penetrate_thick = FALSE, bypass_immunity = FALSE)
return FALSE
code/modules/mob/living/simple_animal/hostile/alien.dm
+1 -1
View File
@@ -145,7 +145,7 @@
/mob/living/simple_animal/hostile/alien/queen/large
name = "alien empress"
icon = 'icons/mob/alienqueen.dmi'
icon = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites
icon_state = "alienq"
icon_living = "alienq"
icon_dead = "alienq_dead"
code/modules/mob/living/simple_animal/hostile/bear.dm
+1 -1
View File
@@ -27,7 +27,7 @@
spacewalk = TRUE
var/armored = FALSE
obj_damage = 60
obj_damage = 20
melee_damage_lower = 15 // i know it's like half what it used to be, but bears cause bleeding like crazy now so it works out
melee_damage_upper = 15
wound_bonus = -5
code/modules/vending/clothesmate.dm
+1 -2
View File
@@ -228,7 +228,6 @@
/obj/item/clothing/under/costume/basil_boys = 20,
/obj/item/clothing/head/basil_boys = 20,
/obj/item/clothing/shoes/basil_boys = 20,
/* Commenting out until next Christmas or made automatic
/obj/item/clothing/accessory/sweater/uglyxmas = 3,
/obj/item/clothing/under/costume/christmas = 3,
/obj/item/clothing/under/costume/christmas/green = 3,
@@ -242,7 +241,6 @@
/obj/item/clothing/shoes/winterboots/christmasbootsr = 3,
/obj/item/clothing/shoes/winterboots/christmasbootsg = 3,
/obj/item/clothing/shoes/winterboots/santaboots = 3,
*/
/obj/item/clothing/head/cowboyhat = 3,
/obj/item/clothing/head/cowboyhat/black = 3,
/obj/item/clothing/head/cowboyhat/white = 3,
@@ -269,6 +267,7 @@
/obj/item/clothing/suit/vapeshirt = 2,
/obj/item/clothing/under/costume/geisha = 4,
/obj/item/clothing/under/misc/keyholesweater = 3,
/obj/item/clothing/suit/space/hardsuit/engine/haydee = 1, //GS13
/obj/item/clothing/under/misc/staffassistant = 5)
premium = list(/obj/item/clothing/under/suit/checkered = 4,
/obj/item/clothing/head/mailman = 2,