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

more wood stuff

Browse Source
This commit is contained in:
Kabra_men
2021-01-25 17:37:06 -03:00
parent 128bbba467
commit 41c87b5e85
14 changed files with 249 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/false_walls.dm
+27
View File
@@ -282,6 +282,33 @@
walltype = /turf/closed/wall/mineral/wood
canSmoothWith = list(/obj/structure/falsewall/wood, /turf/closed/wall/mineral/wood)
/obj/structure/falsewall/gmushroom
name = "mushroom wall"
desc = "A wall with mushroom plating."
icon = 'icons/turf/walls/gmushroom_wall.dmi'
icon_state = "gmushroom"
mineral = /obj/item/stack/sheet/mineral/gmushroom
walltype = /turf/closed/wall/mineral/gmushroom
canSmoothWith = list(/obj/structure/falsewall/gmushroom, /turf/closed/wall/mineral/gmushroom)
/obj/structure/falsewall/plaswood
name = "plaswood wall"
desc = "A wall with plaswood plating."
icon = 'icons/turf/walls/plaswood_wall.dmi'
icon_state = "plaswood"
mineral = /obj/item/stack/sheet/mineral/plaswood
walltype = /turf/closed/wall/mineral/plaswood
canSmoothWith = list(/obj/structure/falsewall/plaswood, /turf/closed/wall/mineral/plaswood)
/obj/structure/falsewall/shadoww
name = "shadow wall"
desc = "A wall with shadow wood plating."
icon = 'icons/turf/walls/shadoww_wall.dmi'
icon_state = "shadoww"
mineral = /obj/item/stack/sheet/mineral/shadoww
walltype = /turf/closed/wall/mineral/shadoww
canSmoothWith = list(/obj/structure/falsewall/shadoww, /turf/closed/wall/mineral/shadoww)
/obj/structure/falsewall/iron
name = "rough metal wall"
desc = "A wall with rough metal plating."
code/game/objects/structures/table_frames.dm
+6
View File
@@ -148,6 +148,8 @@
var/toConstruct // stores the table variant
if(istype(I, /obj/item/stack/sheet/mineral/plaswood))
toConstruct = /obj/structure/table/plaswood
else if(istype(I, /obj/item/stack/tile/carpet))
toConstruct = /obj/structure/table/plaswood/plaswoodpoker
if (toConstruct)
if(material.get_amount() < 1)
@@ -177,6 +179,8 @@
var/toConstruct // stores the table variant
if(istype(I, /obj/item/stack/sheet/mineral/gmushroom))
toConstruct = /obj/structure/table/gmushroom
else if(istype(I, /obj/item/stack/tile/carpet))
toConstruct = /obj/structure/table/gmushroom/gmushroompoker
if (toConstruct)
if(material.get_amount() < 1)
@@ -206,6 +210,8 @@
var/toConstruct // stores the table variant
if(istype(I, /obj/item/stack/sheet/mineral/shadoww))
toConstruct = /obj/structure/table/shadoww
else if(istype(I, /obj/item/stack/tile/carpet))
toConstruct = /obj/structure/table/shadoww/shadowwpoker
if (toConstruct)
if(material.get_amount() < 1)
code/game/objects/structures/tables_racks.dm
+33 -6
View File
@@ -326,13 +326,22 @@
name = "Shadow wood table"
desc = "Do not apply fire to this. Rumour says it burns easily."
icon = 'icons/obj/smooth_structures/shadoww_table.dmi'
icon_state = "wood_table"
icon_state = "shadoww_table"
frame = /obj/structure/table_frame/shadoww
framestack = /obj/item/stack/sheet/mineral/shadoww
buildstack = /obj/item/stack/sheet/mineral/shadoww
resistance_flags = FLAMMABLE
max_integrity = 70
canSmoothWith = null
canSmoothWith = list(/obj/structure/table/shadoww,
/obj/structure/table/shadoww/shadowwpoker)
/obj/structure/table/shadoww/shadowwpoker
name = "gambling table"
desc = "A seedy table for seedy dealings in seedy places."
icon = 'icons/obj/smooth_structures/shadowwpoker_table.dmi'
icon_state = "shadowwpoker_table"
frame = /obj/structure/table_frame/shadoww
buildstack = /obj/item/stack/tile/carpet
/*
* Plaswood tables
@@ -342,15 +351,24 @@
name = "plaswood table"
desc = "An strong and grey wooden table."
icon = 'icons/obj/smooth_structures/plaswood_table.dmi'
icon_state = "wood_table"
frame = /obj/structure/table_frame/wood
icon_state = "plaswood_table"
frame = /obj/structure/table_frame/plaswood
framestack = /obj/item/stack/sheet/mineral/plaswood
buildstack = /obj/item/stack/sheet/mineral/plaswood
resistance_flags = FLAMMABLE
max_integrity = 200
integrity_failure = 50
armor = list("melee" = 10, "bullet" = 30, "laser" = 30, "energy" = 100, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70)
canSmoothWith = null
canSmoothWith = list(/obj/structure/table/plaswood,
/obj/structure/table/plaswood/plaswoodpoker)
/obj/structure/table/plaswood/plaswoodpoker
name = "gambling table"
desc = "A seedy table for seedy dealings in seedy places."
icon = 'icons/obj/smooth_structures/plaswoodpoker_table.dmi'
icon_state = "plaswoodpoker_table"
frame = /obj/structure/table_frame/plaswood
buildstack = /obj/item/stack/tile/carpet
/*
* Mushroom tables
@@ -366,7 +384,16 @@
buildstack = /obj/item/stack/sheet/mineral/gmushroom
resistance_flags = FIRE_PROOF
max_integrity = 70
canSmoothWith = null
canSmoothWith = list(/obj/structure/table/gmushroom,
/obj/structure/table/gmushroom/gmushroompoker)
/obj/structure/table/gmushroom/gmushroompoker
name = "gambling table"
desc = "A seedy table for seedy dealings in seedy places."
icon = 'icons/obj/smooth_structures/gmushroompoker_table.dmi'
icon_state = "gmushroompoker_table"
frame = /obj/structure/table_frame/gmushroom
buildstack = /obj/item/stack/tile/carpet
/*
* Wooden tables