Skip to content

Commit

Permalink
Ещё фиксы
Browse files Browse the repository at this point in the history
  • Loading branch information
LordNest committed Dec 3, 2023
1 parent 2e99d0d commit 2d1d5a6
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 4 deletions.
19 changes: 17 additions & 2 deletions maps/sierra/items/explo_shotgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,26 @@

/obj/item/ammo_magazine/shotholder/net
name = "net shell holder"
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
ammo_type = /obj/item/ammo_casing/shotgun/net
matter = list(MATERIAL_STEEL = 720)
marking_color = COLOR_PALE_PURPLE_GRAY

//obj/item/ammo_casing/shotgun/net search into infinity/code/modules/projectiles/ammunition/bullets.dm
/obj/item/ammo_casing/shotgun/net
name = "net shell"
desc = "A net shell."
icon_state = "netshell"
projectile_type = /obj/item/projectile/bullet/shotgun/beanbag/net
matter = list(MATERIAL_STEEL = 180)

/obj/item/projectile/bullet/shotgun/beanbag/net
name = "netshell"
damage = 5
agony = 10

/obj/item/projectile/bullet/shotgun/beanbag/net/on_hit(atom/target, blocked = 0, def_zone = null)
var/obj/item/energy_net/safari/net = new(loc)
net.try_capture_mob(target)
return TRUE

/obj/item/storage/box/ammo/explo_shells
name = "box of utility shells"
Expand Down
5 changes: 3 additions & 2 deletions maps/sierra/z6_admin.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -7845,8 +7845,9 @@
},
/obj/structure/showcase{
desc = "A self-contained autopilot that controls supply drones.";
icon_state = "comm_server";
name = "Supply Drone Virtual Intelligence"
name = "Supply Drone Virtual Intelligence";
icon = 'icons/obj/machines/telecomms.dmi';
icon_state = "comm_server"
},
/turf/simulated/floor/tiled/techmaint,
/area/supply/dock)
Expand Down

0 comments on commit 2d1d5a6

Please sign in to comment.