Updates in response to feedback from Bhijn. Also adding in missed icons from my first sweep and renamed _corecross.dm to __corecross.dm.

This commit is contained in:
Amatsu Darkfyre
2019-03-08 17:22:40 -05:00
parent 575c7ebeba
commit 54a9b3206f
13 changed files with 5 additions and 8 deletions
@@ -132,7 +132,7 @@ Slimecrossing Armor
icon_state = "adamsuit"
item_state = "adamsuit"
flags_inv = NONE
// obj_flags = IMMUTABLE_SLOW //Commented this out as Citadel currently lacks the IMMUTABLE_SLOW obj_flag.
obj_flags = IMMUTABLE_SLOW
slowdown = 4
var/hit_reflect_chance = 40
@@ -7,7 +7,7 @@
item_state = "bloodgun"
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
item_flags = ABSTRACT | DROPDEL
item_flags = ABSTRACT | DROPDEL | NODROP
w_class = WEIGHT_CLASS_HUGE
force = 5
max_charges = 1 //Recharging costs blood.
@@ -15,10 +15,6 @@
ammo_type = /obj/item/ammo_casing/magic/bloodchill
fire_sound = 'sound/effects/attackblob.ogg'
/obj/item/gun/magic/bloodchill/Initialize()
. = ..()
// add_trait(TRAIT_NODROP, HAND_REPLACEMENT_TRAIT) //Commented out because Citadel lacks add_trait, TRAIT_NODROP and HAND_REPLACEMENT_TRAIT.
/obj/item/gun/magic/bloodchill/process()
charge_tick++
if(charge_tick < recharge_rate || charges >= max_charges)
@@ -840,7 +840,7 @@
return
if(isitem(C))
var/obj/item/I = C
if(I.slowdown <= 0)
if(I.slowdown <= 0 || I.obj_flags & IMMUTABLE_SLOW)
to_chat(user, "<span class='warning'>The [C] can't be made any faster!</span>")
return ..()
I.slowdown = 0