Skip to content

Commit

Permalink
add flashbreach shells to armory
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tarmunora
Tarmunora committed Nov 8, 2022
1 parent 9dcaa1b commit a606a19
Show file tree
Hide file tree
Showing 21 changed files with 84 additions and 344 deletions.
8 changes: 6 additions & 2 deletions code/obj/item/gun/ammo.dm
View file
Expand Up @@ -972,15 +972,19 @@ ABSTRACT_TYPE(/obj/item/ammo/bullets/pipeshot)
name = "40mm door-breaching rounds"
desc = "Some high-tech shells with an ID-chipped tip and a pyrotechnic payload."
ammo_type = new/datum/projectile/bullet/breach_flashbang
amount_left = 2
max_amount = 2
amount_left = 5
max_amount = 5
icon_state = "40mm_nonlethal"
ammo_cat = AMMO_GRENADE_40MM
w_class = W_CLASS_NORMAL
icon_dynamic = 0
icon_empty = "40mm_nonlethal-0"
sound_load = 'sound/weapons/gunload_40mm.ogg'

single
amount_left = 1
max_amount = 1

//basically an internal object for converting hand-grenades into shells, but can be spawned independently.
/obj/item/ammo/bullets/grenade_shell
sname = "40mm Custom Shell"
Expand Down
6 changes: 6 additions & 0 deletions code/obj/item/gun/kinetic.dm
View file
Expand Up @@ -1481,6 +1481,12 @@ ABSTRACT_TYPE(/obj/item/gun/kinetic/single_action)
TO_LOAD.Attackby(nade, user)
src.Attackby(TO_LOAD, user)

breach
default_magazine = /obj/item/ammo/bullets/breach_flashbang/single
New()
ammo = new default_magazine
set_current_projectile(new/datum/projectile/bullet/breach_flashbang)
..()

//1.58
// Ported from old, non-gun RPG-7 object class (Convair880).
Expand Down
32 changes: 32 additions & 0 deletions code/obj/random_spawners.dm
View file
Expand Up @@ -1869,3 +1869,35 @@
one_to_three
min_amt2spawn = 1
max_amt2spawn = 3


/obj/random_item_spawner/armory_breaching_supplies //random
spawn_items()
new /obj/item/breaching_charge{
pixel_x = 10;
pixel_y = 1
}(src.loc)
new /obj/item/breaching_charge{
pixel_x = 4;
pixel_y = -2
}(src.loc)
new /obj/item/breaching_charge{
pixel_x = -2;
pixel_y = -5
}(src.loc)
new /obj/item/breaching_hammer{
pixel_x = -3;
pixel_y = 7
}(src.loc)
new /obj/item/breaching_hammer{
pixel_x = -1;
pixel_y = 1
}(src.loc)
new /obj/item/gun/kinetic/riot40mm/breach{
pixel_x = -5;
pixel_y = 8
}(src.loc)
new /obj/item/ammo/bullets/breach_flashbang{
pixel_x = -4;
pixel_y = 3
}(src.loc)
22 changes: 1 addition & 21 deletions maps/atlas.dmm
View file
Expand Up @@ -19146,27 +19146,7 @@
/turf/simulated/floor/engine/vacuum,
/area/station/engine/combustion_chamber)
"Va" = (
/obj/rack,
/obj/item/breaching_charge{
pixel_x = 10;
pixel_y = 1
},
/obj/item/breaching_charge{
pixel_x = 4;
pixel_y = -2
},
/obj/item/breaching_charge{
pixel_x = -2;
pixel_y = -5
},
/obj/item/breaching_hammer{
pixel_x = -3;
pixel_y = 7
},
/obj/item/breaching_hammer{
pixel_x = -1;
pixel_y = 1
},
/obj/random_item_spawner/armory_breaching_supplies,
/turf/simulated/floor/caution/corner/misc{
dir = 6
},
Expand Down
26 changes: 1 addition & 25 deletions maps/clarion.dmm
View file
Expand Up @@ -50013,31 +50013,7 @@
},
/area/station/hallway/primary/west)
"tyz" = (
/obj/rack,
/obj/item/breaching_charge{
pixel_x = 10;
pixel_y = 1
},
/obj/item/breaching_charge{
pixel_x = 4;
pixel_y = -2
},
/obj/item/breaching_charge{
pixel_x = -2;
pixel_y = -5
},
/obj/item/breaching_hammer{
pixel_x = -3;
pixel_y = 7
},
/obj/item/breaching_hammer{
pixel_x = -1;
pixel_y = 1
},
/obj/disposalpipe/segment/food,
/turf/simulated/floor/redblack{
dir = 10
},
/obj/random_item_spawner/armory_breaching_supplies,
/area/station/ai_monitored/armory)
"tAi" = (
/turf/simulated/floor/red/side{
Expand Down
22 changes: 1 addition & 21 deletions maps/cogmap.dmm
View file
Expand Up @@ -1070,27 +1070,7 @@
/turf/simulated/wall/auto/supernorn,
/area/station/crew_quarters/clown)
"adV" = (
/obj/rack,
/obj/item/breaching_charge{
pixel_x = 10;
pixel_y = 1
},
/obj/item/breaching_charge{
pixel_x = 4;
pixel_y = -2
},
/obj/item/breaching_charge{
pixel_x = -2;
pixel_y = -5
},
/obj/item/breaching_hammer{
pixel_x = -3;
pixel_y = 7
},
/obj/item/breaching_hammer{
pixel_x = -1;
pixel_y = 1
},
/obj/random_item_spawner/armory_breaching_supplies,
/obj/decal/tile_edge/stripe/extra_big{
dir = 8
},
Expand Down
22 changes: 1 addition & 21 deletions maps/cogmap2.dmm
View file
Expand Up @@ -77798,27 +77798,7 @@
/turf/simulated/floor/circuit/off,
/area/station/bridge)
"hGX" = (
/obj/rack,
/obj/item/breaching_charge{
pixel_x = 10;
pixel_y = 1
},
/obj/item/breaching_charge{
pixel_x = 4;
pixel_y = -2
},
/obj/item/breaching_charge{
pixel_x = -2;
pixel_y = -5
},
/obj/item/breaching_hammer{
pixel_x = -3;
pixel_y = 7
},
/obj/item/breaching_hammer{
pixel_x = -1;
pixel_y = 1
},
/obj/random_item_spawner/armory_breaching_supplies,
/obj/machinery/atmospherics/pipe/simple/color_pipe/cyan_pipe/overfloor{
dir = 4
},
Expand Down
22 changes: 1 addition & 21 deletions maps/destiny.dmm
View file
Expand Up @@ -36691,27 +36691,7 @@
/turf/simulated/floor/plating/random,
/area/station/maintenance/disposal)
"lzV" = (
/obj/rack,
/obj/item/breaching_charge{
pixel_x = 10;
pixel_y = 1
},
/obj/item/breaching_charge{
pixel_x = 4;
pixel_y = -2
},
/obj/item/breaching_charge{
pixel_x = -2;
pixel_y = -5
},
/obj/item/breaching_hammer{
pixel_x = -3;
pixel_y = 7
},
/obj/item/breaching_hammer{
pixel_x = -1;
pixel_y = 1
},
/obj/random_item_spawner/armory_breaching_supplies,
/obj/decal/tile_edge/line/red{
dir = 6;
icon_state = "line2"
Expand Down
22 changes: 1 addition & 21 deletions maps/donut2.dmm
View file
Expand Up @@ -25959,27 +25959,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/west)
"cny" = (
/obj/rack,
/obj/item/breaching_hammer{
pixel_x = -1;
pixel_y = 1
},
/obj/item/breaching_hammer{
pixel_x = 1;
pixel_y = 7
},
/obj/item/breaching_charge{
pixel_x = 10;
pixel_y = 1
},
/obj/item/breaching_charge{
pixel_x = 4;
pixel_y = -2
},
/obj/item/breaching_charge{
pixel_x = -2;
pixel_y = -5
},
/obj/random_item_spawner/armory_breaching_supplies,
/turf/simulated/floor/black,
/area/station/ai_monitored/armory)
"coi" = (
Expand Down
23 changes: 1 addition & 22 deletions maps/donut3.dmm
View file
Expand Up @@ -15843,28 +15843,7 @@
/turf/simulated/floor/plating,
/area/station/security/main)
"esA" = (
/obj/table/reinforced/auto{
icon_state = "2"
},
/obj/item/breaching_hammer{
pixel_x = 1;
pixel_y = 7
},
/obj/item/breaching_hammer{
pixel_x = 3;
pixel_y = 3
},
/obj/item/breaching_charge{
pixel_x = 8
},
/obj/item/breaching_charge{
pixel_x = 6;
pixel_y = -3
},
/obj/item/breaching_charge{
pixel_x = 3;
pixel_y = -6
},
/obj/random_item_spawner/armory_breaching_supplies,
/obj/machinery/light/incandescent/warm/very{
dir = 8
},
Expand Down
43 changes: 12 additions & 31 deletions maps/horizon.dmm
View file
Expand Up @@ -11381,16 +11381,20 @@
pixel_x = 11;
pixel_y = 10
},
/obj/item/breaching_charge{
pixel_x = -5;
/obj/item/ammo/bullets/tranq_darts/anti_mutant{
pixel_x = -10;
pixel_y = -6
},
/obj/item/breaching_charge{
pixel_x = -1;
pixel_y = -3
/obj/item/ammo/bullets/tranq_darts{
pixel_x = 10;
pixel_y = -6
},
/obj/item/breaching_charge{
pixel_x = 8
/obj/item/ammo/bullets/tranq_darts{
pixel_x = 6;
pixel_y = -6
},
/obj/item/gun/kinetic/dart_rifle{
pixel_y = -8
},
/turf/simulated/floor/black,
/area/station/ai_monitored/armory)
Expand Down Expand Up @@ -37659,30 +37663,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/southeast)
"bQu" = (
/obj/table/reinforced/auto,
/obj/item/breaching_hammer{
pixel_x = 1;
pixel_y = 7
},
/obj/item/breaching_hammer{
pixel_x = 3;
pixel_y = 3
},
/obj/item/ammo/bullets/tranq_darts/anti_mutant{
pixel_x = -10;
pixel_y = -6
},
/obj/item/ammo/bullets/tranq_darts{
pixel_x = 10;
pixel_y = -6
},
/obj/item/ammo/bullets/tranq_darts{
pixel_x = 6;
pixel_y = -6
},
/obj/item/gun/kinetic/dart_rifle{
pixel_y = -8
},
/obj/random_item_spawner/armory_breaching_supplies,
/turf/simulated/floor/black,
/area/station/ai_monitored/armory)
"bQw" = (
Expand Down
22 changes: 1 addition & 21 deletions maps/kondaru.dmm
View file
Expand Up @@ -56826,27 +56826,7 @@
/turf/simulated/floor/specialroom/bar,
/area/station/crew_quarters/cafeteria)
"trP" = (
/obj/rack,
/obj/item/breaching_charge{
pixel_x = 10;
pixel_y = 1
},
/obj/item/breaching_charge{
pixel_x = 4;
pixel_y = -2
},
/obj/item/breaching_charge{
pixel_x = -2;
pixel_y = -5
},
/obj/item/breaching_hammer{
pixel_x = -3;
pixel_y = 7
},
/obj/item/breaching_hammer{
pixel_x = -1;
pixel_y = 1
},
/obj/random_item_spawner/armory_breaching_supplies,
/obj/machinery/firealarm{
pixel_y = 24
},
Expand Down

0 comments on commit a606a19

Please sign in to comment.