Commit Graph

6 Commits

Author SHA1 Message Date
SkyratBot
9e07263fdf [MIRROR] Improves crafting code a tiny bit (#3477)
* Improves crafting code a tiny bit (#56937)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Improves crafting code a tiny bit

* a

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-18 20:59:11 +00:00
SkyratBot
699cd1e412 [MIRROR] renames metal sheets to iron sheets (#3116)
* renames metal sheets to iron sheets

* Merge branch 'master' into upstream-merge-56643

* yay metal

* Update DeltaStation2_skyrat.dmm

* a

* Update CentCom_skyrat_z2.dmm

* a

* a

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 22:09:50 +00:00
SkyratBot
f18f2ad02f [MIRROR] Pipeguns: Elitism Edition (#3054)
* Pipeguns: Elitism Edition

* fixes

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-04 16:25:10 +00:00
Azarak
3dac001a95 Weapon changes for blueshield (#1799)
* aaa

* aa
2020-11-24 11:07:23 +00:00
KathrinBailey
62e4ddbf64 CFA Wildcat fixes & 7.62 bullets to the autolathe! (#1800)
* Adds new gunss.

All but the improvised weapons are adminspawn only atm. You also can craft

* Updates the pistol descriptions.

I forgot to change it before doing the first commit.

* modularised this and oh my gosh I'm gonna die

* linters doesn't like no newline

* Fixes desc, gold revolver rifle fires .45 not 10mm

* 32 smg magazine fixes

Fixes missing icons.
Adds 7.62 into autolathe. This was an oversight.
2020-11-24 08:34:36 +00:00
KathrinBailey
35201d615e Weapons Update: Part 1 Guns n' Improvised Guns. (#248)
* Adds new gunss.

All but the improvised weapons are adminspawn only atm. You also can craft

* Updates the pistol descriptions.

I forgot to change it before doing the first commit.

* modularised this and oh my gosh I'm gonna die

* linters doesn't like no newline

* Fixes desc, gold revolver rifle fires .45 not 10mm

Co-authored-by: Gandalf <jzo123@hotmail.com>
2020-09-20 20:13:14 +01:00