mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 10:21:11 +00:00
Adds rock-salt slug shells, intended for riot and anti-occult use. (#36397)
* Adds rock-salt slug shells, intended for riot and anti-occult use. * + now works on constructs + fixed bad text ref in holysalt/water splash on constructs * remove from cargo
This commit is contained in:
@@ -576,6 +576,12 @@
|
||||
icon_state = "frag_shells"
|
||||
can_add_storageslots = TRUE
|
||||
items_to_spawn = list(/obj/item/ammo_casing/shotgun/frag = 16)
|
||||
|
||||
/obj/item/weapon/storage/box/rocksaltshells
|
||||
name = "12-gauge rocksalt shells"
|
||||
icon_state = "rocksalt_shells"
|
||||
can_add_storageslots = TRUE
|
||||
items_to_spawn = list(/obj/item/ammo_casing/shotgun/rocksalt = 16)
|
||||
|
||||
/obj/item/weapon/storage/box/labels
|
||||
name = "label roll box"
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
projectile_type = /obj/item/projectile/bullet/suffocationbullet
|
||||
w_type = RECYK_METAL
|
||||
|
||||
|
||||
/obj/item/ammo_casing/a75
|
||||
desc = "A .75 bullet casing."
|
||||
caliber = POINT75
|
||||
@@ -184,6 +183,12 @@
|
||||
projectile_type = /obj/item/projectile/bullet/boombullet
|
||||
starting_materials = list(MAT_IRON = 250, MAT_PLASMA = 4000)
|
||||
|
||||
/obj/item/ammo_casing/shotgun/rocksalt
|
||||
name = "rock-salt shell"
|
||||
desc = "A 12 gauge shell filled with a makeshift rock-salt slug, intended for riot control or battling the occult."
|
||||
icon_state = "rsshell"
|
||||
projectile_type = /obj/item/projectile/bullet/rocksalt
|
||||
starting_materials = list(MAT_IRON = 250)
|
||||
|
||||
/obj/item/ammo_casing/a762
|
||||
desc = "A 7.62x51mm bullet casing."
|
||||
|
||||
@@ -1095,3 +1095,23 @@
|
||||
..()
|
||||
reagents.add_reagent(DIABEETUSOL, 4)
|
||||
reagents.add_reagent(SUGAR, 5)
|
||||
|
||||
/obj/item/projectile/bullet/rocksalt
|
||||
name = "rock-salt slug"
|
||||
icon_state = "rsshell"
|
||||
damage = 10
|
||||
agony = 20
|
||||
penetration = 1
|
||||
|
||||
/obj/item/projectile/bullet/rocksalt/New()
|
||||
..()
|
||||
create_reagents(10)
|
||||
reagents.add_reagent(HOLYSALTS, 5)
|
||||
reagents.add_reagent(HOLYWATER, 5)
|
||||
|
||||
/obj/item/projectile/bullet/rocksalt/on_hit(var/atom/atarget, var/blocked = 0)
|
||||
..()
|
||||
if(!blocked && ishuman(atarget))
|
||||
reagents.trans_to(atarget, reagents.total_volume)
|
||||
else
|
||||
reagents.reaction(atarget)
|
||||
@@ -36,7 +36,7 @@
|
||||
var/mob/living/simple_animal/C = M
|
||||
C.purge = 3
|
||||
C.adjustBruteLoss(5)
|
||||
C.visible_message("<span class='danger'>The holy water erodes \the [src].</span>")
|
||||
C.visible_message("<span class='danger'>The [src] erodes \the [M].</span>")
|
||||
|
||||
/datum/reagent/holywater/on_plant_life(obj/machinery/portable_atmospherics/hydroponics/T)
|
||||
..()
|
||||
@@ -81,7 +81,7 @@
|
||||
var/mob/living/simple_animal/C = M
|
||||
C.purge = 3
|
||||
C.adjustBruteLoss(5)
|
||||
C.visible_message("<span class='danger'>The holy salts erode \the [src].</span>")
|
||||
C.visible_message("<span class='danger'>The [src] erodes \the [M].</span>")
|
||||
|
||||
/datum/reagent/holysalts/on_plant_life(obj/machinery/portable_atmospherics/hydroponics/T)
|
||||
..()
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 34 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 184 KiB After Width: | Height: | Size: 184 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 16 KiB |
Reference in New Issue
Block a user