shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Somewhat fixed huds and stuff, not 100%

Browse Source
This commit is contained in:
keronshb
2021-10-14 16:36:18 -04:00
parent bf7cd77096
commit 13140f9bb9
10 changed files with 182 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/gang/gang.dm
+2 -2
View File
@@ -241,12 +241,12 @@
qdel(secret_handshake_item)
to_chat(owner, span_warning("You're incapable of performing a handshake in your current state."))
return FALSE
owner.visible_message(span_notice("[src] is offering to induct people into the Family."),
owner.visible_message(span_notice("[owner] is offering to induct people into the Family."),
span_notice("You offer to induct people into the Family."), null, 2)
if(H.has_status_effect(STATUS_EFFECT_HANDSHAKE))
return FALSE
if(!(locate(/mob/living/carbon) in orange(1, owner)))
owner.visible_message(span_danger("[src] offers to induct people into the Family, but nobody was around."), \
owner.visible_message(span_danger("[owner] offers to induct people into the Family, but nobody was around."), \
span_warning("You offer to induct people into the Family, but nobody is around."), null, 2)
return FALSE
code/modules/clothing/shoes/_shoes.dm
+1 -1
View File
@@ -102,7 +102,7 @@
worn_y_dimension = world.icon_size
/obj/item/clothing/shoes/dropped(mob/user)
if(our_alert && (our_alert.mob_viewer == user))
if(our_alert && (our_alert.owner == user))
user.clear_alert("shoealert")
if(offset && equipped_before_drop)
restore_offsets(user)