mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-21 20:20:33 +01:00
Adds several new bamboo items + sprites
This commit is contained in:
@@ -107,7 +107,7 @@
|
||||
weapon.play_tool_sound(src)
|
||||
deconstruct(disassembled = TRUE)
|
||||
return TRUE
|
||||
|
||||
|
||||
/obj/structure/chair/attack_tk(mob/user)
|
||||
if(!anchored || has_buckled_mobs() || !isturf(user.loc))
|
||||
return ..()
|
||||
@@ -297,6 +297,16 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool, 0)
|
||||
|
||||
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
|
||||
|
||||
/obj/structure/chair/stool/bamboo
|
||||
name = "bamboo stool"
|
||||
desc = "A makeshift bamboo stool with a rustic look."
|
||||
icon_state = "bamboo_stool"
|
||||
resistance_flags = FLAMMABLE
|
||||
max_integrity = 60
|
||||
buildstacktype = /obj/item/stack/sheet/mineral/bamboo
|
||||
buildstackamount = 2
|
||||
item_chair = /obj/item/chair/stool/bamboo
|
||||
|
||||
/obj/item/chair
|
||||
name = "chair"
|
||||
desc = "Bar brawl essential."
|
||||
@@ -399,6 +409,14 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
|
||||
inhand_icon_state = "stool_bar"
|
||||
origin_type = /obj/structure/chair/stool/bar
|
||||
|
||||
/obj/item/chair/stool/bamboo
|
||||
name = "bamboo stool"
|
||||
icon_state = "bamboo_stool"
|
||||
inhand_icon_state = "stool_bamboo"
|
||||
hitsound = 'sound/weapons/genhit1.ogg'
|
||||
origin_type = /obj/structure/chair/stool/bamboo
|
||||
break_chance = 50 //Submissive and breakable unlike the chad iron stool
|
||||
|
||||
/obj/item/chair/stool/narsie_act()
|
||||
return //sturdy enough to ignore a god
|
||||
|
||||
|
||||
@@ -78,3 +78,19 @@
|
||||
icon_state = "bench_corner"
|
||||
greyscale_config = /datum/greyscale_config/bench_corner
|
||||
greyscale_colors = "#af7d28"
|
||||
|
||||
// Bamboo benches
|
||||
/obj/structure/chair/sofa/bamboo
|
||||
name = "bamboo bench"
|
||||
desc = "A makeshift bench with a rustic aesthetic."
|
||||
icon_state = "bamboo_sofamiddle"
|
||||
resistance_flags = FLAMMABLE
|
||||
max_integrity = 60
|
||||
buildstacktype = /obj/item/stack/sheet/mineral/bamboo
|
||||
buildstackamount = 3
|
||||
|
||||
/obj/structure/chair/sofa/bamboo/left
|
||||
icon_state = "bamboo_sofaend_left"
|
||||
|
||||
/obj/structure/chair/sofa/bamboo/right
|
||||
icon_state = "bamboo_sofaend_right"
|
||||
|
||||
@@ -288,6 +288,17 @@
|
||||
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WOOD_WALLS)
|
||||
canSmoothWith = list(SMOOTH_GROUP_WOOD_WALLS)
|
||||
|
||||
/obj/structure/falsewall/bamboo
|
||||
name = "bamboo wall"
|
||||
desc = "A wall with bamboo finish. Zen."
|
||||
icon = 'icons/turf/walls/bamboo_wall.dmi'
|
||||
icon_state = "bamboo"
|
||||
mineral = /obj/item/stack/sheet/mineral/bamboo
|
||||
walltype = /turf/closed/wall/mineral/bamboo
|
||||
smoothing_flags = SMOOTH_BITMASK
|
||||
smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BAMBOO_WALLS)
|
||||
canSmoothWith = list(SMOOTH_GROUP_BAMBOO_WALLS)
|
||||
|
||||
/obj/structure/falsewall/iron
|
||||
name = "rough iron wall"
|
||||
desc = "A wall with rough metal plating."
|
||||
|
||||
@@ -5,13 +5,17 @@
|
||||
icon_state = "headpike"
|
||||
density = FALSE
|
||||
anchored = TRUE
|
||||
var/bonespear = FALSE
|
||||
var/obj/item/spear/spear
|
||||
var/obj/item/spear/speartype
|
||||
var/obj/item/bodypart/head/victim
|
||||
|
||||
/obj/structure/headpike/bone //for bone spears
|
||||
icon_state = "headpike-bone"
|
||||
bonespear = TRUE
|
||||
speartype = /obj/item/spear/bonespear
|
||||
|
||||
/obj/structure/headpike/bamboo //for bamboo spears
|
||||
icon_state = "headpike-bamboo"
|
||||
speartype = /obj/item/spear/bamboospear
|
||||
|
||||
/obj/structure/headpike/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -29,9 +33,9 @@
|
||||
if(!victim) //likely a mapspawned one
|
||||
victim = new(src)
|
||||
victim.real_name = random_unique_name(prob(50))
|
||||
spear = locate(bonespear ? /obj/item/spear/bonespear : /obj/item/spear) in parts_list
|
||||
spear = locate(speartype) in parts_list
|
||||
if(!spear)
|
||||
spear = bonespear ? new/obj/item/spear/bonespear(src) : new/obj/item/spear(src)
|
||||
spear = new speartype(src)
|
||||
update_appearance()
|
||||
return ..()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user