mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-05 06:21:57 +00:00
0caa59b21a
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()". If there are other things in this commit, the PR's description will explain them.
276 lines
6.8 KiB
Plaintext
276 lines
6.8 KiB
Plaintext
/obj/structure/flora
|
|
burn_state = FLAMMABLE
|
|
burntime = 30
|
|
|
|
//trees
|
|
/obj/structure/flora/tree
|
|
name = "tree"
|
|
anchored = 1
|
|
density = 1
|
|
pixel_x = -16
|
|
layer = 9
|
|
var/cut = FALSE
|
|
var/log_amount = 10
|
|
|
|
/obj/structure/flora/tree/attackby(obj/item/weapon/W, mob/user, params)
|
|
if(!cut && log_amount)
|
|
if(W.sharpness && W.force > 0)
|
|
if(W.hitsound)
|
|
playsound(get_turf(src), W.hitsound, 100, 0, 0)
|
|
user.visible_message("<span class='notice'>[user] begins to cut down [src] with [W].</span>","<span class='notice'>You begin to cut down [src] with [W].</span>", "You hear the sound of cutting a tree.")
|
|
if(do_after(user, 1000/W.force, target = user)) //5 seconds with 20 force, 8 seconds with a hatchet, 20 seconds with a shard.
|
|
if(cut)
|
|
return
|
|
user.visible_message("<span class='notice'>[user] falls [src] with the [W].</span>","<span class='notice'>You fall [src] with the [W].</span>", "You hear the sound of a tree falling.")
|
|
playsound(get_turf(src), 'sound/effects/meteorimpact.ogg', 100 , 0, 0)
|
|
icon_state = "tree_stump"
|
|
name = "stump"
|
|
cut = TRUE
|
|
for(var/i=1 to log_amount)
|
|
new /obj/item/weapon/grown/log/tree(get_turf(src))
|
|
|
|
else
|
|
return ..()
|
|
|
|
|
|
|
|
|
|
/obj/structure/flora/tree/pine
|
|
name = "pine tree"
|
|
icon = 'icons/obj/flora/pinetrees.dmi'
|
|
icon_state = "pine_1"
|
|
|
|
/obj/structure/flora/tree/pine/New()
|
|
icon_state = "pine_[rand(1, 3)]"
|
|
..()
|
|
|
|
/obj/structure/flora/tree/pine/xmas
|
|
name = "xmas tree"
|
|
icon_state = "pine_c"
|
|
|
|
/obj/structure/flora/tree/pine/xmas/New()
|
|
..()
|
|
icon_state = "pine_c"
|
|
|
|
/obj/structure/flora/tree/dead
|
|
icon = 'icons/obj/flora/deadtrees.dmi'
|
|
icon_state = "tree_1"
|
|
|
|
/obj/structure/festivus
|
|
name = "festivus pole"
|
|
icon = 'icons/obj/flora/pinetrees.dmi'
|
|
icon_state = "festivus_pole"
|
|
desc = "During last year's Feats of Strength the Research Director was able to suplex this passing immobile rod into a planter."
|
|
|
|
/obj/structure/flora/tree/dead/New()
|
|
icon_state = "tree_[rand(1, 6)]"
|
|
..()
|
|
|
|
|
|
//grass
|
|
/obj/structure/flora/grass
|
|
name = "grass"
|
|
icon = 'icons/obj/flora/snowflora.dmi'
|
|
anchored = 1
|
|
gender = PLURAL //"this is grass" not "this is a grass"
|
|
|
|
/obj/structure/flora/grass/brown
|
|
icon_state = "snowgrass1bb"
|
|
|
|
/obj/structure/flora/grass/brown/New()
|
|
icon_state = "snowgrass[rand(1, 3)]bb"
|
|
..()
|
|
|
|
|
|
/obj/structure/flora/grass/green
|
|
icon_state = "snowgrass1gb"
|
|
|
|
/obj/structure/flora/grass/green/New()
|
|
icon_state = "snowgrass[rand(1, 3)]gb"
|
|
..()
|
|
|
|
/obj/structure/flora/grass/both
|
|
icon_state = "snowgrassall1"
|
|
|
|
/obj/structure/flora/grass/both/New()
|
|
icon_state = "snowgrassall[rand(1, 3)]"
|
|
..()
|
|
|
|
|
|
//bushes
|
|
/obj/structure/flora/bush
|
|
name = "bush"
|
|
icon = 'icons/obj/flora/snowflora.dmi'
|
|
icon_state = "snowbush1"
|
|
anchored = 1
|
|
|
|
/obj/structure/flora/bush/New()
|
|
icon_state = "snowbush[rand(1, 6)]"
|
|
..()
|
|
|
|
//newbushes
|
|
|
|
/obj/structure/flora/ausbushes
|
|
name = "bush"
|
|
icon = 'icons/obj/flora/ausflora.dmi'
|
|
icon_state = "firstbush_1"
|
|
anchored = 1
|
|
|
|
/obj/structure/flora/ausbushes/New()
|
|
if(icon_state == "firstbush_1")
|
|
icon_state = "firstbush_[rand(1, 4)]"
|
|
..()
|
|
|
|
/obj/structure/flora/ausbushes/reedbush
|
|
icon_state = "reedbush_1"
|
|
|
|
/obj/structure/flora/ausbushes/reedbush/New()
|
|
icon_state = "reedbush_[rand(1, 4)]"
|
|
..()
|
|
|
|
/obj/structure/flora/ausbushes/leafybush
|
|
icon_state = "leafybush_1"
|
|
|
|
/obj/structure/flora/ausbushes/leafybush/New()
|
|
icon_state = "leafybush_[rand(1, 3)]"
|
|
..()
|
|
|
|
/obj/structure/flora/ausbushes/palebush
|
|
icon_state = "palebush_1"
|
|
|
|
/obj/structure/flora/ausbushes/palebush/New()
|
|
icon_state = "palebush_[rand(1, 4)]"
|
|
..()
|
|
|
|
/obj/structure/flora/ausbushes/stalkybush
|
|
icon_state = "stalkybush_1"
|
|
|
|
/obj/structure/flora/ausbushes/stalkybush/New()
|
|
icon_state = "stalkybush_[rand(1, 3)]"
|
|
..()
|
|
|
|
/obj/structure/flora/ausbushes/grassybush
|
|
icon_state = "grassybush_1"
|
|
|
|
/obj/structure/flora/ausbushes/grassybush/New()
|
|
icon_state = "grassybush_[rand(1, 4)]"
|
|
..()
|
|
|
|
/obj/structure/flora/ausbushes/fernybush
|
|
icon_state = "fernybush_1"
|
|
|
|
/obj/structure/flora/ausbushes/fernybush/New()
|
|
icon_state = "fernybush_[rand(1, 3)]"
|
|
..()
|
|
|
|
/obj/structure/flora/ausbushes/sunnybush
|
|
icon_state = "sunnybush_1"
|
|
|
|
/obj/structure/flora/ausbushes/sunnybush/New()
|
|
icon_state = "sunnybush_[rand(1, 3)]"
|
|
..()
|
|
|
|
/obj/structure/flora/ausbushes/genericbush
|
|
icon_state = "genericbush_1"
|
|
|
|
/obj/structure/flora/ausbushes/genericbush/New()
|
|
icon_state = "genericbush_[rand(1, 4)]"
|
|
..()
|
|
|
|
/obj/structure/flora/ausbushes/pointybush
|
|
icon_state = "pointybush_1"
|
|
|
|
/obj/structure/flora/ausbushes/pointybush/New()
|
|
icon_state = "pointybush_[rand(1, 4)]"
|
|
..()
|
|
|
|
/obj/structure/flora/ausbushes/lavendergrass
|
|
icon_state = "lavendergrass_1"
|
|
|
|
/obj/structure/flora/ausbushes/lavendergrass/New()
|
|
icon_state = "lavendergrass_[rand(1, 4)]"
|
|
..()
|
|
|
|
/obj/structure/flora/ausbushes/ywflowers
|
|
icon_state = "ywflowers_1"
|
|
|
|
/obj/structure/flora/ausbushes/ywflowers/New()
|
|
icon_state = "ywflowers_[rand(1, 3)]"
|
|
..()
|
|
|
|
/obj/structure/flora/ausbushes/brflowers
|
|
icon_state = "brflowers_1"
|
|
|
|
/obj/structure/flora/ausbushes/brflowers/New()
|
|
icon_state = "brflowers_[rand(1, 3)]"
|
|
..()
|
|
|
|
/obj/structure/flora/ausbushes/ppflowers
|
|
icon_state = "ppflowers_1"
|
|
|
|
/obj/structure/flora/ausbushes/ppflowers/New()
|
|
icon_state = "ppflowers_[rand(1, 3)]"
|
|
..()
|
|
|
|
/obj/structure/flora/ausbushes/sparsegrass
|
|
icon_state = "sparsegrass_1"
|
|
|
|
/obj/structure/flora/ausbushes/sparsegrass/New()
|
|
icon_state = "sparsegrass_[rand(1, 3)]"
|
|
..()
|
|
|
|
/obj/structure/flora/ausbushes/fullgrass
|
|
icon_state = "fullgrass_1"
|
|
|
|
/obj/structure/flora/ausbushes/fullgrass/New()
|
|
icon_state = "fullgrass_[rand(1, 3)]"
|
|
..()
|
|
|
|
/obj/structure/flora/kirbyplants
|
|
name = "potted plant"
|
|
icon = 'icons/obj/flora/plants.dmi'
|
|
icon_state = "plant-01"
|
|
|
|
/obj/structure/flora/kirbyplants/dead
|
|
name = "RD's potted plant"
|
|
desc = "A gift from the botanical staff, presented after the RD's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\"\nIt doesn't look very healthy..."
|
|
icon_state = "plant-25"
|
|
|
|
|
|
//a rock is flora according to where the icon file is
|
|
//and now these defines
|
|
/obj/structure/flora/rock
|
|
name = "rock"
|
|
desc = "a rock"
|
|
icon_state = "rock"
|
|
icon = 'icons/obj/flora/rocks.dmi'
|
|
anchored = 1
|
|
burn_state = FIRE_PROOF
|
|
density = 1
|
|
|
|
/obj/structure/flora/rock/New()
|
|
..()
|
|
icon_state = "[icon_state][rand(1,5)]"
|
|
|
|
/obj/structure/flora/rock/pile
|
|
name = "rocks"
|
|
desc = "some rocks"
|
|
icon_state = "rockpile"
|
|
density = 0
|
|
|
|
|
|
/obj/structure/flora/rock/volcanic
|
|
icon_state = "basalt"
|
|
desc = "A volcanic rock"
|
|
|
|
|
|
/obj/structure/flora/rock/volcanic/New()
|
|
..()
|
|
icon_state = "[icon_state][rand(1,3)]"
|
|
|
|
/obj/structure/flora/rock/pile/volcanic
|
|
icon_state = "lavarocks"
|
|
|
|
/obj/structure/flora/rock/pile/volcanic/New()
|
|
..()
|
|
icon_state = "[icon_state][rand(1,3)]" |