[MIRROR] Syringe guns new sprite and become bulky [MDB IGNORE] (#9203)
* Syringe guns new sprite and become bulky (#62443) This PR change the syringe gun sprite, the syringe gun is now bulky and can only be placed on back slot or suit storage with labcoat, medical windercoat and biosuit. * Syringe guns new sprite and become bulky Co-authored-by: UnokiAs <82665345+UnokiAs@users.noreply.github.com>
@@ -20,7 +20,7 @@
|
|||||||
clothing_flags = THICKMATERIAL
|
clothing_flags = THICKMATERIAL
|
||||||
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
|
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
|
||||||
slowdown = 0.5
|
slowdown = 0.5
|
||||||
allowed = list(/obj/item/tank/internals, /obj/item/reagent_containers/dropper, /obj/item/flashlight/pen, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/glass/beaker)
|
allowed = list(/obj/item/tank/internals, /obj/item/reagent_containers/dropper, /obj/item/flashlight/pen, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/glass/beaker, /obj/item/gun/syringe)
|
||||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 100, FIRE = 30, ACID = 100)
|
armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 100, FIRE = 30, ACID = 100)
|
||||||
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
|
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
|
||||||
strip_delay = 70
|
strip_delay = 70
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
/obj/item/reagent_containers/hypospray,
|
/obj/item/reagent_containers/hypospray,
|
||||||
/obj/item/reagent_containers/pill,
|
/obj/item/reagent_containers/pill,
|
||||||
/obj/item/reagent_containers/syringe,
|
/obj/item/reagent_containers/syringe,
|
||||||
|
/obj/item/gun/syringe,
|
||||||
/obj/item/sensor_device,
|
/obj/item/sensor_device,
|
||||||
/obj/item/soap,
|
/obj/item/soap,
|
||||||
/obj/item/stack/medical,
|
/obj/item/stack/medical,
|
||||||
|
|||||||
@@ -176,6 +176,7 @@
|
|||||||
/obj/item/reagent_containers/hypospray,
|
/obj/item/reagent_containers/hypospray,
|
||||||
/obj/item/reagent_containers/pill,
|
/obj/item/reagent_containers/pill,
|
||||||
/obj/item/reagent_containers/syringe,
|
/obj/item/reagent_containers/syringe,
|
||||||
|
/obj/item/gun/syringe,
|
||||||
/obj/item/stack/medical,
|
/obj/item/stack/medical,
|
||||||
/obj/item/sensor_device,
|
/obj/item/sensor_device,
|
||||||
/obj/item/storage/pill_bottle,
|
/obj/item/storage/pill_bottle,
|
||||||
|
|||||||
@@ -1,12 +1,21 @@
|
|||||||
/obj/item/gun/syringe
|
/obj/item/gun/syringe
|
||||||
name = "syringe gun"
|
name = "medical syringe gun"
|
||||||
desc = "A spring loaded rifle designed to fit syringes, used to incapacitate unruly patients from a distance."
|
desc = "A spring loaded gun designed to fit syringes, used to incapacitate unruly patients from a distance."
|
||||||
icon_state = "syringegun"
|
icon = 'icons/obj/guns/syringegun.dmi'
|
||||||
inhand_icon_state = "syringegun"
|
icon_state = "medicalsyringegun"
|
||||||
w_class = WEIGHT_CLASS_NORMAL
|
lefthand_file = 'icons/mob/inhands/weapons/64x_guns_left.dmi'
|
||||||
|
righthand_file = 'icons/mob/inhands/weapons/64x_guns_right.dmi'
|
||||||
|
inhand_icon_state = "medicalsyringegun"
|
||||||
|
inhand_x_dimension = 64
|
||||||
|
inhand_y_dimension = 64
|
||||||
|
worn_icon_state = null
|
||||||
|
w_class = WEIGHT_CLASS_BULKY
|
||||||
|
slot_flags = ITEM_SLOT_BACK
|
||||||
throw_speed = 3
|
throw_speed = 3
|
||||||
throw_range = 7
|
throw_range = 7
|
||||||
force = 4
|
force = 6
|
||||||
|
base_pixel_x = -4
|
||||||
|
pixel_x = -4
|
||||||
custom_materials = list(/datum/material/iron=2000)
|
custom_materials = list(/datum/material/iron=2000)
|
||||||
clumsy_check = FALSE
|
clumsy_check = FALSE
|
||||||
fire_sound = 'sound/items/syringeproj.ogg'
|
fire_sound = 'sound/items/syringeproj.ogg'
|
||||||
@@ -85,25 +94,56 @@
|
|||||||
. += "[initial(icon_state)]_[syringe_count ? clamp(syringe_count, 1, initial(max_syringes)) : "empty"]"
|
. += "[initial(icon_state)]_[syringe_count ? clamp(syringe_count, 1, initial(max_syringes)) : "empty"]"
|
||||||
|
|
||||||
/obj/item/gun/syringe/rapidsyringe
|
/obj/item/gun/syringe/rapidsyringe
|
||||||
name = "rapid syringe gun"
|
name = "compact rapid syringe gun"
|
||||||
desc = "A modification of the syringe gun design, using a rotating cylinder to store up to six syringes."
|
desc = "A modification of the syringe gun design to be more compact and use a rotating cylinder to store up to six syringes."
|
||||||
icon_state = "rapidsyringegun"
|
icon_state = "rapidsyringegun"
|
||||||
|
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
|
||||||
|
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
|
||||||
|
inhand_icon_state = "syringegun"
|
||||||
|
inhand_x_dimension = 32
|
||||||
|
inhand_y_dimension = 32
|
||||||
|
worn_icon_state = "gun"
|
||||||
|
w_class = WEIGHT_CLASS_NORMAL
|
||||||
|
slot_flags = ITEM_SLOT_BELT
|
||||||
|
base_pixel_x = 0
|
||||||
|
pixel_x = 0
|
||||||
max_syringes = 6
|
max_syringes = 6
|
||||||
|
force = 4
|
||||||
|
|
||||||
/obj/item/gun/syringe/syndicate
|
/obj/item/gun/syringe/syndicate
|
||||||
name = "dart pistol"
|
name = "dart pistol"
|
||||||
desc = "A small spring-loaded sidearm that functions identically to a syringe gun."
|
desc = "A small spring-loaded sidearm that functions identically to a syringe gun."
|
||||||
icon_state = "syringe_pistol"
|
icon_state = "dartsyringegun"
|
||||||
|
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
|
||||||
|
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
|
||||||
inhand_icon_state = "gun" //Smaller inhand
|
inhand_icon_state = "gun" //Smaller inhand
|
||||||
|
inhand_x_dimension = 32
|
||||||
|
inhand_y_dimension = 32
|
||||||
|
worn_icon_state = "gun"
|
||||||
w_class = WEIGHT_CLASS_SMALL
|
w_class = WEIGHT_CLASS_SMALL
|
||||||
|
slot_flags = ITEM_SLOT_BELT
|
||||||
|
base_pixel_x = 0
|
||||||
|
pixel_x = 0
|
||||||
force = 2 //Also very weak because it's smaller
|
force = 2 //Also very weak because it's smaller
|
||||||
suppressed = TRUE //Softer fire sound
|
suppressed = TRUE //Softer fire sound
|
||||||
can_unsuppress = FALSE //Permanently silenced
|
can_unsuppress = FALSE //Permanently silenced
|
||||||
syringes = list(new /obj/item/reagent_containers/syringe())
|
syringes = list(new /obj/item/reagent_containers/syringe())
|
||||||
|
|
||||||
/obj/item/gun/syringe/dna
|
/obj/item/gun/syringe/dna
|
||||||
name = "modified syringe gun"
|
name = "modified compact syringe gun"
|
||||||
desc = "A syringe gun that has been modified to fit DNA injectors instead of normal syringes."
|
desc = "A syringe gun that has been modified to be compact and fit DNA injectors instead of normal syringes."
|
||||||
|
icon_state = "dnasyringegun"
|
||||||
|
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
|
||||||
|
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
|
||||||
|
inhand_icon_state = "syringegun"
|
||||||
|
inhand_x_dimension = 32
|
||||||
|
inhand_y_dimension = 32
|
||||||
|
worn_icon_state = "gun"
|
||||||
|
w_class = WEIGHT_CLASS_NORMAL
|
||||||
|
slot_flags = ITEM_SLOT_BELT
|
||||||
|
base_pixel_x = 0
|
||||||
|
pixel_x = 0
|
||||||
|
force = 4
|
||||||
|
|
||||||
/obj/item/gun/syringe/dna/Initialize(mapload)
|
/obj/item/gun/syringe/dna/Initialize(mapload)
|
||||||
. = ..()
|
. = ..()
|
||||||
@@ -121,6 +161,8 @@
|
|||||||
to_chat(user, span_notice("You load \the [D] into \the [src]."))
|
to_chat(user, span_notice("You load \the [D] into \the [src]."))
|
||||||
syringes += D
|
syringes += D
|
||||||
recharge_newshot()
|
recharge_newshot()
|
||||||
|
update_appearance()
|
||||||
|
playsound(loc, load_sound, 40)
|
||||||
return TRUE
|
return TRUE
|
||||||
else
|
else
|
||||||
to_chat(user, span_warning("[src] cannot hold more syringes!"))
|
to_chat(user, span_warning("[src] cannot hold more syringes!"))
|
||||||
@@ -129,10 +171,21 @@
|
|||||||
/obj/item/gun/syringe/blowgun
|
/obj/item/gun/syringe/blowgun
|
||||||
name = "blowgun"
|
name = "blowgun"
|
||||||
desc = "Fire syringes at a short distance."
|
desc = "Fire syringes at a short distance."
|
||||||
|
icon = 'icons/obj/guns/ballistic.dmi'
|
||||||
icon_state = "blowgun"
|
icon_state = "blowgun"
|
||||||
|
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
|
||||||
|
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
|
||||||
inhand_icon_state = "blowgun"
|
inhand_icon_state = "blowgun"
|
||||||
|
inhand_x_dimension = 32
|
||||||
|
inhand_y_dimension = 32
|
||||||
|
worn_icon_state = "gun"
|
||||||
has_syringe_overlay = FALSE
|
has_syringe_overlay = FALSE
|
||||||
fire_sound = 'sound/items/syringeproj.ogg'
|
fire_sound = 'sound/items/syringeproj.ogg'
|
||||||
|
w_class = WEIGHT_CLASS_NORMAL
|
||||||
|
slot_flags = ITEM_SLOT_BELT
|
||||||
|
base_pixel_x = 0
|
||||||
|
pixel_x = 0
|
||||||
|
force = 4
|
||||||
|
|
||||||
/obj/item/gun/syringe/blowgun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
|
/obj/item/gun/syringe/blowgun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
|
||||||
visible_message(span_danger("[user] starts aiming with a blowgun!"))
|
visible_message(span_danger("[user] starts aiming with a blowgun!"))
|
||||||
|
|||||||
@@ -1917,8 +1917,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
|
|||||||
//restricted_roles = list("Geneticist", "Research Director") //SKYRAT EDIT: Removal
|
//restricted_roles = list("Geneticist", "Research Director") //SKYRAT EDIT: Removal
|
||||||
|
|
||||||
/datum/uplink_item/role_restricted/modified_syringe_gun
|
/datum/uplink_item/role_restricted/modified_syringe_gun
|
||||||
name = "Modified Syringe Gun"
|
name = "Modified Compact Syringe Gun"
|
||||||
desc = "A syringe gun that fires DNA injectors instead of normal syringes."
|
desc = "A compact version of the syringe gun that fires DNA injectors instead of normal syringes."
|
||||||
item = /obj/item/gun/syringe/dna
|
item = /obj/item/gun/syringe/dna
|
||||||
cost = 14
|
cost = 14
|
||||||
restricted_roles = list("Geneticist", "Research Director")
|
restricted_roles = list("Geneticist", "Research Director")
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 133 KiB After Width: | Height: | Size: 134 KiB |
|
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 55 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 3.1 KiB |
BIN
icons/obj/guns/syringegun.dmi
Normal file
|
After Width: | Height: | Size: 808 B |