cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 17:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Syringe guns new sprite and become bulky [MDB IGNORE] (#9203)

Browse Source 
* 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>
This commit is contained in:
SkyratBot
2021-11-02 16:33:00 +00:00
committed by GitHub
parent a999fc8d41
commit bfa2972b25
10 changed files with 69 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
code/modules/projectiles/guns/special/syringe_gun.dm
View File

@@ -1,12 +1,21 @@
/obj/item/gun/syringe
name = "syringe gun"
desc = "A spring loaded rifle designed to fit syringes, used to incapacitate unruly patients from a distance."
icon_state = "syringegun"
inhand_icon_state = "syringegun"
w_class = WEIGHT_CLASS_NORMAL
name = "medical syringe gun"
desc = "A spring loaded gun designed to fit syringes, used to incapacitate unruly patients from a distance."
icon = 'icons/obj/guns/syringegun.dmi'
icon_state = "medicalsyringegun"
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_range = 7
force = 4
force = 6
base_pixel_x = -4
pixel_x = -4
custom_materials = list(/datum/material/iron=2000)
clumsy_check = FALSE
fire_sound = 'sound/items/syringeproj.ogg'
@@ -85,25 +94,56 @@
. += "[initial(icon_state)]_[syringe_count ? clamp(syringe_count, 1, initial(max_syringes)) : "empty"]"
/obj/item/gun/syringe/rapidsyringe
name = "rapid syringe gun"
desc = "A modification of the syringe gun design, using a rotating cylinder to store up to six syringes."
name = "compact rapid syringe gun"
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"
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
force = 4
/obj/item/gun/syringe/syndicate
name = "dart pistol"
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_x_dimension = 32
inhand_y_dimension = 32
worn_icon_state = "gun"
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
suppressed = TRUE //Softer fire sound
can_unsuppress = FALSE //Permanently silenced
syringes = list(new /obj/item/reagent_containers/syringe())
/obj/item/gun/syringe/dna
name = "modified syringe gun"
desc = "A syringe gun that has been modified to fit DNA injectors instead of normal syringes."
name = "modified compact syringe gun"
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)
. = ..()
@@ -121,6 +161,8 @@
to_chat(user, span_notice("You load \the [D] into \the [src]."))
syringes += D
recharge_newshot()
update_appearance()
playsound(loc, load_sound, 40)
return TRUE
else
to_chat(user, span_warning("[src] cannot hold more syringes!"))
@@ -129,10 +171,21 @@
/obj/item/gun/syringe/blowgun
name = "blowgun"
desc = "Fire syringes at a short distance."
icon = 'icons/obj/guns/ballistic.dmi'
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_x_dimension = 32
inhand_y_dimension = 32
worn_icon_state = "gun"
has_syringe_overlay = FALSE
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)
visible_message(span_danger("[user] starts aiming with a blowgun!"))