cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into runtime-fix-2

Browse Source
This commit is contained in:
farie82
2020-03-22 08:36:40 +01:00
committed by GitHub
parent f26f9cf0b6 63ea21b20e
commit 9338b7a0ed
705 changed files with 4945 additions and 4403 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition.dm
+1 -1
View File
@@ -25,7 +25,7 @@
BB = new projectile_type(src)
pixel_x = rand(-10.0, 10)
pixel_y = rand(-10.0, 10)
dir = pick(alldirs)
dir = pick(GLOB.alldirs)
update_icon()
/obj/item/ammo_casing/update_icon()
code/modules/projectiles/guns/magic/wand.dm
+1
View File
@@ -51,6 +51,7 @@
user.visible_message("<span class='danger'>[user] zaps [user.p_them()]self with [src].</span>")
playsound(user, fire_sound, 50, 1)
user.create_attack_log("<b>[key_name(user)]</b> zapped [user.p_them()]self with a <b>[src]</b>")
add_attack_logs(null, user, "zapped [user.p_them()]self with a [src]")
/////////////////////////////////////
//WAND OF DEATH
code/modules/projectiles/projectile/magic.dm
+5 -3
View File
@@ -263,12 +263,14 @@
return
M.create_attack_log("<font color='orange'>[key_name(M)] became [new_mob.real_name].</font>")
new_mob.attack_log = M.attack_log
add_attack_logs(null, M, "became [new_mob.real_name]")
new_mob.a_intent = INTENT_HARM
if(M.mind)
M.mind.transfer_to(new_mob)
else
new_mob.attack_log_old = M.attack_log_old.Copy()
new_mob.logs = M.logs.Copy()
new_mob.key = M.key
to_chat(new_mob, "<B>Your form morphs into that of a [randomize].</B>")
@@ -283,7 +285,7 @@
/obj/item/projectile/magic/animate/Bump(var/atom/change)
..()
if(istype(change, /obj/item) || istype(change, /obj/structure) && !is_type_in_list(change, protected_objects))
if(istype(change, /obj/item) || istype(change, /obj/structure) && !is_type_in_list(change, GLOB.protected_objects))
if(istype(change, /obj/structure/closet/statue))
for(var/mob/living/carbon/human/H in change.contents)
var/mob/living/simple_animal/hostile/statue/S = new /mob/living/simple_animal/hostile/statue(change.loc, firer)
@@ -344,4 +346,4 @@
to_chat(target, "<span class='notice'>You get splatted by [src].</span>")
M.Weaken(slip_weaken)
M.Stun(slip_stun)
. = ..()
. = ..()