mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-26 06:29:23 +01:00
[MIRROR] Adds a new heavy weight space pirate variant: The space IRS! [MDB IGNORE] (#22365)
* Adds a new heavy weight space pirate variant: The space IRS! * Fix merge conflicts, UpdatePaths * Fixes some path changes * Updates icon files, adds a new sprite for breacher slug box illustration * Removes some skyrat edits and puts them in modular overrides instead --------- Co-authored-by: Singul0 <127663818+Singul0@users.noreply.github.com> Co-authored-by: Giz <vinylspiders@gmail.com>
This commit is contained in:
@@ -238,6 +238,16 @@
|
||||
for(var/i in 1 to 6)
|
||||
new /obj/item/ammo_casing/shotgun/beanbag(src)
|
||||
|
||||
/obj/item/storage/box/breacherslug
|
||||
name = "box of breaching shotgun shells"
|
||||
desc = "A box full of breaching slugs, designed for rapid entry, not very effective against anything else."
|
||||
icon_state = "breacher_box"
|
||||
illustration = null
|
||||
|
||||
/obj/item/storage/box/breacherslug/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/ammo_casing/shotgun/breacher(src)
|
||||
|
||||
/obj/item/storage/box/emptysandbags
|
||||
name = "box of empty sandbags"
|
||||
illustration = "sandbag"
|
||||
|
||||
@@ -225,10 +225,9 @@
|
||||
new /obj/item/stack/pipe_cleaner_coil/white(src)
|
||||
new /obj/item/stack/pipe_cleaner_coil/brown(src)
|
||||
|
||||
/obj/item/storage/toolbox/a762
|
||||
name = "7.62mm ammo box (Surplus?)"
|
||||
desc = "It contains a few clips. Goddamn, this thing smells awful. \
|
||||
Has this been sitting in a warehouse for the last several centuries?"
|
||||
/obj/item/storage/toolbox/ammobox
|
||||
name = "ammo canister"
|
||||
desc = "A metal canister designed to hold ammunition"
|
||||
icon_state = "ammobox"
|
||||
inhand_icon_state = "ammobox"
|
||||
lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'
|
||||
@@ -236,15 +235,30 @@
|
||||
has_latches = FALSE
|
||||
drop_sound = 'sound/items/handling/ammobox_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/ammobox_pickup.ogg'
|
||||
var/ammo_to_spawn = /obj/item/ammo_box/a762
|
||||
var/ammo_to_spawn
|
||||
|
||||
/obj/item/storage/toolbox/a762/PopulateContents()
|
||||
for(var/i in 1 to 6)
|
||||
new ammo_to_spawn(src)
|
||||
/obj/item/storage/toolbox/ammobox/PopulateContents()
|
||||
if(!isnull(ammo_to_spawn))
|
||||
for(var/i in 1 to 6)
|
||||
new ammo_to_spawn(src)
|
||||
|
||||
/obj/item/storage/toolbox/a762/surplus
|
||||
/obj/item/storage/toolbox/ammobox/a762
|
||||
name = "7.62mm ammo box (Surplus?)"
|
||||
desc = "It contains a few clips. Goddamn, this thing smells awful. \
|
||||
Has this been sitting in a warehouse for the last several centuries?"
|
||||
ammo_to_spawn = /obj/item/ammo_box/a762
|
||||
|
||||
/obj/item/storage/toolbox/ammobox/a762/surplus
|
||||
ammo_to_spawn = /obj/item/ammo_box/a762/surplus
|
||||
|
||||
/obj/item/storage/toolbox/ammobox/wt550m9
|
||||
name = "4.6x30mm ammo box"
|
||||
ammo_to_spawn = /obj/item/ammo_box/magazine/wt550m9
|
||||
|
||||
/obj/item/storage/toolbox/ammobox/wt550m9ap
|
||||
name = "4.6x30mm AP ammo box"
|
||||
ammo_to_spawn = /obj/item/ammo_box/magazine/wt550m9/wtap
|
||||
|
||||
/obj/item/storage/toolbox/maint_kit
|
||||
name = "gun maintenance kit"
|
||||
desc = "It contains some gun maintenance supplies"
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
playsound(src, P.hitsound, 50, TRUE)
|
||||
var/damage
|
||||
if(!QDELETED(src)) //Bullet on_hit effect might have already destroyed this object
|
||||
damage = take_damage(P.damage, P.damage_type, P.armor_flag, 0, turn(P.dir, 180), P.armour_penetration)
|
||||
damage = take_damage(P.damage * P.demolition_mod, P.damage_type, P.armor_flag, 0, turn(P.dir, 180), P.armour_penetration)
|
||||
if(P.suppressed != SUPPRESSED_VERY)
|
||||
visible_message(span_danger("[src] is hit by \a [P][damage ? "" : ", without leaving a mark"]!"), null, null, COMBAT_MESSAGE_RANGE)
|
||||
|
||||
|
||||
@@ -133,3 +133,8 @@
|
||||
icon_state = "ecase"
|
||||
case_type = "egun"
|
||||
gun_category = /obj/item/gun/energy/e_gun
|
||||
|
||||
/obj/structure/guncase/wt550
|
||||
name = "WT-550 gun locker"
|
||||
desc = "A locker that holds WT-550 rifles."
|
||||
case_type = "wt550"
|
||||
|
||||
Reference in New Issue
Block a user