mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2025-12-26 02:02:39 +00:00
25b9283717
Changes instances of \red and \blue to use spans as per suggestions in glass.dm and fishtank.dm Fixed a mistake preventing the building of one direction windows and fishbowls (whoops!) Fixes grammar concerns in multiple messages Holy water is now (magically?) worth 110% of it's reagent amount when filling aquariums. - This is a rather small boost to having the chaplain bless the water you are going to dump into a filtration system anyways. Moves the fishwater ingestion method out of the on_mob_life proc to prevent spam, now will display when initially ingested Updates the CritterCare vendor's sprite to include the pug and fox, as well as adjusting the "static" between displays to give it a slight variety.
53 lines
1.6 KiB
Plaintext
53 lines
1.6 KiB
Plaintext
|
|
/obj/item/weapon/egg_scoop
|
|
name = "fish egg scoop"
|
|
desc = "A small scoop to collect fish eggs with."
|
|
icon = 'icons/obj/fish_items.dmi'
|
|
icon_state = "egg_scoop"
|
|
slot_flags = SLOT_BELT
|
|
throwforce = 0
|
|
w_class = 2.0
|
|
throw_speed = 3
|
|
throw_range = 7
|
|
|
|
/obj/item/weapon/fish_net
|
|
name = "fish net"
|
|
desc = "A tiny net to capture fish with. It's a death sentence!"
|
|
icon = 'icons/obj/fish_items.dmi'
|
|
icon_state = "net"
|
|
slot_flags = SLOT_BELT
|
|
throwforce = 0
|
|
w_class = 2.0
|
|
throw_speed = 3
|
|
throw_range = 7
|
|
|
|
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
|
|
viewers(user) << "<span class='warning'>[user] places the [src.name] on top of \his head, \his fingers tangled in the netting! It looks like \he's trying to commit suicide.</span>"
|
|
return(OXYLOSS)
|
|
|
|
/obj/item/weapon/fishfood
|
|
name = "fish food can"
|
|
desc = "A small can of Carp's Choice brand fish flakes. The label shows a smiling Space Carp."
|
|
icon = 'icons/obj/fish_items.dmi'
|
|
icon_state = "fish_food"
|
|
throwforce = 1
|
|
w_class = 2.0
|
|
throw_speed = 3
|
|
throw_range = 7
|
|
|
|
/obj/item/weapon/tank_brush
|
|
name = "aquarium brush"
|
|
desc = "A brush for cleaning the inside of aquariums. Contains a built-in odor neutralizer."
|
|
icon = 'icons/obj/fish_items.dmi'
|
|
icon_state = "brush"
|
|
slot_flags = SLOT_BELT
|
|
throwforce = 0
|
|
w_class = 2.0
|
|
throw_speed = 3
|
|
throw_range = 7
|
|
attack_verb = list("scrubbed", "brushed", "scraped")
|
|
|
|
suicide_act(mob/user)
|
|
viewers(user) << "<span class='warning'>[user] is vigorously scrubbing \himself raw with the [src.name]! It looks like \he's trying to commit suicide.</span>"
|
|
return(BRUTELOSS|FIRELOSS)
|