mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
Adds .38 Gutterpunch (#14763)
* new separate pr oh boy oh boy * how the fuck
This commit is contained in:
@@ -14296,6 +14296,7 @@
|
||||
/obj/item/ammo_box/c38,
|
||||
/obj/item/ammo_box/c38/hotshot,
|
||||
/obj/item/ammo_box/c38/iceblox,
|
||||
/obj/item/ammo_box/c38/gutterpunch,
|
||||
/obj/item/ammo_box/c38/trac,
|
||||
/obj/item/ammo_box/a357,
|
||||
/obj/item/ammo_box/a762,
|
||||
|
||||
@@ -271,7 +271,8 @@
|
||||
/obj/item/storage/box/rubbershot,
|
||||
/obj/item/ammo_box/c38/trac,
|
||||
/obj/item/ammo_box/c38/hotshot,
|
||||
/obj/item/ammo_box/c38/iceblox)
|
||||
/obj/item/ammo_box/c38/iceblox,
|
||||
/obj/item/ammo_box/c38/gutterpunch)
|
||||
crate_name = "ammo crate"
|
||||
|
||||
/datum/supply_pack/security/armor
|
||||
|
||||
@@ -38,3 +38,9 @@
|
||||
desc = "A .38 Iceblox bullet casing."
|
||||
caliber = "38"
|
||||
projectile_type = /obj/item/projectile/bullet/c38/iceblox
|
||||
|
||||
/obj/item/ammo_casing/c38/gutterpunch
|
||||
name = ".38 Gutterpunch bullet casing"
|
||||
desc = "A .38 Gutterpunch bullet casing"
|
||||
caliber = "38"
|
||||
projectile_type = /obj/item/projectile/bullet/c38/gutterpunch
|
||||
|
||||
@@ -35,6 +35,13 @@
|
||||
icon_state = "38ice"
|
||||
ammo_type = /obj/item/ammo_casing/c38/iceblox
|
||||
|
||||
/obj/item/ammo_box/c38/gutterpunch
|
||||
name = "speed loader (.38 Gutterpunch)"
|
||||
desc = "A six-shot speed loader designed for .38 revolvers. \
|
||||
These rounds trade exhaustive properties for an emetic payload which induces nausea in targets."
|
||||
icon_state = "38gut"
|
||||
ammo_type = /obj/item/ammo_casing/c38/gutterpunch
|
||||
|
||||
/obj/item/ammo_box/c9mm
|
||||
name = "ammo box (9mm)"
|
||||
icon_state = "9mmbox"
|
||||
|
||||
@@ -59,6 +59,17 @@
|
||||
var/mob/living/M = target
|
||||
M.adjust_bodytemperature(((100-blocked)/100)*(temperature - M.bodytemperature))
|
||||
|
||||
/obj/item/projectile/bullet/c38/gutterpunch //Vomit bullets my favorite
|
||||
name = ".38 Gutterpunch bullet"
|
||||
damage = 15
|
||||
stamina = 0
|
||||
|
||||
/obj/item/projectile/bullet/c38/gutterpunch/on_hit(atom/target, blocked = FALSE)
|
||||
. = ..()
|
||||
if(iscarbon(target))
|
||||
var/mob/living/carbon/M = target
|
||||
M.adjust_disgust(20)
|
||||
|
||||
// .357 (Syndie Revolver)
|
||||
|
||||
/obj/item/projectile/bullet/a357
|
||||
|
||||
@@ -38,6 +38,17 @@
|
||||
category = list("Ammo")
|
||||
departmental_flags = DEPARTMENTAL_FLAG_ARMORY
|
||||
|
||||
/datum/design/c38_gutterpunch
|
||||
name = "Speed Loader (.38 Gutterpunch)"
|
||||
desc = "A six-shot speed loader designed for .38 revolvers. \
|
||||
These rounds trade exhaustive properties for an emetic payload which induces nausea in targets."
|
||||
id = "c38_gutterpunch"
|
||||
build_type = PROTOLATHE
|
||||
materials = list(/datum/material/iron = 20000, /datum/material/plasma = 5000)
|
||||
build_path = /obj/item/ammo_box/c38/gutterpunch
|
||||
category = list("Ammo")
|
||||
departmental_flags = DEPARTMENTAL_FLAG_ARMORY
|
||||
|
||||
/datum/design/rubbershot/sec
|
||||
id = "sec_rshot"
|
||||
build_type = PROTOLATHE
|
||||
|
||||
@@ -787,7 +787,7 @@
|
||||
display_name = "Exotic Ammunition"
|
||||
description = "They won't know what hit em."
|
||||
prereq_ids = list("adv_weaponry")
|
||||
design_ids = list("techshotshell", "c38_hotshot", "c38_iceblox")
|
||||
design_ids = list("techshotshell", "c38_hotshot", "c38_iceblox", "c38_gutterpunch")
|
||||
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
|
||||
export_price = 5000
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
Reference in New Issue
Block a user