Rock walls to use 3/4 sprites (#18137)

* a

* huhhhh

* agony

* idk

* 7

* huh

* a

---------

Co-authored-by: DreamySkrell <>
This commit is contained in:
DreamySkrell
2024-01-06 12:14:42 +00:00
committed by GitHub
co-authored by DreamySkrell <>
parent b50bffad8e
commit 5680b32618
3 changed files with 49 additions and 16 deletions
+8 -16
View File
@@ -2,7 +2,7 @@
/turf/unsimulated/mineral
name = "impassable rock"
icon = 'icons/turf/smooth/rock_dense.dmi'
icon_state = "wall"
icon_state = "preview_wall_unsimulated"
blocks_air = TRUE
density = TRUE
gender = PLURAL
@@ -22,16 +22,15 @@ var/list/mineral_can_smooth_with = list(
/turf/simulated/mineral //wall piece
name = "rock"
icon = 'icons/turf/map_placeholders.dmi'
icon_state = "rock"
icon = 'icons/turf/smooth/rock_dense.dmi'
icon_state = "preview_wall"
desc = "It's a greyish rock. Exciting."
gender = PLURAL
var/icon/actual_icon = 'icons/turf/smooth/rock_wall.dmi'
var/icon/actual_icon = 'icons/turf/smooth/rock_dense.dmi'
layer = ON_TURF_LAYER
// canSmoothWith is set in Initialize().
smoothing_flags = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
smoothing_hints = SMOOTHHINT_CUT_F | SMOOTHHINT_ONLY_MATCH_TURF | SMOOTHHINT_TARGETS_NOT_UNIQUE
initial_gas = null
opacity = TRUE
@@ -83,8 +82,6 @@ var/list/mineral_can_smooth_with = list(
if(smoothing_flags)
canSmoothWith = mineral_can_smooth_with
pixel_x = -4
pixel_y = -4
rock_health = rand(10,20)
@@ -129,6 +126,7 @@ var/list/mineral_can_smooth_with = list(
if(1.0)
mined_ore = 2 //some of the stuff gets blown up
GetDrilled()
SSicon_smooth.add_to_queue_neighbors(src)
/turf/simulated/mineral/bullet_act(var/obj/item/projectile/Proj)
if(istype(Proj, /obj/item/projectile/beam/plasmacutter))
@@ -167,19 +165,16 @@ var/list/mineral_can_smooth_with = list(
//For use in non-station z-levels as decoration.
/turf/unsimulated/mineral/asteroid
name = "rock"
icon = 'icons/turf/map_placeholders.dmi'
icon_state = "rock"
desc = "It's a greyish rock. Exciting."
opacity = TRUE
var/icon/actual_icon = 'icons/turf/smooth/rock_wall.dmi'
var/icon/actual_icon = 'icons/turf/smooth/rock_dense.dmi'
layer = 2.01
var/list/asteroid_can_smooth_with = list(
/turf/unsimulated/mineral,
/turf/unsimulated/mineral/asteroid
)
smoothing_flags = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
smoothing_hints = SMOOTHHINT_CUT_F | SMOOTHHINT_ONLY_MATCH_TURF | SMOOTHHINT_TARGETS_NOT_UNIQUE
color = null
color = "#705d40"
/turf/unsimulated/mineral/asteroid/Initialize(mapload)
SHOULD_CALL_PARENT(FALSE)
@@ -203,8 +198,6 @@ var/list/mineral_can_smooth_with = list(
if(smoothing_flags)
canSmoothWith = asteroid_can_smooth_with
pixel_x = -4
pixel_y = -4
return INITIALIZE_HINT_NORMAL
@@ -231,7 +224,6 @@ var/list/mineral_can_smooth_with = list(
clear_ore_effects()
if(!mineral)
name = "\improper Rock"
icon_state = "rock"
return
name = "\improper [mineral.display_name] deposit"
new /obj/effect/mineral(src, mineral)
@@ -626,7 +618,6 @@ var/list/mineral_can_smooth_with = list(
icon_state = ""
desc = "An exposed developer texture. Someone wasn't paying attention."
smoothing_flags = SMOOTH_FALSE
smoothing_hints = SMOOTHHINT_CUT_F | SMOOTHHINT_ONLY_MATCH_TURF | SMOOTHHINT_TARGETS_NOT_UNIQUE
gender = PLURAL
base_icon = 'icons/turf/map_placeholders.dmi'
base_icon_state = "ash"
@@ -915,4 +906,5 @@ var/list/asteroid_floor_smooth = list(
/turf/simulated/mineral/Destroy()
clear_ore_effects()
SSicon_smooth.add_to_queue_neighbors(src)
. = ..()
@@ -0,0 +1,41 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: DreamySkrell
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Asteroid and exoplanet rock walls now use the 3/4 sprites."
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB