cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

this is a terrible idea (#16722)

Browse Source
This commit is contained in:
Skrem_7
2022-12-02 06:42:52 -06:00
committed by GitHub
parent a52ad3f6ea
commit 931ebff236
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/projectiles/boxes_magazines/ammo_boxes.dm
View File

@@ -53,21 +53,21 @@
/obj/item/ammo_box/c38/hotshot
name = "speed loader (.38 Hot Shot)"
desc = "A six-shot speed loader designed for .38 revolvers. \
These rounds trade exhaustive properties for an incendiary payload which sets targets ablaze."
These rounds trade some damage for an incendiary payload which sets targets ablaze."
icon_state = "38hot"
ammo_type = /obj/item/ammo_casing/c38/hotshot
/obj/item/ammo_box/c38/iceblox
name = "speed loader (.38 Iceblox)"
desc = "A six-shot speed loader designed for .38 revolvers. \
These rounds trade exhaustive properties for a cryogenic payload which significantly reduces the body temperature of targets hit."
These rounds trade some damage for a cryogenic payload which significantly reduces the body temperature of targets hit."
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."
These rounds trade some damage for an emetic payload which induces nausea in targets."
icon_state = "38gut"
ammo_type = /obj/item/ammo_casing/c38/gutterpunch

16
code/modules/projectiles/projectile/bullets/revolver.dm
View File

@@ -14,16 +14,14 @@
/obj/item/projectile/bullet/c38
name = ".38 bullet"
damage = 15 // yogs - Nerfed revolver damage
//knockdown = 60 //yogs - commented out
stamina = 35 // yogs
wound_bonus = -20
damage = 25 //High damaging but...
armour_penetration = -40 //Almost doubles the armor of any bullet armor it hits
wound_bonus = -10
bare_wound_bonus = 10
/obj/item/projectile/bullet/c38/hotshot //similar to incendiary bullets, but do not leave a flaming trail
name = ".38 Hot Shot bullet"
damage = 15
stamina = 0
damage = 20
/obj/item/projectile/bullet/c38/hotshot/on_hit(atom/target, blocked = FALSE)
if((blocked != 100) && iscarbon(target))
@@ -34,8 +32,7 @@
/obj/item/projectile/bullet/c38/iceblox //see /obj/item/projectile/temp for the original code
name = ".38 Iceblox bullet"
damage = 15
stamina = 0
damage = 20
var/temperature = 100
/obj/item/projectile/bullet/c38/iceblox/on_hit(atom/target, blocked = FALSE)
@@ -46,8 +43,7 @@
/obj/item/projectile/bullet/c38/gutterpunch //Vomit bullets my favorite
name = ".38 Gutterpunch bullet"
damage = 15
stamina = 0
damage = 20
/obj/item/projectile/bullet/c38/gutterpunch/on_hit(atom/target, blocked = FALSE)
if((blocked != 100) && iscarbon(target))