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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

Browse Source
This commit is contained in:
Ghommie
2019-12-06 20:09:35 +01:00
parent 6484eea339 0598c35d70
commit 542c9007ee
1029 changed files with 34299 additions and 143444 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/floor/fancy_floor.dm
+56 -6
View File
@@ -19,8 +19,8 @@
tiled_dirt = FALSE
/turf/open/floor/wood/examine(mob/user)
..()
to_chat(user, "<span class='notice'>There's a few <b>screws</b> and a <b>small crack</b> visible.</span>")
. = ..()
. += "<span class='notice'>There's a few <b>screws</b> and a <b>small crack</b> visible.</span>"
/turf/open/floor/wood/screwdriver_act(mob/living/user, obj/item/I)
if(..())
@@ -65,7 +65,7 @@
temperature = 255.37
/turf/open/floor/wood/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/grass
name = "grass patch"
@@ -96,6 +96,56 @@
if(..())
return
/turf/open/floor/grass/fairy //like grass but fae-er
name = "fairygrass patch"
desc = "Something about this grass makes you want to frolic. Or get high."
icon_state = "fairygrass"
floor_tile = /obj/item/stack/tile/fairygrass
light_range = 2
light_power = 0.80
light_color = "#33CCFF"
color = "#33CCFF"
/turf/open/floor/grass/fairy/white
name = "white fairygrass patch"
light_color = "#FFFFFF"
color = "#FFFFFF"
floor_tile = /obj/item/stack/tile/fairygrass/white
/turf/open/floor/grass/fairy/red
name = "red fairygrass patch"
light_color = "#FF3333"
color = "#FF3333"
floor_tile = /obj/item/stack/tile/fairygrass/red
/turf/open/floor/grass/fairy/yellow
name = "yellow fairygrass patch"
light_color = "#FFFF66"
color = "#FFFF66"
floor_tile = /obj/item/stack/tile/fairygrass/yellow
/turf/open/floor/grass/fairy/green
name = "green fairygrass patch"
light_color = "#99FF99"
color = "#99FF99"
floor_tile = /obj/item/stack/tile/fairygrass/green
/turf/open/floor/grass/fairy/blue
name = "blue fairygrass patch"
floor_tile = /obj/item/stack/tile/fairygrass/blue
/turf/open/floor/grass/fairy/purple
name = "purple fairygrass patch"
light_color = "#D966FF"
color = "#D966FF"
floor_tile = /obj/item/stack/tile/fairygrass/purple
/turf/open/floor/grass/fairy/pink
name = "pink fairygrass patch"
light_color = "#FFB3DA"
color = "#FFB3DA"
floor_tile = /obj/item/stack/tile/fairygrass/pink
/turf/open/floor/grass/snow
gender = PLURAL
name = "snow"
@@ -105,7 +155,7 @@
ore_type = /obj/item/stack/sheet/mineral/snow
planetary_atmos = TRUE
floor_tile = null
initial_gas_mix = "o2=22;n2=82;TEMP=180"
initial_gas_mix = FROZEN_ATMOS
slowdown = 2
bullet_sizzle = TRUE
footstep = FOOTSTEP_SAND
@@ -174,8 +224,8 @@
tiled_dirt = FALSE
/turf/open/floor/carpet/examine(mob/user)
..()
to_chat(user, "<span class='notice'>There's a <b>small crack</b> on the edge of it.</span>")
. = ..()
. += "<span class='notice'>There's a <b>small crack</b> on the edge of it.</span>"
/turf/open/floor/carpet/Initialize()
. = ..()
code/game/turfs/simulated/floor/light_floor.dm
+2 -2
View File
@@ -14,8 +14,8 @@
/turf/open/floor/light/examine(mob/user)
..()
to_chat(user, "<span class='notice'>There's a <b>small crack</b> on the edge of it.</span>")
. = ..()
. += "<span class='notice'>There's a <b>small crack</b> on the edge of it.</span>"
/turf/open/floor/light/Initialize()
. = ..()
code/game/turfs/simulated/floor/mineral_floor.dm
+8 -8
View File
@@ -84,31 +84,31 @@
broken_states = list("titanium_dam1","titanium_dam2","titanium_dam3","titanium_dam4","titanium_dam5")
/turf/open/floor/mineral/titanium/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/mineral/titanium/yellow
icon_state = "titanium_yellow"
/turf/open/floor/mineral/titanium/yellow/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/mineral/titanium/blue
icon_state = "titanium_blue"
/turf/open/floor/mineral/titanium/blue/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/mineral/titanium/white
icon_state = "titanium_white"
/turf/open/floor/mineral/titanium/white/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/mineral/titanium/purple
icon_state = "titanium_purple"
/turf/open/floor/mineral/titanium/purple/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
//PLASTITANIUM (syndieshuttle)
/turf/open/floor/mineral/plastitanium
@@ -118,13 +118,13 @@
broken_states = list("plastitanium_dam1","plastitanium_dam2","plastitanium_dam3","plastitanium_dam4","plastitanium_dam5")
/turf/open/floor/mineral/plastitanium/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/mineral/plastitanium/red
icon_state = "plastitanium_red"
/turf/open/floor/mineral/plastitanium/red/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/mineral/plastitanium/red/brig
name = "brig floor"
@@ -170,7 +170,7 @@
spam_flag = world.time + 10
/turf/open/floor/mineral/bananium/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
//DIAMOND
code/game/turfs/simulated/floor/misc_floor.dm
+6 -6
View File
@@ -45,10 +45,10 @@
on = FALSE
/turf/open/floor/circuit/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/circuit/telecomms
initial_gas_mix = "n2=100;TEMP=80"
initial_gas_mix = TCOMMS_ATMOS
/turf/open/floor/circuit/telecomms/mainframe
name = "mainframe base"
@@ -72,10 +72,10 @@
floor_tile = /obj/item/stack/tile/circuit/green/anim
/turf/open/floor/circuit/green/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/circuit/green/telecomms
initial_gas_mix = "n2=100;TEMP=80"
initial_gas_mix = TCOMMS_ATMOS
/turf/open/floor/circuit/green/telecomms/mainframe
name = "mainframe base"
@@ -96,10 +96,10 @@
floor_tile = /obj/item/stack/tile/circuit/red/anim
/turf/open/floor/circuit/red/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/circuit/red/telecomms
initial_gas_mix = "n2=100;TEMP=80"
initial_gas_mix = TCOMMS_ATMOS
/turf/open/floor/pod
name = "pod floor"
code/game/turfs/simulated/floor/plasteel_floor.dm
+9 -9
View File
@@ -5,8 +5,8 @@
burnt_states = list("floorscorched1", "floorscorched2")
/turf/open/floor/plasteel/examine(mob/user)
..()
to_chat(user, "<span class='notice'>There's a <b>small crack</b> on the edge of it.</span>")
. = ..()
. += "<span class='notice'>There's a <b>small crack</b> on the edge of it.</span>"
/turf/open/floor/plasteel/update_icon()
if(!..())
@@ -16,17 +16,17 @@
/turf/open/floor/plasteel/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/plasteel/telecomms
initial_gas_mix = "n2=100;TEMP=80"
initial_gas_mix = TCOMMS_ATMOS
/turf/open/floor/plasteel/dark
icon_state = "darkfull"
/turf/open/floor/plasteel/dark/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/plasteel/dark/telecomms
initial_gas_mix = "n2=100;TEMP=80"
initial_gas_mix = TCOMMS_ATMOS
/turf/open/floor/plasteel/airless/dark
icon_state = "darkfull"
/turf/open/floor/plasteel/dark/side
@@ -50,7 +50,7 @@
/turf/open/floor/plasteel/airless/white/corner
icon_state = "whitecorner"
/turf/open/floor/plasteel/white/telecomms
initial_gas_mix = "n2=100;TEMP=80"
initial_gas_mix = TCOMMS_ATMOS
/turf/open/floor/plasteel/yellowsiding
@@ -82,7 +82,7 @@
/turf/open/floor/plasteel/freezer
icon_state = "freezerfloor"
/turf/open/floor/plasteel/freezer/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/plasteel/grimy
icon_state = "grimy"
@@ -111,7 +111,7 @@
/turf/open/floor/plasteel/cult/narsie_act()
return
/turf/open/floor/plasteel/cult/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/plasteel/stairs
code/game/turfs/simulated/floor/plating.dm
+4 -4
View File
@@ -20,14 +20,14 @@
var/attachment_holes = TRUE
/turf/open/floor/plating/examine(mob/user)
..()
. = ..()
if(broken || burnt)
to_chat(user, "<span class='notice'>It looks like the dents could be <i>welded</i> smooth.</span>")
. += "<span class='notice'>It looks like the dents could be <i>welded</i> smooth.</span>"
return
if(attachment_holes)
to_chat(user, "<span class='notice'>There are a few attachment holes for a new <i>tile</i> or reinforcement <i>rods</i>.</span>")
. += "<span class='notice'>There are a few attachment holes for a new <i>tile</i> or reinforcement <i>rods</i>.</span>"
else
to_chat(user, "<span class='notice'>You might be able to build ontop of it with some <i>tiles</i>...</span>")
. += "<span class='notice'>You might be able to build ontop of it with some <i>tiles</i>...</span>"
/turf/open/floor/plating/Initialize()
if (!broken_states)
code/game/turfs/simulated/floor/plating/asteroid.dm
+5 -5
View File
@@ -103,7 +103,7 @@
/turf/open/floor/plating/asteroid/basalt/airless
baseturfs = /turf/open/floor/plating/asteroid/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/plating/asteroid/basalt/Initialize()
. = ..()
@@ -131,7 +131,7 @@
/turf/open/floor/plating/asteroid/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
turf_type = /turf/open/floor/plating/asteroid/airless
@@ -307,7 +307,7 @@
baseturfs = /turf/open/floor/plating/asteroid/snow
icon_state = "snow"
icon_plating = "snow"
initial_gas_mix = "o2=22;n2=82;TEMP=180"
initial_gas_mix = FROZEN_ATMOS
slowdown = 2
environment_type = "snow"
flags_1 = NONE
@@ -344,11 +344,11 @@
return FALSE
/turf/open/floor/plating/asteroid/snow/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/plating/asteroid/snow/temperatre
initial_gas_mix = "o2=22;n2=82;TEMP=255.37"
/turf/open/floor/plating/asteroid/snow/atmosphere
initial_gas_mix = "o2=22;n2=82;TEMP=180"
initial_gas_mix = FROZEN_ATMOS
planetary_atmos = FALSE
code/game/turfs/simulated/floor/plating/misc_plating.dm
+3 -3
View File
@@ -1,7 +1,7 @@
/turf/open/floor/plating/airless
icon_state = "plating"
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/plating/abductor
name = "alien floor"
@@ -172,7 +172,7 @@
desc = "A sheet of solid ice. Looks slippery."
icon = 'icons/turf/floors/ice_turf.dmi'
icon_state = "unsmooth"
initial_gas_mix = "o2=22;n2=82;TEMP=180"
initial_gas_mix = FROZEN_ATMOS
temperature = 180
planetary_atmos = TRUE
baseturfs = /turf/open/floor/plating/ice
@@ -215,7 +215,7 @@
desc = "A section of heated plating, helps keep the snow from stacking up too high."
icon = 'icons/turf/snow.dmi'
icon_state = "snowplating"
initial_gas_mix = "o2=22;n2=82;TEMP=180"
initial_gas_mix = FROZEN_ATMOS
temperature = 180
attachment_holes = FALSE
planetary_atmos = TRUE
code/game/turfs/simulated/floor/reinf_floor.dm
+11 -11
View File
@@ -13,11 +13,11 @@
tiled_dirt = FALSE
/turf/open/floor/engine/examine(mob/user)
..()
to_chat(user, "<span class='notice'>The reinforcement rods are <b>wrenched</b> firmly in place.</span>")
. = ..()
. += "<span class='notice'>The reinforcement rods are <b>wrenched</b> firmly in place.</span>"
/turf/open/floor/engine/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/engine/break_tile()
return //unbreakable
@@ -98,28 +98,28 @@
/turf/open/floor/engine/n2o
article = "an"
name = "\improper N2O floor"
initial_gas_mix = "n2o=6000;TEMP=293.15"
initial_gas_mix = ATMOS_TANK_N2O
/turf/open/floor/engine/co2
name = "\improper CO2 floor"
initial_gas_mix = "co2=50000;TEMP=293.15"
initial_gas_mix = ATMOS_TANK_CO2
/turf/open/floor/engine/plasma
name = "plasma floor"
initial_gas_mix = "plasma=70000;TEMP=293.15"
initial_gas_mix = ATMOS_TANK_PLASMA
/turf/open/floor/engine/o2
name = "\improper O2 floor"
initial_gas_mix = "o2=100000;TEMP=293.15"
initial_gas_mix = ATMOS_TANK_O2
/turf/open/floor/engine/n2
article = "an"
name = "\improper N2 floor"
initial_gas_mix = "n2=100000;TEMP=293.15"
initial_gas_mix = ATMOS_TANK_N2
/turf/open/floor/engine/air
name = "air floor"
initial_gas_mix = "o2=2644;n2=10580;TEMP=293.15"
initial_gas_mix = ATMOS_TANK_AIRMIX
@@ -159,8 +159,8 @@
addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
/turf/open/floor/engine/cult/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/engine/vacuum
name = "vacuum floor"
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS