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

further conversion

Browse Source
This commit is contained in:
Fox McCloud
2018-07-18 01:13:24 -04:00
parent d512b362ed
commit 7440dad57e
58 changed files with 177 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/gun.dm
+2 -2
View File
@@ -153,10 +153,10 @@
process_fire(target,user,1,params)
/obj/item/gun/proc/can_trigger_gun(var/mob/living/user)
/obj/item/gun/proc/can_trigger_gun(mob/living/user)
if(!user.can_use_guns(src))
return 0
if(restricted_species && restricted_species.len && !(user.get_species() in restricted_species))
if(restricted_species && restricted_species.len && !is_type_in_list(user.dna.species, restricted_species))
to_chat(user, "<span class='danger'>[src] is incompatible with your biology!</span>")
return 0
return 1
code/modules/projectiles/guns/alien.dm
+2 -2
View File
@@ -11,7 +11,7 @@
can_suppress = 0
var/charge_tick = 0
var/charge_delay = 15
restricted_species = list("Vox", "Vox Armalis")
restricted_species = list(/datum/species/vox)
/obj/item/gun/projectile/automatic/spikethrower/New()
..()
@@ -79,7 +79,7 @@
force = 10
ammo_type = list(/obj/item/ammo_casing/energy/sonic)
cell_type = /obj/item/stock_parts/cell/super
restricted_species = list("Vox Armalis")
restricted_species = list(/datum/species/vox/armalis)
/obj/item/gun/energy/noisecannon/update_icon()
return
code/modules/projectiles/projectile/magic.dm
+6 -6
View File
@@ -24,15 +24,15 @@
var/exp_flash = 3
var/exp_fire = 2
/obj/item/projectile/magic/death/on_hit(var/mob/living/carbon/G)
/obj/item/projectile/magic/death/on_hit(mob/living/carbon/C)
. = ..()
if(isliving(G))
if(G.get_species() == "Machine") //speshul snowfleks deserv speshul treetment
G.adjustFireLoss(6969) //remember - slimes love fire
if(isliving(C))
if(ismachine(C)) //speshul snowfleks deserv speshul treetment
C.adjustFireLoss(6969) //remember - slimes love fire
else
G.death()
C.death()
visible_message("<span class='danger'>[G] topples backwards as the death bolt impacts [G.p_them()]!</span>")
visible_message("<span class='danger'>[C] topples backwards as the death bolt impacts [C.p_them()]!</span>")
/obj/item/projectile/magic/fireball/Range()
var/turf/T1 = get_step(src,turn(dir, -45))