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

Merge pull request #1339 from Kabramen/Stargate-fixes

Browse Source 
Stargate map fixes and new sandstone walls sprites.
This commit is contained in:
Dahlular
2021-07-03 23:34:59 -06:00
committed by GitHub
parent a81681d7e4 b0a98f0c18
commit 45aa075615
7 changed files with 276 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/false_walls.dm
+1 -1
View File
@@ -271,7 +271,7 @@
icon_state = "sandstone"
mineral = /obj/item/stack/sheet/mineral/sandstone
walltype = /turf/closed/wall/mineral/sandstone
canSmoothWith = list(/obj/structure/falsewall/sandstone, /turf/closed/wall/mineral/sandstone)
canSmoothWith = list(/obj/structure/falsewall/sandstone, /turf/closed/wall/mineral/sandstone, /obj/structure/window/fulltile)
/obj/structure/falsewall/wood
name = "wooden wall"
code/game/objects/structures/window.dm
+3 -1
View File
@@ -516,7 +516,9 @@
/obj/machinery/door/airlock/hatch,
/obj/machinery/door/airlock/engineering/glass/critical,
/obj/machinery/door/airlock/atmos,
/obj/machinery/door/airlock/highsecurity,)
/obj/machinery/door/airlock/highsecurity,
/turf/closed/wall/mineral/sandstone,
/obj/structure/falsewall/sandstone,)
// canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile)
glass_amount = 2
code/game/turfs/simulated/floor/misc_floor.dm
+26
View File
@@ -260,3 +260,29 @@
icon = 'icons/obj/clockwork_objects.dmi'
icon_state = "clockwork_floor"
floor_tile = /obj/item/stack/tile/bronze
/turf/open/floor/concrete/
name = "concrete"
icon = 'icons/turf/floors.dmi'
icon_state = "concrete"
baseturfs = /turf/open/floor/plating/asteroid
/turf/open/floor/concrete/smooth
icon_state = "concrete2"
/turf/open/floor/cobble/side
icon_state = "cobble_side"
/turf/open/floor/cobble/corner
icon_state = "cobble_corner"
/turf/open/floor/cobble
name = "cobblestone path"
desc = "A simple but beautiful path made of various sized stones."
icon = 'icons/turf/floors.dmi'
icon_state = "cobble"
baseturfs = /turf/open/floor/plating/asteroid
footstep = FOOTSTEP_FLOOR
barefootstep = FOOTSTEP_HARD_BAREFOOT
clawfootstep = FOOTSTEP_HARD_CLAW
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
code/game/turfs/simulated/wall/mineral_walls.dm
+1 -1
View File
@@ -49,7 +49,7 @@
icon_state = "sandstone"
sheet_type = /obj/item/stack/sheet/mineral/sandstone
explosion_block = 0
canSmoothWith = list(/turf/closed/wall/mineral/sandstone, /obj/structure/falsewall/sandstone)
canSmoothWith = list(/turf/closed/wall/mineral/sandstone, /obj/structure/falsewall/sandstone, /obj/structure/window/fulltile)
/turf/closed/wall/mineral/uranium
article = "a"