Code

New munitions descriptions#34284

Code

Open

Nox38 wants to merge 57 commits intospace-wizards:masterspace-wizards/space-station-14:masterfrom Nox38:munitions-descriptionsNox38/space-station-14:munitions-descriptionsCopy head branch name to clipboard

+455-275

Commits

Commits on Nov 18, 2024

• added mail, moved some things around, and fixed a lot of APCs

  Nox38

  committed
  03f63cb

  Copy full SHA for 03f63cb

Commits on Nov 23, 2024

• Merge branch 'master' of https://github.com/space-wizards/space-station-14

  Nox38

  committed
  3be1bc4

  Copy full SHA for 3be1bc4

• fixed my mistakes

  Nox38

  committed
  a92532f

  Copy full SHA for a92532f

Commits on Jan 4, 2025

• Merge branch 'master' of https://github.com/space-wizards/space-station-14

  Nox38

  committed
  59a72fb

  Copy full SHA for 59a72fb

Commits on Jan 5, 2025

• First commit, updated boxes, cartridges, and magazines for .20, .30, and .60 ammo.

  Nox38

  committed
  795e1c6

  Copy full SHA for 795e1c6

Commits on Jan 6, 2025

• New ammo type for Drozd and Mosin

  Nox38

  committed
  9f09797

  Copy full SHA for 9f09797

• why was meta gone AGAIN?

  Nox38

  committed
  67896f2

  Copy full SHA for 67896f2

• this was gone too

  Nox38

  committed
  cc628d3

  Copy full SHA for cc628d3

Commits on Jan 7, 2025

• initial commit

  Nox38

  committed
  981aadb

  Copy full SHA for 981aadb

Commits on Jan 8, 2025

• Removed the 0 before some of the calibers and added the gun descriptions.

  Nox38

  committed
  7f8912f

  Copy full SHA for 7f8912f

• LOL I misspelled description

  Nox38

  committed
  9ee4b6a

  Copy full SHA for 9ee4b6a

• remove edit to salvage maps

  Nox38

  authored
  2b596fc

  Copy full SHA for 2b596fc

• renamed shotgun caliber to .72 and fixed the Mosin speedloader

  Nox38

  committed
  f42f499

  Copy full SHA for f42f499

• t Merge branch 'munitions-descriptions' of https://github.com/Nox38/space-station-14 into munitions-descriptions

  Nox38

  committed
  3a4cfaa

  Copy full SHA for 3a4cfaa

• changed shotgun descriptions

  Nox38

  committed
  940be2e

  Copy full SHA for 940be2e

• Changed shotgun shells to 12 gauge from .72

  Nox38

  committed
  3e3024c

  Copy full SHA for 3e3024c

• deleted all mentions of .72x3 due to peer pressure

  Nox38

  committed
  869ec56

  Copy full SHA for 869ec56

• quick fix this before they realise I suck at using CTRL+F

  Nox38

  committed
  16dd7cd

  Copy full SHA for 16dd7cd

• Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/heavy_rifle.yml

  Show description for 3bf3499
  

  Nox38

  and

  ArtisticRoomba

  authored
  3bf3499

  Copy full SHA for 3bf3499

• Update heavy_rifle.yml

  Nox38

  authored
  65f74c6

  Copy full SHA for 65f74c6

• Update magnum.yml

  Nox38

  authored
  d47f37a

  Copy full SHA for d47f37a

• Update shotgun.yml

  Nox38

  authored
  f0ae572

  Copy full SHA for f0ae572

• Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml

  Show description for eb006fa
  

  Nox38

  and

  ArtisticRoomba

  authored
  eb006fa

  Copy full SHA for eb006fa

• Put the prototypes back where I found them.

  Nox38

  committed
  d3685ac

  Copy full SHA for d3685ac

• get this shit out of here

  Nox38

  committed
  d1490c8

  Copy full SHA for d1490c8

• minor spelling mistake

  Nox38

  committed
  3af7309

  Copy full SHA for 3af7309

Commits on Jan 9, 2025

• Update Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml

  Show description for ff79026
  

  Nox38

  and

  ArtisticRoomba

  authored
  ff79026

  Copy full SHA for ff79026

• Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml

  Show description for 4d7ba14
  

  Nox38

  and

  ArtisticRoomba

  authored
  4d7ba14

  Copy full SHA for 4d7ba14

• Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml

  Show description for c399d83
  

  Nox38

  and

  ArtisticRoomba

  authored
  c399d83

  Copy full SHA for c399d83

• Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml

  Show description for 62d5d1a
  

  Nox38

  and

  ArtisticRoomba

  authored
  62d5d1a

  Copy full SHA for 62d5d1a

• Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml

  Show description for a106f7f
  

  Nox38

  and

  ArtisticRoomba

  authored
  a106f7f

  Copy full SHA for a106f7f

• Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml

  Show description for f4cfc57
  

  Nox38

  and

  ArtisticRoomba

  authored
  f4cfc57

  Copy full SHA for f4cfc57

• Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml

  Show description for 52be19b
  

  Nox38

  and

  ArtisticRoomba

  authored
  52be19b

  Copy full SHA for 52be19b

• Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml

  Show description for ccd303c
  

  Nox38

  and

  ArtisticRoomba

  authored
  ccd303c

  Copy full SHA for ccd303c

• Slightly changed descriptions of light_rifle (.308)

  Nox38

  committed
  49f2681

  Copy full SHA for 49f2681

• Added Mosin speedloader and ammo box to emagged lathe.

  Nox38

  committed
  1022b20

  Copy full SHA for 1022b20

Commits on Jan 15, 2025

• Integrated Roomba's suggestions

  Nox38

  committed
  94935a4

  Copy full SHA for 94935a4

Commits on Jan 17, 2025

• Fixed one more instance of "rubber tipped"

  Nox38

  committed
  d611fbd

  Copy full SHA for d611fbd

Commits on Jan 21, 2025

• Merge branch 'master' into munitions-descriptions

  Nox38

  authored
  a230c93

  Copy full SHA for a230c93

• Renamed laser rifle back to laser carbine, renamed shrapnel to fragmentation grenade, renamed explosive to HE grenade.

  Nox38

  committed
  c01f2c6

  Copy full SHA for c01f2c6

• Merge remote-tracking branch 'origin/munitions-descriptions' into munitions-descriptions

  Nox38

  committed
  52a22a8

  Copy full SHA for 52a22a8

Commits on Jan 24, 2025

• Merge remote-tracking branch 'origin/master' into munitions-descriptions

  Nox38

  committed
  7f32a9a

  Copy full SHA for 7f32a9a

• Merge branch 'master' into munitions-descriptions

  Nox38

  authored
  a492846

  Copy full SHA for a492846

Commits on Jan 31, 2025

• Merge branch 'master' into munitions-descriptions

  Nox38

  authored
  ae67d5c

  Copy full SHA for ae67d5c

• fixed merge conflicts?

  Nox38

  committed
  d5261f4

  Copy full SHA for d5261f4

• Fixed a few more things

  Nox38

  committed
  21e6e8d

  Copy full SHA for 21e6e8d

• missed a spot

  Nox38

  committed
  bb119c9

  Copy full SHA for bb119c9

• fixed another mistake (I hate github's merge conflict system)

  Nox38

  committed
  656efce

  Copy full SHA for 656efce

Commits on Feb 2, 2025

• Fixed an issue in the shotgun descriptions, added descriptions for grenade magazines, renamed the mosin round from .325 to 7.62x54mm.

  Nox38

  committed
  2f3d4fd

  Copy full SHA for 2f3d4fd

• Shortened '7.62x54mm' to '7.62mm'

  Nox38

  committed
  36a63d9

  Copy full SHA for 36a63d9

• Minor spelling mistake

  Nox38

  committed
  e846c05

  Copy full SHA for e846c05

• Renamed the script to match the rest of the mosin scripts

  Nox38

  committed
  4a87579

  Copy full SHA for 4a87579

Commits on Feb 4, 2025

• Merge remote-tracking branch 'origin/master' into munitions-descriptions

  Show description for c9522c9
  Nox38

  committed
  c9522c9

  Copy full SHA for c9522c9

• Fixed new merge conflicts, updated gun descriptions, reverted mosin caliber to .325

  Nox38

  committed
  a13544c

  Copy full SHA for a13544c

• obligatory missing line

  Nox38

  committed
  bd44f91

  Copy full SHA for bd44f91

Commits on Feb 5, 2025

• Merge remote-tracking branch 'origin/master' into munitions-descriptions

  Show description for f69a70a
  Nox38

  committed
  f69a70a

  Copy full SHA for f69a70a

Commits on Feb 6, 2025

• Renamed boxes of ammo to match new calibers

  Nox38

  committed
  76cfc6a

  Copy full SHA for 76cfc6a