Merge pull request #10567 from VOREStation/upstream-merge-8104

[MIRROR] Adds new rocks + resprites mining outcrops
This commit is contained in:
Aronai Sieyes
2021-06-07 01:08:05 -04:00
committed by GitHub
4 changed files with 42 additions and 0 deletions
@@ -0,0 +1,41 @@
/obj/structure/prop/rock
name = "rock"
desc = "A hard place."
icon = 'icons/obj/flora/rocks.dmi'
icon_state = "basalt2"
/obj/structure/prop/rock/sharp
icon_state = "basalt1"
/obj/structure/prop/rock/flat
icon_state = "basalt3"
/obj/structure/prop/rock/round
icon_state = "basalt4"
/obj/structure/prop/rock/small
name = "small rocks"
icon_state = "lavarocks1"
density = FALSE
/obj/structure/prop/rock/small/alt
icon_state = "lavarocks2"
//Water-trim versions for placing in water
/obj/structure/prop/rock/water
icon_state = "basalt_water2"
/obj/structure/prop/rock/watersharp
icon_state = "basalt_water1"
/obj/structure/prop/rock/waterflat
icon_state = "basalt_water3"
/obj/structure/prop/rock/small/water
name = "submerged rocks"
icon_state = "waterrocks1"
density = FALSE
/obj/structure/prop/rock/small/wateralt
icon_state = "waterrocks2"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

+1
View File
@@ -1536,6 +1536,7 @@
#include "code\game\objects\structures\props\projectile_lock.dm"
#include "code\game\objects\structures\props\prop.dm"
#include "code\game\objects\structures\props\puzzledoor.dm"
#include "code\game\objects\structures\props\rocks.dm"
#include "code\game\objects\structures\props\swarm.dm"
#include "code\game\objects\structures\props\transmitter.dm"
#include "code\game\objects\structures\stool_bed_chair_nest\alien_nests.dm"