cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-18 10:31:41 +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-23 01:49:39 +02: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/modules/materials/material_sheets.dm
+59
View File
@@ -312,6 +312,65 @@
amount = max_amount
update_icon()
/obj/item/stack/material/wood/coloured
icon_state = "sheet-woodcolour"
/obj/item/stack/material/wood/coloured/birch
color = WOOD_COLOR_BIRCH
/obj/item/stack/material/wood/coloured/birch/Initialize()
. = ..()
amount = max_amount
update_icon()
/obj/item/stack/material/wood/coloured/mahogany
color = WOOD_COLOR_RICH
/obj/item/stack/material/wood/coloured/mahogany/Initialize()
. = ..()
amount = max_amount
update_icon()
/obj/item/stack/material/wood/coloured/maple
color = WOOD_COLOR_PALE
/obj/item/stack/material/wood/coloured/maple/Initialize()
. = ..()
amount = max_amount
update_icon()
/obj/item/stack/material/wood/coloured/bamboo
color = WOOD_COLOR_PALE2
/obj/item/stack/material/wood/coloured/bamboo/Initialize()
. = ..()
amount = max_amount
update_icon()
/obj/item/stack/material/wood/coloured/ebony
color = WOOD_COLOR_BLACK
/obj/item/stack/material/wood/coloured/ebony/Initialize()
. = ..()
amount = max_amount
update_icon()
/obj/item/stack/material/wood/coloured/walnut
color = WOOD_COLOR_CHOCOLATE
/obj/item/stack/material/wood/coloured/walnut/Initialize()
. = ..()
amount = max_amount
update_icon()
/obj/item/stack/material/wood/coloured/yew
color = WOOD_COLOR_YELLOW
/obj/item/stack/material/wood/coloured/yew/Initialize()
. = ..()
amount = max_amount
update_icon()
/obj/item/stack/material/woodlog
name = "log"
icon_state = "sheet-wood"
code/modules/materials/materials.dm
+35
View File
@@ -716,6 +716,41 @@
weapon_hitsound = 'sound/weapons/woodenhit.ogg'
shatter_sound = /decl/sound_category/wood_break_sound
/material/wood/birch
name = MATERIAL_BIRCH
stack_type = /obj/item/stack/material/wood/coloured/birch
icon_colour = WOOD_COLOR_BIRCH
/material/wood/mahogany
name = MATERIAL_MAHOGANY
stack_type = /obj/item/stack/material/wood/coloured/mahogany
icon_colour = WOOD_COLOR_RICH
/material/wood/maple
name = MATERIAL_MAPLE
stack_type = /obj/item/stack/material/wood/coloured/maple
icon_colour = WOOD_COLOR_PALE
/material/wood/bamboo
name = MATERIAL_BAMBOO
stack_type = /obj/item/stack/material/wood/coloured/bamboo
icon_colour = WOOD_COLOR_PALE2
/material/wood/ebony
name = MATERIAL_EBONY
stack_type = /obj/item/stack/material/wood/coloured/ebony
icon_colour = WOOD_COLOR_BLACK
/material/wood/walnut
name = MATERIAL_WALNUT
stack_type = /obj/item/stack/material/wood/coloured/walnut
icon_colour = WOOD_COLOR_CHOCOLATE
/material/wood/yew
name = MATERIAL_YEW
stack_type = /obj/item/stack/material/wood/coloured/yew
icon_colour = WOOD_COLOR_YELLOW
/material/wood/log //This is gonna replace wood planks in a way for NBT, leaving it here for now
name = MATERIAL_WOOD_LOG
stack_type = /obj/item/stack/material/woodlog
code/modules/overmap/overmap_shuttle.dm
+6
View File
@@ -166,4 +166,10 @@
/obj/structure/fuel_port/hide()
return
/obj/structure/fuel_port/hydrogen // Not only does this work, It's more sensible for most factions without reasonable access to phoron, to use.
/obj/structure/fuel_port/hydrogen/Initialize()
. = ..()
new /obj/item/tank/hydrogen/shuttle(src)
#undef waypoint_sector
code/modules/power/apc.dm
+3
View File
@@ -115,6 +115,9 @@
/obj/machinery/power/apc/hyper
cell_type = /obj/item/cell/hyper
/obj/machinery/power/apc/empty
start_charge = 0
/obj/machinery/power/apc
name = "area power controller"
desc = "A control terminal for the area electrical systems."