cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
kevinz000
2019-10-24 15:31:45 -07:00
parent f96e1bbe33
commit 31f9ed9665
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/projectiles/guns/ballistic.dm
View File

@@ -26,7 +26,6 @@
else else
icon_state = "[initial(icon_state)][suppressed ? "-suppressed" : ""][sawn_off ? "-sawn" : ""]" icon_state = "[initial(icon_state)][suppressed ? "-suppressed" : ""][sawn_off ? "-sawn" : ""]"
/obj/item/gun/ballistic/process_chamber(empty_chamber = 1) /obj/item/gun/ballistic/process_chamber(empty_chamber = 1)
var/obj/item/ammo_casing/AC = chambered //Find chambered round var/obj/item/ammo_casing/AC = chambered //Find chambered round
if(istype(AC)) //there's a chambered round if(istype(AC)) //there's a chambered round

18
code/modules/projectiles/guns/ballistic/automatic.dm
View File

@@ -2,6 +2,7 @@
w_class = WEIGHT_CLASS_NORMAL w_class = WEIGHT_CLASS_NORMAL
var/alarmed = 0 var/alarmed = 0
var/select = 1 var/select = 1
var/automatic_burst_overlay = TRUE
can_suppress = TRUE can_suppress = TRUE
burst_size = 3 burst_size = 3
fire_delay = 2 fire_delay = 2
@@ -19,10 +20,11 @@
/obj/item/gun/ballistic/automatic/update_icon() /obj/item/gun/ballistic/automatic/update_icon()
..() ..()
if(!select) if(automatic_burst_overlay)
add_overlay("[initial(icon_state)]semi") if(!select)
if(select == 1) add_overlay("[initial(icon_state)]semi")
add_overlay("[initial(icon_state)]burst") if(select == 1)
add_overlay("[initial(icon_state)]burst")
icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]" icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
/obj/item/gun/ballistic/automatic/attackby(obj/item/A, mob/user, params) /obj/item/gun/ballistic/automatic/attackby(obj/item/A, mob/user, params)
@@ -112,7 +114,6 @@
/obj/item/gun/ballistic/automatic/c20r/afterattack() /obj/item/gun/ballistic/automatic/c20r/afterattack()
. = ..() . = ..()
empty_alarm() empty_alarm()
return
/obj/item/gun/ballistic/automatic/c20r/update_icon() /obj/item/gun/ballistic/automatic/c20r/update_icon()
..() ..()
@@ -124,16 +125,17 @@
icon_state = "wt550" icon_state = "wt550"
item_state = "arg" item_state = "arg"
mag_type = /obj/item/ammo_box/magazine/wt550m9 mag_type = /obj/item/ammo_box/magazine/wt550m9
fire_delay = 4
can_suppress = FALSE can_suppress = FALSE
burst_size = 2 burst_size = 2
fire_delay = 1
can_bayonet = TRUE can_bayonet = TRUE
knife_x_offset = 25 knife_x_offset = 25
knife_y_offset = 12 knife_y_offset = 12
automatic_burst_overlay = FALSE
/obj/item/gun/ballistic/automatic/wt550/enable_burst() /obj/item/gun/ballistic/automatic/wt550/enable_burst()
. = ..() . = ..()
spread = 5 spread = 15
/obj/item/gun/ballistic/automatic/wt550/disable_burst() /obj/item/gun/ballistic/automatic/wt550/disable_burst()
. = ..() . = ..()
@@ -141,7 +143,7 @@
/obj/item/gun/ballistic/automatic/wt550/update_icon() /obj/item/gun/ballistic/automatic/wt550/update_icon()
..() ..()
icon_state = "wt550[magazine ? "-[CEILING(get_ammo(0)/4, 1)*4]" : ""]" icon_state = "wt550[magazine ? "-[CEILING(( (get_ammo(FALSE) / magazine.max_ammo) * 20) /4, 1)*4]" : "-0"]" //Sprites only support up to 20.
/obj/item/gun/ballistic/automatic/mini_uzi /obj/item/gun/ballistic/automatic/mini_uzi
name = "\improper Type U3 Uzi" name = "\improper Type U3 Uzi"

BIN
icons/obj/guns/energy.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 38 KiB

9
modular_citadel/code/modules/projectiles/guns/ballistic/magweapon.dm
View File

@@ -111,6 +111,7 @@
casing_ejector = FALSE casing_ejector = FALSE
fire_delay = 2 fire_delay = 2
recoil = 0.1 recoil = 0.1
inaccuracy_modifier = 0.25
/obj/item/gun/ballistic/automatic/pistol/mag/update_icon() /obj/item/gun/ballistic/automatic/pistol/mag/update_icon()
..() ..()
@@ -225,7 +226,7 @@
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi' icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "mag-casing-live" icon_state = "mag-casing-live"
projectile_type = /obj/item/projectile/bullet/magrifle projectile_type = /obj/item/projectile/bullet/magrifle
click_cooldown_override = 3 click_cooldown_override = 2.5
delay = 3 delay = 3
/obj/item/ammo_casing/caseless/anlmagm /obj/item/ammo_casing/caseless/anlmagm
@@ -234,12 +235,12 @@
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi' icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "mag-casing-live" icon_state = "mag-casing-live"
projectile_type = /obj/item/projectile/bullet/nlmagrifle projectile_type = /obj/item/projectile/bullet/nlmagrifle
click_cooldown_override = 3 click_cooldown_override = 2.5
delay = 3 delay = 3
///magazines/// ///magazines///
/obj/item/ammo_box/magazine/mmag/ /obj/item/ammo_box/magazine/mmag
name = "magrifle magazine (non-lethal disabler)" name = "magrifle magazine (non-lethal disabler)"
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi' icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "mediummagmag" icon_state = "mediummagmag"
@@ -268,10 +269,12 @@
fire_sound = 'sound/weapons/magrifle.ogg' fire_sound = 'sound/weapons/magrifle.ogg'
can_suppress = 0 can_suppress = 0
burst_size = 1 burst_size = 1
actions_types = null
fire_delay = 3 fire_delay = 3
spread = 0 spread = 0
recoil = 0.1 recoil = 0.1
casing_ejector = FALSE casing_ejector = FALSE
inaccuracy_modifier = 0.5
weapon_weight = WEAPON_MEDIUM weapon_weight = WEAPON_MEDIUM
dualwield_spread_mult = 1.4 dualwield_spread_mult = 1.4