massive burndown (#29894)

This commit is contained in:
Contrabang
2025-07-27 13:52:39 -07:00
committed by GitHub
parent a596fba80d
commit 1504ed98be
1043 changed files with 0 additions and 3598 deletions
-9
View File
@@ -9,10 +9,8 @@
icon = 'icons/obj/fish_items.dmi'
icon_state = "egg_scoop"
slot_flags = ITEM_SLOT_BELT
throwforce = 0
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 7
/obj/item/fish_net
name = "fish net"
@@ -20,10 +18,8 @@
icon = 'icons/obj/fish_items.dmi'
icon_state = "net"
slot_flags = ITEM_SLOT_BELT
throwforce = 0
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 7
/obj/item/fish_net/suicide_act(mob/user) //"A tiny net is a death sentence: it's a net and it's tiny!" https://www.youtube.com/watch?v=FCI9Y4VGCVw
visible_message("<span class='suicide'>[user] places [src] on top of [user.p_their()] head, [user.p_their()] fingers tangled in the netting! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -37,7 +33,6 @@
throwforce = 1
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 7
/obj/item/tank_brush
name = "aquarium brush"
@@ -45,10 +40,8 @@
icon = 'icons/obj/fish_items.dmi'
icon_state = "brush"
slot_flags = ITEM_SLOT_BELT
throwforce = 0
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 7
attack_verb = list("scrubbed", "brushed", "scraped")
/obj/item/tank_brush/suicide_act(mob/user)
@@ -107,7 +100,6 @@
throwforce = 1
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 7
force = 1
attack_verb = list("slapped", "humiliated", "hit", "rubbed")
hitsound = 'sound/effects/snap.ogg'
@@ -146,7 +138,6 @@
name = "toothless shark"
desc = "Looks like someone ripped it's teeth out!"
icon_state = "shark"
hitsound = 'sound/effects/snap.ogg'
/obj/item/shard/shark_teeth
name = "shark teeth"
-10
View File
@@ -9,9 +9,6 @@
desc = "So generic, it might as well have no description at all."
icon = 'icons/obj/fish_items.dmi'
icon_state = "tank1"
density = FALSE
anchored = FALSE
pass_flags = 0
var/tank_type = "" // Type of aquarium, used for icon updating
var/water_capacity = 0 // Number of units the tank holds (varies with tank type)
@@ -33,22 +30,16 @@
name = "fish bowl"
desc = "A small bowl capable of housing a single fish, commonly found on desks. This one has a tiny treasure chest in it!"
icon_state = "bowl1"
density = FALSE // Small enough to not block stuff
anchored = FALSE // Small enough to move even when filled
pass_flags = PASSTABLE // Just like at the county fair, you can't seem to throw the ball in to win the goldfish, and it's small enough to pull onto a table
tank_type = "bowl"
water_capacity = 50 // Not very big, therefore it can't hold much
max_fish = 1 // What a lonely fish
has_lid = FALSE
max_integrity = 15 // Not very sturdy
shard_count = 0 // No salvageable shards
/obj/machinery/fishtank/tank
name = "fish tank"
desc = "A large glass tank designed to house aquatic creatures. Contains an integrated water circulation system."
icon = 'icons/obj/fish_items.dmi'
icon_state = "tank1"
density = TRUE
anchored = TRUE
pass_flags = null
@@ -68,7 +59,6 @@
icon_state = "wall1"
density = TRUE
anchored = TRUE
pass_flags = 0 // This thing is the size of a wall, you can't throw past it.
tank_type = "wall"
water_capacity = 500 // This thing fills an entire tile, it holds a lot.