cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-13 17:07:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Two New Away Sites + Extra Tiles and Other Stuff (#14611)

Browse Source
This commit is contained in:
WickedCybs
2022-08-22 17:49:39 -06:00
committed by GitHub
parent d3ec596e5f
commit e1ceeecfe2
25 changed files with 28512 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/tiles/tile_types.dm
+74
View File
@@ -75,6 +75,44 @@
drop_sound = 'sound/items/drop/wooden.ogg'
pickup_sound = 'sound/items/pickup/wooden.ogg'
/obj/item/stack/tile/wood/coloured
icon_state = "tile_woodcoloured"
/obj/item/stack/tile/wood/coloured/birch
name = "birch wood floor tile"
color = WOOD_COLOR_BIRCH
build_type = /obj/item/stack/tile/wood/coloured/birch
/obj/item/stack/tile/wood/coloured/mahogany
name = "mahogany wood floor tile"
color = WOOD_COLOR_RICH
build_type = /obj/item/stack/tile/wood/coloured/mahogany
/obj/item/stack/tile/wood/coloured/maple
name = "maple wood floor tile"
color = WOOD_COLOR_PALE
build_type = /obj/item/stack/tile/wood/coloured/maple
/obj/item/stack/tile/wood/coloured/bamboo
name = "bamboo wood floor tile"
color = WOOD_COLOR_PALE2
build_type = /obj/item/stack/tile/wood/coloured/bamboo
/obj/item/stack/tile/wood/coloured/ebony
name = "ebony wood floor tile"
color = WOOD_COLOR_BLACK
build_type = /obj/item/stack/tile/wood/coloured/ebony
/obj/item/stack/tile/wood/coloured/walnut
name = "walnut wood floor tile"
color = WOOD_COLOR_CHOCOLATE
build_type = /obj/item/stack/tile/wood/coloured/walnut
/obj/item/stack/tile/wood/coloured/yew
name = "yew wood floor tile"
color = WOOD_COLOR_YELLOW
build_type = /obj/item/stack/tile/wood/coloured/yew
/*
* Carpets
*/
@@ -130,6 +168,42 @@
drop_sound = 'sound/items/drop/cloth.ogg'
pickup_sound = 'sound/items/pickup/cloth.ogg'
/obj/item/stack/tile/carpet_fancybrown
name = "brown carpet"
icon_state = "tile_carpetbrown"
/obj/item/stack/tile/carpet_purple
name = "purple carpet"
icon_state = "tile_carpetpurple"
/obj/item/stack/tile/carpet_green
name = "green carpet"
icon_state = "tile_carpetgreen"
/obj/item/stack/tile/carpet_darkblue
name = "dark blue carpet"
icon_state = "tile_carpetblue"
/obj/item/stack/tile/carpet_lightblue
name = "light blue carpet"
icon_state = "tile_carpetblue2"
/obj/item/stack/tile/carpet_aquablue
name = "aqua blue carpet"
icon_state = "tile_carpetblue3"
/obj/item/stack/tile/carpet_red
name = "red carpet"
icon_state = "tile_carpetred"
/obj/item/stack/tile/carpet_orange
name = "orange carpet"
icon_state = "tile_carpetorange"
/obj/item/stack/tile/carpet_magenta
name = "magenta carpet"
icon_state = "tile_carpetmagenta"
/obj/item/stack/tile/lino
name = "old linoleum"
singular_name = "linoleum"
code/game/objects/items/weapons/tanks/tank_types.dm
+3
View File
@@ -122,6 +122,9 @@
/obj/item/tank/hydrogen/adjust_initial_gas()
air_contents.adjust_gas(GAS_HYDROGEN, (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/hydrogen/shuttle/adjust_initial_gas()
air_contents.adjust_gas(GAS_HYDROGEN, 4*(3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C))
/*
* Emergency Oxygen
*/