cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 14:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

button-iy

Browse Source
This commit is contained in:
Certhic
2018-10-31 20:01:45 +01:00
parent e9f6f4d803
commit 2c0def4a82
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/hud/diona_nymph.dm
+18 -8
View File
@@ -5,14 +5,24 @@
/datum/hud/diona/New()
..()
var/obj/screen/diona/blood = new /obj/screen/diona/blood()
var/obj/screen/diona/merge = new /obj/screen/diona/merge()
var/obj/screen/diona/evolve = new /obj/screen/diona/evolve()
var/obj/screen/diona/intent = new /obj/screen/diona/intent()
static_inventory += blood
static_inventory += merge
static_inventory += evolve
toggleable_inventory += intent
static_inventory += diona_button(new /obj/screen/diona/blood())
static_inventory += diona_button(new /obj/screen/diona/merge())
static_inventory += diona_button(new /obj/screen/diona/evolve())
toggleable_inventory += new /obj/screen/diona/intent()
datum/hud/diona/proc/diona_button(var/obj/screen/diona/D)
var/obj/screen/diona/button/B = new /obj/screen/diona/button
B.overlays += D
B.master = D
B.screen_loc = D.screen_loc
return B
/obj/screen/diona/button
icon = 'icons/mob/actions.dmi'
icon_state = "bg_default"
/obj/screen/diona/button/Click(location, control, params)
return usr.client.Click(master, location, control, params)
/obj/screen/diona/intent
name = "Intent"
code/modules/mob/living/simple_animal/friendly/diona.dm
+2 -2
View File
@@ -73,7 +73,7 @@
if(isdiona(M))
to_chat(M, "You feel your being twine with that of [src] as it merges with your biomass.")
to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.")
throw_alert(gestalt_alert, /obj/screen/alert/nymph) //adds a screen alert that can call resist
throw_alert(gestalt_alert, /obj/screen/alert/nymph, new_master = src) //adds a screen alert that can call resist
forceMove(M)
else
get_scooped(M)
@@ -102,7 +102,7 @@
M.status_flags |= PASSEMOTES
to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.")
forceMove(M)
throw_alert(gestalt_alert, /obj/screen/alert/nymph) //adds a screen alert that can call resist
throw_alert(gestalt_alert, /obj/screen/alert/nymph, new_master = src) //adds a screen alert that can call resist
return TRUE
else
return FALSE