Skip to content

Commit

Permalink
minor fixes
Browse files Browse the repository at this point in the history
operation falcon: russian tankers get a hip holster
Japanese tank: Chi-ha turret is resprited and actually has weapons now. New type97 MG subtype and mags made specifically for tanks. Updated maps to reflect japanese tanks.

C6 and M249 are no longer useless in accuracy (its still really bad for what a small burst from an MG ought to be)
  • Loading branch information
KanohaShinobi committed May 13, 2024
1 parent 7417559 commit 893ac35
Show file tree
Hide file tree
Showing 16 changed files with 76 additions and 57 deletions.
2 changes: 1 addition & 1 deletion civ13.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1157,5 +1157,5 @@
#include "code\processes\lighting\sources.dm"
#include "interface\interface.dm"
#include "interface\skin.dmf"
#include "maps\campaign\campaign1.dmm"
#include "maps\1943\marco_polo_bridge.dmm"
// END_INCLUDE
1 change: 1 addition & 0 deletions civ13.dmm-pal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[Palette]
17 changes: 14 additions & 3 deletions code/modules/1713/_mags1939.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,18 @@
mag_type = MAGAZINE
caliber = "a77x58"
ammo_type = /obj/item/ammo_casing/a77x58
max_ammo = 32
max_ammo = 30
weight = 0.40
multiple_sprites = TRUE

/obj/item/ammo_magazine/type99/type97
name = "Type-97 Magazine"
icon_state = "type97"
attached_icon_state = "type99_mag"
mag_type = MAGAZINE
caliber = "a77x58"
ammo_type = /obj/item/ammo_casing/a77x58
max_ammo = 20
weight = 0.40
multiple_sprites = TRUE

Expand All @@ -63,7 +74,7 @@
mag_type = MAGAZINE
caliber = "a65x50"
ammo_type = /obj/item/ammo_casing/a65x50
max_ammo = 32
max_ammo = 30
weight = 0.40
multiple_sprites = TRUE

Expand Down Expand Up @@ -372,7 +383,7 @@
stored_ammo.Cut()

/obj/item/ammo_magazine/makarov
name = "PM Makarov magazine (9x18mm)"
name = "PM Makarov magazine (9x18mm)"
icon_state = "m1911" //Temporary until someones sprites a magazine for it, don't change it to an ammo box though!
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/a9x18
Expand Down
4 changes: 3 additions & 1 deletion code/modules/1713/jobs/russian.dm
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@
H.setStat("pistol", STAT_HIGH)
H.setStat("bows", STAT_NORMAL)
H.setStat("medical", STAT_MEDIUM_LOW)

return TRUE

/datum/job/russian/sniper_soviet
Expand Down Expand Up @@ -2725,6 +2725,8 @@
H.equip_to_slot_or_del(new /obj/item/weapon/compass/modern/tacmap(H), slot_belt)

H.equip_to_slot_or_del(new /obj/item/weapon/radio/walkietalkie/faction2(H), slot_wear_id)
var/obj/item/clothing/accessory/holster/hip/holsterh = new /obj/item/clothing/accessory/holster/hip(null)
uniform.attackby(holsterh, H)
H.setStat("strength", STAT_NORMAL)
H.setStat("crafting", STAT_NORMAL)
H.setStat("rifle", STAT_NORMAL)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/1713/siege/cannon_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@
caliber = 90

/obj/structure/cannon/modern/tank/japanese57
name = "Type 90 Cannon"
name = "Type 97 Cannon"
desc = "A 57mm Japanese tank-based cannon."
icon_state = "tank_cannon"
maxrange = 25
Expand Down
9 changes: 6 additions & 3 deletions code/modules/1713/siege/turret.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1239,9 +1239,9 @@
..()

/obj/structure/turret/chiha
turret_color = "#787859"
turret_color = "#6a5a3d"
turret_icon = "jap_turret"
name = "Chi-Ha"
name = "Type 97 Chi-Ha"

turret_x = 0
turret_y = -8
Expand All @@ -1258,4 +1258,7 @@
gunner_seat = new /obj/structure/bed/chair/gunner(src.loc)
gunner_seat.setup(src)
commander_seat = new /obj/structure/bed/chair/commander(src.loc)
commander_seat.setup(src)
commander_seat.setup(src)
weapons.Add(new/obj/structure/cannon/modern/tank/japanese57(src))
weapons.Add(new/obj/item/weapon/gun/projectile/automatic/type99/type97tank(src))
..()
21 changes: 15 additions & 6 deletions code/modules/1713/weapons/guns/mg/lmg.dm
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
base_icon = "type99lmg"
caliber = "a77x58"
magazine_type = /obj/item/ammo_magazine/type99
good_mags = list(/obj/item/ammo_magazine/type99, /obj/item/ammo_magazine/type92)
good_mags = list(/obj/item/ammo_magazine/type99)
weight = 9.12
force = 20
throwforce = 30
Expand All @@ -114,6 +114,12 @@
has_telescopic = TRUE
slot_flags = SLOT_SHOULDER

/obj/item/weapon/gun/projectile/automatic/type99/type97tank
name = "Type 97 tank machinegun"
desc = "The Type 97 tank machine Gun, is a Japanese machine gun based on the ZB26 designed specifically for tank use."
magazine_type = /obj/item/ammo_magazine/type99/type97
good_mags = list(/obj/item/ammo_magazine/type99/type97)

/obj/item/weapon/gun/projectile/automatic/type96
name = "Type 96 light machinegun"
desc = "The Type 96 light machine Gun, is a Japanese light machine gun chambered in 6.50x50mm rounds."
Expand Down Expand Up @@ -349,10 +355,10 @@
nothrow = TRUE
throwforce = 30
equiptimer = 25
load_delay = 50
load_delay = 10
slowdown = 1
recoil = 30
accuracy = 2
accuracy = 1
scope_mounts = list ("picatinny")
scope_y_offset = -1

Expand Down Expand Up @@ -795,7 +801,7 @@

////////////////////////C6 GPMG/////////////////////////////

/obj/item/weapon/gun/projectile/automatic/c6
/obj/item/weapon/gun/projectile/automatic/manual/c6
name = "C6 GPMG"
desc = "A Canadian License Produced FN MAG called the C6 GPMG, the main squad support weapon of the CAF."
icon_state = "c6"
Expand All @@ -817,12 +823,15 @@
force = 20
throwforce = 30
recoil = 40
accuracy = 3
accuracy = 1
scope_mounts = list ("picatinny")
mag_x_offset = -4
mag_y_offset = -2
equiptimer = 25
load_delay = 10
slowdown = 1

/obj/item/weapon/gun/projectile/automatic/c6/update_icon()
/obj/item/weapon/gun/projectile/automatic/manual/c6/update_icon()
..()
if (!ammo_magazine || !istype(ammo_magazine, /obj/item/ammo_magazine/c6belt))
return
Expand Down
Binary file modified icons/mob/items/lefthand_guns.dmi
Binary file not shown.
Binary file modified icons/mob/items/righthand_guns.dmi
Binary file not shown.
Binary file modified icons/obj/ammo.dmi
Binary file not shown.
Binary file modified icons/obj/guns/mgs.dmi
Binary file not shown.
Binary file modified icons/obj/vehicles/vehicles256x256.dmi
Binary file not shown.
Binary file modified icons/obj/vehicles/vehicles96x96.dmi
Binary file not shown.
Loading

0 comments on commit 893ac35

Please sign in to comment.