mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-14 09:28:26 +01:00
reorganizing
This commit is contained in:
@@ -47,4 +47,4 @@
|
||||
name = ".38 Iceblox bullet casing"
|
||||
desc = "A .38 Iceblox bullet casing."
|
||||
caliber = "38"
|
||||
projectile_type = /obj/item/projectile/bullet/c38/iceblox
|
||||
projectile_type = /obj/item/projectile/bullet/c38/iceblox
|
||||
|
||||
@@ -90,4 +90,4 @@
|
||||
/obj/item/ammo_box/foambox/riot
|
||||
icon_state = "foambox_riot"
|
||||
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
|
||||
materials = list(MAT_METAL = 50000)
|
||||
materials = list(MAT_METAL = 50000)
|
||||
|
||||
@@ -13,12 +13,11 @@
|
||||
// .38 (Detective's Gun)
|
||||
|
||||
/obj/item/projectile/bullet/c38
|
||||
name = ".38 rubber bullet"
|
||||
name = ".38 bullet"
|
||||
damage = 25
|
||||
stamina = 48
|
||||
|
||||
/obj/item/projectile/bullet/c38/rubber
|
||||
name = ".38 bullet"
|
||||
name = ".38 rubber bullet"
|
||||
damage = 15
|
||||
stamina = 48
|
||||
|
||||
@@ -59,6 +58,7 @@
|
||||
var/mob/living/M = target
|
||||
M.adjust_bodytemperature(((100-blocked)/100)*(temperature - M.bodytemperature))
|
||||
|
||||
|
||||
// .357 (Syndie Revolver)
|
||||
|
||||
/obj/item/projectile/bullet/a357
|
||||
@@ -68,4 +68,4 @@
|
||||
/obj/item/projectile/bullet/a357/ap
|
||||
name = ".357 armor-piercing bullet"
|
||||
damage = 45
|
||||
armour_penetration = 45
|
||||
armour_penetration = 45
|
||||
|
||||
Reference in New Issue
Block a user