diff --git a/code/__DEFINES/obj_flags.dm b/code/__DEFINES/obj_flags.dm index 76f66521a7..e6d4fd126b 100644 --- a/code/__DEFINES/obj_flags.dm +++ b/code/__DEFINES/obj_flags.dm @@ -25,6 +25,7 @@ #define NOBLUDGEON (1<<7) // when an item has this it produces no "X has been hit by Y with Z" message in the default attackby() #define NODROP (1<<8) // This flag makes it so that an item literally cannot be removed at all, or at least that's how it should be. Only deleted. #define ABSTRACT (1<<9) // for all things that are technically items but used for various different stuff +#define IMMUTABLE_SLOW (1<<10) //When players should not be able to change the slowdown of the item (Speed potions, ect) // Flags for the clothing_flags var on /obj/item/clothing diff --git a/code/modules/research/xenobiology/crossbreeding/_corecross.dm b/code/modules/research/xenobiology/crossbreeding/__corecross.dm similarity index 100% rename from code/modules/research/xenobiology/crossbreeding/_corecross.dm rename to code/modules/research/xenobiology/crossbreeding/__corecross.dm diff --git a/code/modules/research/xenobiology/crossbreeding/_clothing.dm b/code/modules/research/xenobiology/crossbreeding/_clothing.dm index d78f025434..fc96bdeba5 100644 --- a/code/modules/research/xenobiology/crossbreeding/_clothing.dm +++ b/code/modules/research/xenobiology/crossbreeding/_clothing.dm @@ -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 diff --git a/code/modules/research/xenobiology/crossbreeding/_weapons.dm b/code/modules/research/xenobiology/crossbreeding/_weapons.dm index 9fdd5ff6a0..1138f65105 100644 --- a/code/modules/research/xenobiology/crossbreeding/_weapons.dm +++ b/code/modules/research/xenobiology/crossbreeding/_weapons.dm @@ -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) diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 5da091152f..ca12accbed 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -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, "The [C] can't be made any faster!") return ..() I.slowdown = 0 diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index 4bbe27f09d..aad4718cbd 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 03d6190507..2f39dd5940 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi index dae3861233..f6ac6ca499 100644 Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi index f3d5c42570..504121feba 100644 Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index 18b323c997..e644f81ae3 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 904084adb5..b518157bb5 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 7f4e368c6e..9861a2e618 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 4d37ad3ae1..c43b1a7019 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2528,8 +2528,8 @@ #include "code\modules\research\techweb\all_nodes.dm" #include "code\modules\research\xenobiology\xenobio_camera.dm" #include "code\modules\research\xenobiology\xenobiology.dm" +#include "code\modules\research\xenobiology\crossbreeding\__corecross.dm" #include "code\modules\research\xenobiology\crossbreeding\_clothing.dm" -#include "code\modules\research\xenobiology\crossbreeding\_corecross.dm" #include "code\modules\research\xenobiology\crossbreeding\_misc.dm" #include "code\modules\research\xenobiology\crossbreeding\_mobs.dm" #include "code\modules\research\xenobiology\crossbreeding\_status_effects.dm"