cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Generic item/structure fixes (#8994)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
This commit is contained in:
CHOMPStation2
2024-09-21 05:06:26 -07:00
committed by GitHub
parent 2deea961ea
commit 5c24ebe20a
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/eventkit/generic_objects/generic_item.dm
View File

@@ -29,7 +29,8 @@
else
icon = 'icons/obj/props/items.dmi'
icon_state = icon_state_on
src.visible_message("<span class='notice'>[text_activated]</span>")
if(user)
user.visible_message("<span class='notice'>[text_activated]</span>")
update_icon()
if(effect == 1)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
@@ -83,7 +84,8 @@
icon = icon_off
else
icon = 'icons/obj/props/items.dmi'
src.visible_message("<span class='notice'>[text_deactivated]</span>")
if(user)
user.visible_message("<span class='notice'>[text_deactivated]</span>")
update_icon()
return ..()

14
code/modules/eventkit/generic_objects/generic_structure.dm
View File

@@ -77,6 +77,14 @@
if(effect == 4)
var/atom/o = new object(get_turf(src))
src.visible_message("<span class='notice'>[src] has produced [o]!</span>")
if(effect == 5)
for (var/mob/O in viewers(src, null))
if(get_dist(src, O) > 7)
continue
if(istype(O, /mob/living/carbon/human))
var/mob/living/carbon/human/H = O
H.fear = 200
if(sound_activated)
playsound(src, sound_activated, 50, 1)
else if(togglable)
@@ -96,8 +104,8 @@
/obj/structure/generic_structure/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(wrenchable && W.has_tool_quality(TOOL_WRENCH))
add_fingerprint(user)
anchored = !anchored
to_chat(user, "<span class='notice'>You [anchored? "un" : ""]secured \the [src]!</span>")
anchored = !anchored
/client/proc/generic_structure()
set category = "Fun.Event Kit" //CHOMPEdit
@@ -268,7 +276,7 @@
if(s_icon_state_on == "Upload Own Sprite")
s_icon2 = input(usr, "Choose an image file to upload. Images that are not 32x32 will need to have their positions offset.","Upload Icon") as null|file
s_delay = tgui_input_number(src, "Do you want it to take time to put turn on? Choose a number of deciseconds to activate, or 0 for instant.", "Delay")
var/check_effect = tgui_alert(src, "Produce an effect on activation?", "Effect?", list("No", "Spark", "Flicker Lights", "Flash", "Spawn Item", "Cancel"))
var/check_effect = tgui_alert(src, "Produce an effect on activation?", "Effect?", list("No", "Spark", "Flicker Lights", "Flash", "Spawn Item", "Fear", "Cancel"))
if(!check_effect || check_effect == "Cancel")
return
if(check_effect == "No")
@@ -282,6 +290,8 @@
if(check_effect == "Spawn Item")
s_effect = 4
s_object = get_path_from_partial_text()
if(check_effect == "Fear")
s_effect = 5
var/check_sound = tgui_alert(src, "Play a sound when turning on?", "Sound", list("Yes", "No", "Cancel"))
if(!check_sound || check_sound == "Cancel")
return

1
code/modules/mob/living/carbon/human/species/lleill/hanner.dm
View File

@@ -88,6 +88,7 @@
/mob/living/carbon/human/proc/shapeshifter_select_wings,
/mob/living/carbon/human/proc/shapeshifter_select_tail,
/mob/living/carbon/human/proc/shapeshifter_select_ears,
/mob/living/carbon/human/proc/shapeshifter_select_eye_colour,
/mob/living/proc/set_size,
// /mob/living/carbon/human/proc/lleill_contact,
// /mob/living/carbon/human/proc/lleill_alchemy,