mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-30 15:37:36 +01:00
Many botany QoL changes. (#25031)
* Many botany QoL changes. * Give observers a plant analyzer. * Hooks should be executable. * Upgraded Seed Extractor GUI. * Left-align seed extractor, more efficient icon sending. * tgui rebuild * Apply suggestions from code review Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * 's' properly --------- Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
co-authored by
Burzah
FunnyMan3595
parent
0b838dc3c4
commit
a881e11c86
@@ -71,6 +71,13 @@
|
||||
selfcharge = TRUE
|
||||
can_holster = TRUE
|
||||
|
||||
/obj/item/gun/energy/floragun/pre_attack(atom/A, mob/living/user, params)
|
||||
if(istype(A, /obj/machinery/hydroponics))
|
||||
// Calling afterattack from pre_attack looks stupid, but afterattack with proximity FALSE is what makes the gun fire, and we're returning FALSE to cancel the melee attack.
|
||||
afterattack(A, user, FALSE, params)
|
||||
return FALSE
|
||||
return ..()
|
||||
|
||||
// Meteor Gun //
|
||||
/obj/item/gun/energy/meteorgun
|
||||
name = "meteor gun"
|
||||
|
||||
@@ -145,18 +145,17 @@
|
||||
/obj/item/projectile/energy/floramut
|
||||
name = "alpha somatoray"
|
||||
icon_state = "energy"
|
||||
damage = 0
|
||||
damage_type = TOX
|
||||
nodamage = 1
|
||||
damage = 3
|
||||
damage_type = CLONE
|
||||
impact_effect_type = /obj/effect/temp_visual/impact_effect/green_laser
|
||||
flag = "energy"
|
||||
|
||||
/obj/item/projectile/energy/florayield
|
||||
name = "beta somatoray"
|
||||
icon_state = "energy2"
|
||||
damage = 0
|
||||
damage_type = TOX
|
||||
nodamage = 1
|
||||
damage = 3
|
||||
damage_type = CLONE
|
||||
impact_effect_type = /obj/effect/temp_visual/impact_effect/green_laser
|
||||
flag = "energy"
|
||||
|
||||
/obj/item/projectile/energy/mindflayer
|
||||
|
||||
Reference in New Issue
Block a user