Skip to content

Commit

Permalink
resprites the commander (#3580)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
title

Was meant to be apart of another big manufacturer PR, however I do those
when i'm taking a break from big projects, so its a bit of a cycle. It
appears im in the latter half of the cycle (overmap 5 coming
december...), so might as well just PR what i have done

## Why It's Good For The Game


![image](https://github.com/user-attachments/assets/9d518d71-b8f1-487c-9070-06af2d7a6c63)

## Changelog

:cl:
add: Resprites the commander and Commissioner
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: rye-rice <58402542+rye-rice@users.noreply.github.com>
Co-authored-by: retlaw34 <58402542+retlaw34@users.noreply.github.com>
Co-authored-by: thgvr <81882910+thgvr@users.noreply.github.com>
  • Loading branch information
3 people authored Oct 17, 2024
1 parent 10f2c0b commit ebe4136
Show file tree
Hide file tree
Showing 11 changed files with 54 additions and 50 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/guns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
#define MANUFACTURER_EOEHOMA "the Eoehoma Firearms emblem"
#define MANUFACTURER_NANOTRASEN_OLD "an outdated Nanotrasen logo"
#define MANUFACTURER_NANOTRASEN "the Nanotrasen logo"
#define MANUFACTURER_VIGILITAS "the Vigilitas Interstellar logo"
#define MANUFACTURER_BRAZIL "a green flag with a blue circle and a yellow diamond around it"
#define MANUFACTURER_INTEQ "an orange crest with the letters 'IRMG'"
#define MANUFACTURER_MINUTEMAN "the Lanchester City Firearms Plant logo"
Expand Down
13 changes: 0 additions & 13 deletions code/modules/projectiles/boxes_magazines/external/pistol.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,6 @@
. = ..()
icon_state = "[base_icon_state]-[min(ammo_count(), 8)]"

/obj/item/ammo_box/magazine/co9mm
name = "commander pistol magazine (9mm)"
desc = "A 10-round double-stack magazine for Commander pistols. These rounds do okay damage, but struggle against armor."
icon_state = "commander_mag-10"
base_icon_state = "commander_mag"
ammo_type = /obj/item/ammo_casing/c9mm
caliber = "9mm"
max_ammo = 10
multiple_sprites = AMMO_BOX_PER_BULLET

/obj/item/ammo_box/magazine/co9mm/empty
start_empty = TRUE

/obj/item/ammo_box/magazine/pistol556mm
name = "Pistole C magazine (5.56mm HITP caseless)"
desc = "A 12-round, double-stack magazine for the Pistole C pistol. These rounds do okay damage with average performance against armor."
Expand Down
37 changes: 0 additions & 37 deletions code/modules/projectiles/guns/ballistic/pistol.dm
Original file line number Diff line number Diff line change
Expand Up @@ -98,43 +98,6 @@ EMPTY_GUN_HELPER(automatic/pistol/candor/factory)
icon_state = "deaglecamo"
item_state = "deagleg"

/obj/item/gun/ballistic/automatic/pistol/commander
name = "\improper Commander"
desc = "A classic handgun in a tasteful black and stainless steel color scheme. An enamel Nanotrasen logo is set into the grips. Chambered in 9mm."
icon_state = "commander"
icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'

w_class = WEIGHT_CLASS_NORMAL
mag_type = /obj/item/ammo_box/magazine/co9mm
manufacturer = MANUFACTURER_NANOTRASEN
fire_sound = 'sound/weapons/gun/pistol/rattlesnake.ogg'
load_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
load_empty_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
eject_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
eject_empty_sound = 'sound/weapons/gun/pistol/mag_release.ogg'

rack_sound = 'sound/weapons/gun/pistol/rack_small.ogg'
lock_back_sound = 'sound/weapons/gun/pistol/lock_small.ogg'
bolt_drop_sound = 'sound/weapons/gun/pistol/drop_small.ogg'

EMPTY_GUN_HELPER(automatic/pistol/commander)

/obj/item/gun/ballistic/automatic/pistol/commander/inteq
name = "\improper Commissioner"
desc = "A handgun seized from Nanotrasen armories by deserting troopers and modified to IRMG's standards. A yellow IRMG shield is set into the grips. Chambered in 9mm."
icon = 'icons/obj/guns/manufacturer/inteq/48x32.dmi'
lefthand_file = 'icons/obj/guns/manufacturer/inteq/lefthand.dmi'
righthand_file = 'icons/obj/guns/manufacturer/inteq/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/inteq/onmob.dmi'
icon_state = "commander-inteq"
item_state = "commander-inteq"
manufacturer = MANUFACTURER_INTEQ

EMPTY_GUN_HELPER(automatic/pistol/commander/inteq)

/obj/item/gun/ballistic/automatic/pistol/commissar
name = "\improper Commissar"
desc = "A Nanotrasen-issue handgun, modified with a voice box to further enhance its effectiveness in troop discipline."
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/obj/item/gun/ballistic/automatic/pistol/commander
name = "VI Commander"
desc = "A service pistol produced as Vigilitas Interstellar's standard sidearm. Has a reputation for being easy to use, due to its light recoil and high magazine capacity. Chambered in 9mm."
icon_state = "commander"
item_state = "nt_generic"
icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'

w_class = WEIGHT_CLASS_NORMAL
mag_type = /obj/item/ammo_box/magazine/co9mm
manufacturer = MANUFACTURER_VIGILITAS
fire_sound = 'sound/weapons/gun/pistol/rattlesnake.ogg'
load_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
load_empty_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
eject_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
eject_empty_sound = 'sound/weapons/gun/pistol/mag_release.ogg'

rack_sound = 'sound/weapons/gun/pistol/rack_small.ogg'
lock_back_sound = 'sound/weapons/gun/pistol/lock_small.ogg'
bolt_drop_sound = 'sound/weapons/gun/pistol/drop_small.ogg'

EMPTY_GUN_HELPER(automatic/pistol/commander)

/obj/item/ammo_box/magazine/co9mm
name = "commander pistol magazine (9mm)"
desc = "A 10-round double-stack magazine for Commander pistols. These rounds do okay damage, but struggle against armor."
icon_state = "commander_mag-10"
base_icon_state = "commander_mag"
ammo_type = /obj/item/ammo_casing/c9mm
caliber = "9mm"
max_ammo = 10
multiple_sprites = AMMO_BOX_PER_BULLET

/obj/item/ammo_box/magazine/co9mm/empty
start_empty = TRUE


/obj/item/gun/ballistic/automatic/pistol/commander/inteq
name = "PS-03 Commissioner"
desc = "A modified version of the VI Commander, issued as standard to Inteq Risk Management Group personnel. Features the same excellent handling and high magazine capacity as the original. Chambered in 9mm."

icon = 'icons/obj/guns/manufacturer/inteq/48x32.dmi'
lefthand_file = 'icons/obj/guns/manufacturer/inteq/lefthand.dmi'
righthand_file = 'icons/obj/guns/manufacturer/inteq/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/inteq/onmob.dmi'
icon_state = "commander_inteq"
item_state = "inteq_generic"
manufacturer = MANUFACTURER_INTEQ

EMPTY_GUN_HELPER(automatic/pistol/commander/inteq)
Binary file modified icons/obj/guns/manufacturer/inteq/48x32.dmi
Binary file not shown.
Binary file modified icons/obj/guns/manufacturer/inteq/lefthand.dmi
Binary file not shown.
Binary file modified icons/obj/guns/manufacturer/inteq/righthand.dmi
Binary file not shown.
Binary file modified icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi
Binary file not shown.
Binary file modified icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi
Binary file not shown.
Binary file modified icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions shiptest.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3065,6 +3065,7 @@
#include "code\modules\projectiles\guns\manufacturer\clip_lanchester\lasers.dm"
#include "code\modules\projectiles\guns\manufacturer\etherbor\energy_gunsword.dm"
#include "code\modules\projectiles\guns\manufacturer\frontier_import\ballistics.dm"
#include "code\modules\projectiles\guns\manufacturer\nanotrasen_sharplite\ballistics.dm"
#include "code\modules\projectiles\guns\manufacturer\scarborough\ballistics.dm"
#include "code\modules\projectiles\guns\misc\beam_rifle.dm"
#include "code\modules\projectiles\guns\misc\blastcannon.dm"
Expand Down

0 comments on commit ebe4136

Please sign in to comment.