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

Lay groundwork for megafauna, and add Ashdragon.

Browse Source 
Includes a refactor for gun turrets (merged into portable turrets), hostile simple_animal behaviour, spells (sounds have been added) and poi_list items.
This commit is contained in:
Markolie
2016-10-23 23:15:57 +02:00
parent f110b9e6a5
commit 2e711d1337
122 changed files with 1650 additions and 776 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/magic/staff.dm
+6 -1
View File
@@ -8,6 +8,7 @@
ammo_type = /obj/item/ammo_casing/magic/change
icon_state = "staffofchange"
item_state = "staffofchange"
fire_sound = "sound/magic/Staff_Change.ogg"
/obj/item/weapon/gun/magic/staff/animate
name = "staff of animation"
@@ -15,6 +16,7 @@
ammo_type = /obj/item/ammo_casing/magic/animate
icon_state = "staffofanimation"
item_state = "staffofanimation"
fire_sound = "sound/magic/Staff_animation.ogg"
/obj/item/weapon/gun/magic/staff/healing
name = "staff of healing"
@@ -22,6 +24,7 @@
ammo_type = /obj/item/ammo_casing/magic/heal
icon_state = "staffofhealing"
item_state = "staffofhealing"
fire_sound = "sound/magic/Staff_Healing.ogg"
/obj/item/weapon/gun/magic/staff/healing/handle_suicide() //Stops people trying to commit suicide to heal themselves
return
@@ -35,6 +38,7 @@
max_charges = 10
recharge_rate = 2
no_den_usage = 1
fire_sound = "sound/magic/Staff_Chaos.ogg"
/obj/item/weapon/gun/magic/staff/door
name = "staff of door creation"
@@ -45,16 +49,17 @@
max_charges = 10
recharge_rate = 2
no_den_usage = 1
fire_sound = "sound/magic/Staff_Door.ogg"
/obj/item/weapon/gun/magic/staff/honk
name = "staff of the honkmother"
desc = "Honk"
fire_sound = "sound/items/airhorn.ogg"
ammo_type = /obj/item/ammo_casing/magic/honk
icon_state = "honker"
item_state = "honker"
max_charges = 4
recharge_rate = 8
fire_sound = "sound/items/airhorn.ogg"
/obj/item/weapon/gun/magic/staff/focus
name = "mental focus"
code/modules/projectiles/guns/magic/wand.dm
+6
View File
@@ -59,6 +59,7 @@
/obj/item/weapon/gun/magic/wand/death
name = "wand of death"
desc = "This deadly wand overwhelms the victim's body with pure energy, slaying them without fail."
fire_sound = "sound/magic/WandoDeath.ogg"
ammo_type = /obj/item/ammo_casing/magic/death
icon_state = "deathwand"
max_charges = 3 //3, 2, 2, 1
@@ -79,6 +80,7 @@
name = "wand of resurrection"
desc = "This wand uses healing magics to heal and revive. They are rarely utilized within the Wizard Federation for some reason."
ammo_type = /obj/item/ammo_casing/magic/heal
fire_sound = "sound/magic/Staff_Healing.ogg"
icon_state = "revivewand"
max_charges = 3 //3, 2, 2, 1
@@ -96,6 +98,7 @@
name = "wand of polymorph"
desc = "This wand is attuned to chaos and will radically alter the victim's form."
ammo_type = /obj/item/ammo_casing/magic/change
fire_sound = "sound/magic/Staff_Change.ogg"
icon_state = "polywand"
max_charges = 10 //10, 5, 5, 4
@@ -115,6 +118,7 @@
icon_state = "telewand"
max_charges = 10 //10, 5, 5, 4
no_den_usage = 1
fire_sound = "sound/magic/Wand_Teleport.ogg"
/obj/item/weapon/gun/magic/wand/teleport/zap_self(mob/living/user)
do_teleport(user, user, 10)
@@ -132,6 +136,7 @@
name = "wand of door creation"
desc = "This particular wand can create doors in any wall for the unscrupulous wizard who shuns teleportation magics."
ammo_type = /obj/item/ammo_casing/magic/door
fire_sound = "sound/magic/Staff_Door.ogg"
icon_state = "doorwand"
max_charges = 20 //20, 10, 10, 7
@@ -147,6 +152,7 @@
/obj/item/weapon/gun/magic/wand/fireball
name = "wand of fireball"
desc = "This wand shoots scorching balls of fire that explode into destructive flames."
fire_sound = "sound/magic/Fireball.ogg"
ammo_type = /obj/item/ammo_casing/magic/fireball
icon_state = "firewand"
max_charges = 8 //8, 4, 4, 3