Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit

This commit is contained in:
SandPoot
2024-03-08 19:10:22 -03:00
810 changed files with 140372 additions and 5523 deletions
@@ -202,7 +202,7 @@
/obj/item/electronic_assembly/Topic(href, href_list)
if(..())
return 1
return TRUE
if(href_list["ghostscan"])
if((isobserver(usr) && ckeys_allowed_to_scan[usr.ckey]) || IsAdminGhost(usr))
@@ -697,11 +697,11 @@
if(isnum(new_code))
code = new_code
if(!signal)
return 0
return FALSE
if(signal.data["code"] != code)
return 0
return FALSE
if(signal.source == src) // Don't trigger ourselves.
return 0
return FALSE
activate_pin(3)
audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range)
@@ -339,7 +339,7 @@
/obj/item/integrated_circuit/weaponized/proc/attempt_stun(var/mob/living/L,var/stunforce = 70) //Copied from stunbaton code.
if(!L || !isliving(L))
return 0
return FALSE
L.DefaultCombatKnockdown(stunforce)
SEND_SIGNAL(L, COMSIG_LIVING_MINOR_SHOCK)
@@ -352,4 +352,4 @@
var/mob/living/carbon/human/H = L
H.forcesay(GLOB.hit_appends)
return 1
return TRUE