Adds slimebaton, xeno taser.

Slime attack text changed.
This commit is contained in:
Datraen
2016-04-21 16:42:34 -04:00
parent 4212acdc58
commit b6a4d7ff4c
6 changed files with 57 additions and 0 deletions

View File

@@ -21,6 +21,7 @@ Slime definitions, Life and New live here.
var/shiny = 0
move_to_delay = 17 //Slimes shouldn't be able to go faster than humans.
default_chems = list("slimejelly" = 5)
attacktext = "absorbed some of"
var/emote_on = null

View File

@@ -0,0 +1,55 @@
/* What this file contains:
* A specialized stun prod, for handling fiesty slimes
* A specialized stun gun, for handling many fiesty slimes
* A stun projectile for handling xenomorphs.
*/
/obj/item/weapon/melee/baton/slime
name = "stunbaton (s)"
desc = "A modified stun baton designed to stun slimes for handling."
icon_state = "slimebaton"
item_state = "slimebaton"
slot_flags = SLOT_BELT
force = 9
origin_tech = list(TECH_COMBAT = 2, TECH_BIO = 4)
agonyforce = 10 //It's not supposed to be great at stunning human beings.
var/stunforce = 60 //How much stasis it does to slimes, and 1/3rd to non-slimes.
/obj/item/weapon/melee/baton/slime/attack(mob/M, mob/user)
if(istype(M, /mob/living/simple_animal/xeno))
var/mob/living/simple_animal/xeno/X = M
if(istype(M, /mob/living/simple_animal/xeno/slime))
X.stasis += stunforce
else
X.stasis += (stunforce / 6)
..()
// Xeno stun gun + projectile
/obj/item/weapon/gun/energy/taser/xeno
name = "xeno taser gun"
desc = "Straight out of NT's testing laboratories, this small gun is used to subdue non-humanoid xeno life forms. While marketed towards handling slimes, it may be useful for other creatures."
icon_state = taserold
fire_sound = 'sound/weapons/taser2.ogg'
max_shots = 10
projectile_type = /obj/item/projectile/beam/stun/xeno
/obj/item/projectile/beam/stun/xeno
icon_state = "omni"
agony = 4
var/stunforce = 40
muzzle_type = /obj/effect/projectile/laser_omni/muzzle
tracer_type = /obj/effect/projectile/laser_omni/tracer
impact_type = /obj/effect/projectile/laser_omni/impact
/obj/item/projectile/beam/stun/xeno/on_hit(var/atom/target, var/blocked = 0)
if(istype(M, /mob/living/simple_animal/xeno))
var/mob/living/simple_animal/xeno/X = M
if(istype(M, /mob/living/simple_animal/xeno/slime))
X.stasis += stunforce
else
X.stasis += (stunforce / 8)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 118 KiB

After

Width:  |  Height:  |  Size: 119 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 119 KiB

After

Width:  |  Height:  |  Size: 120 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 32 KiB

View File

@@ -1874,6 +1874,7 @@
#include "code\modules\xenobio2\mob\slime\slime life.dm"
#include "code\modules\xenobio2\mob\slime\slime procs.dm"
#include "code\modules\xenobio2\mob\slime\slime.dm"
#include "code\modules\xenobio2\tools\slime_handling_tools.dm"
#include "code\modules\xgm\xgm_gas_data.dm"
#include "code\modules\xgm\xgm_gas_mixture.dm"
#include "code\unit_tests\loadout_tests.dm"