cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-12 16:38:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9601 from Ghommie/Ghommie-cit265

Browse Source 
Ports move force and move resist, movement/pushing/pulling tweaks & co.
This commit is contained in:
kevinz000
2020-01-19 16:10:56 -07:00
committed by Dip
parent 76f9c30103
commit b8bc551d51
120 changed files with 563 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/spells/spell_types/conjure.dm
+1 -1
View File
@@ -63,7 +63,7 @@
clothes_req = FALSE
charge_max = 600
cooldown_min = 200
summon_type = list(/mob/living/simple_animal/hostile/spawner/nether)
summon_type = list(/obj/structure/spawner/nether)
summon_amt = 1
range = 1
cast_sound = 'sound/weapons/marauder.ogg'
code/modules/spells/spell_types/wizard.dm
+1 -1
View File
@@ -363,7 +363,7 @@
icon_state = "snappop"
w_class = WEIGHT_CLASS_TINY
/obj/item/spellpacket/lightningbolt/throw_impact(atom/hit_atom)
/obj/item/spellpacket/lightningbolt/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
if(!..())
if(isliving(hit_atom))
var/mob/living/M = hit_atom