cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds bottled fireball.

Browse Source
This commit is contained in:
Shadowmech88
2017-10-15 04:57:17 -05:00
parent f8e97b15bc
commit e2e6e62f0d
5 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/atoms.dm
View File

@@ -859,6 +859,5 @@ its easier to just keep the beam vertical.
/atom/proc/get_last_player_touched() //returns a reference to the mob of the ckey that last touched the atom
for(var/client/C in clients)
testing("CHECKING IF [C] LAST TOUCHED [src]. CKEY: [C.ckey], PRINTS: [fingerprintslast]")
if(C.ckey == fingerprintslast)
if(uppertext(C.ckey) == uppertext(fingerprintslast))
return C.mob

4
code/game/gamemodes/wizard/spellbook.dm
View File

@@ -65,11 +65,13 @@
/obj/item/potion/sword = Sp_BASE_PRICE*0.1,
/obj/item/potion/deception = Sp_BASE_PRICE*0.1,
/obj/item/potion/levitation = Sp_BASE_PRICE*0.1,
/obj/item/potion/fireball = Sp_BASE_PRICE*0.1,
/obj/item/potion/fullness = Sp_BASE_PRICE*0.05,
/obj/item/potion/transparency = Sp_BASE_PRICE*0.05,
/obj/item/potion/paralysis = Sp_BASE_PRICE*0.05,
/obj/item/potion/mutation/strength = Sp_BASE_PRICE*0.05,
/obj/item/potion/mutation/truesight = Sp_BASE_PRICE*0.05)
/obj/item/potion/mutation/truesight = Sp_BASE_PRICE*0.05,
/obj/item/potion/teleport = Sp_BASE_PRICE*0.05)
var/uses = STARTING_USES
var/max_uses = STARTING_USES

22
code/game/objects/items/potions.dm
View File

@@ -78,6 +78,7 @@
impact_mob(hit_atom)
else
impact_atom(hit_atom)
full = FALSE
qdel(src)
@@ -242,11 +243,7 @@
for(var/mob/living/carbon/human/H in L)
if(H.isDeadorDying())
if(prob(50))
var/mob/living/simple_animal/hostile/necro/zombie/turned/T = new(get_turf(H), M, H.mind)
T.get_clothes(H, T)
T.name = H.real_name
T.host = H
H.forceMove(null)
H.make_zombie(M)
else
new /mob/living/simple_animal/hostile/necro/skeleton(get_turf(H), M, H.mind)
H.gib()
@@ -289,7 +286,7 @@
user.Knockdown(3)
/obj/item/potion/sword
name = "potion of sword"
name = "bottled sword"
desc = "A sword in a bottle."
icon_state = "yellow_smallbottle"
imbibe_message = "<span class='danger'>You feel something pierce your insides!</span>"
@@ -458,4 +455,15 @@
playsound(T1, 'sound/effects/phasein.ogg', 50, 1)
if(T2)
M.forceMove(T2)
playsound(T2, 'sound/effects/phasein.ogg', 50, 1)
playsound(T2, 'sound/effects/phasein.ogg', 50, 1)
/obj/item/potion/fireball
name = "bottled fireball"
desc = "A fireball in a bottle."
icon_state = "fireball_flask"
/obj/item/potion/fireball/imbibe_effect(mob/living/user)
explosion(get_turf(user), -1, 1, 2, 5)
/obj/item/potion/fireball/impact_atom(atom/target)
explosion(get_turf(target), -1, 1, 2, 5)

6
code/modules/mob/living/carbon/human/death.dm
View File

@@ -118,11 +118,7 @@
if(become_zombie_after_death)
spawn(30 SECONDS)
if(!gcDestroyed)
var/mob/living/simple_animal/hostile/necro/zombie/turned/T = new(get_turf(src), Controller = src.mind)
T.get_clothes(src, T)
T.name = src.real_name
T.host = src
src.forceMove(null)
make_zombie()
return ..(gibbed)
/mob/living/carbon/human/proc/makeSkeleton()

9
code/modules/mob/living/carbon/human/human.dm
View File

@@ -1882,4 +1882,11 @@ mob/living/carbon/human/remove_internal_organ(var/mob/living/user, var/datum/org
if(M_HUSK in mutations)
return FALSE
// ...means no flavor text for you. Otherwise, good to go.
return TRUE
return TRUE
/mob/living/carbon/human/proc/make_zombie(mob/master)
var/mob/living/simple_animal/hostile/necro/zombie/turned/T = new(get_turf(src), master, mind)
T.get_clothes(src, T)
T.name = real_name
T.host = src
forceMove(null)