The 515 MegaPR early downport (#7783)

Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: SatinIsle <thesatinisle@gmail.com>
Co-authored-by: Heroman <alesha3000@list.ru>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
This commit is contained in:
Cadyn
2024-02-27 20:17:32 +01:00
committed by GitHub
co-authored by Selis Selis Kashargul SatinIsle Heroman Casey Raeschen
parent 96a43a09c1
commit b90f7ec922
254 changed files with 2135 additions and 1576 deletions
+1 -1
View File
@@ -100,7 +100,7 @@
update_icon()
set_AI_busy(FALSE)
else if(!ai_holder.target) // no using this to clear a retaliate mob's target
ai_holder.target = user //just because you're not tasty doesn't mean you get off the hook. A swat for a swat.
ai_holder.give_target(user) //just because you're not tasty doesn't mean you get off the hook. A swat for a swat.
//AttackTarget() //VOREStation AI Temporary Removal
//LoseTarget() // only make one attempt at an attack rather than going into full rage mode
else
@@ -2099,14 +2099,14 @@ Departamental Swimsuits, for general use
translocator_unequip(translocator, user)
T.forceMove(src)
translocator = T
user.show_message("\icon[src][bicon(src)]*click!*")
user.show_message("[icon2html(src, user.client)]*click!*")
playsound(src, 'sound/machines/click.ogg', 30, 1)
/obj/item/clothing/head/fluff/nikki/proc/translocator_unequip(var/obj/item/device/perfect_tele/T, var/mob/living/carbon/human/user)
if (translocator)
if (user)
user.put_in_hands(T)
user.show_message("\icon[src][bicon(src)]*click!*")
user.show_message("[icon2html(src, user.client)]*click!*")
else
translocator.forceMove(get_turf(src))
translocator = null
@@ -1531,7 +1531,7 @@ End CHOMP Removal*/
if(stored_item && opened && !searching)
searching = TRUE
if(do_after(user, 10))
to_chat(user, "You find \icon[stored_item] [stored_item] in [src]!")
to_chat(user, "You find [icon2html(stored_item, user.client)] [stored_item] in [src]!")
stored_item.forceMove(get_turf(src))
stored_item = null
searching = FALSE
+2 -2
View File
@@ -25,8 +25,8 @@
/obj/item/weapon/gun/energy/sizegun/New()
..()
verbs += PROC_REF(select_size)
verbs += PROC_REF(spin_dial)
verbs += /obj/item/weapon/gun/energy/sizegun/proc/select_size
verbs += /obj/item/weapon/gun/energy/sizegun/proc/spin_dial
/obj/item/weapon/gun/energy/sizegun/attack_self(mob/user)
. = ..()