Files
GS13NG/code/__DEFINES
KathrinBailey ff51c9d2db Improvised Weapons Update: Part 1 (#12226)
* Improvised Weapons Part 1: Shotgun & Rifle

Adds new sprites for ammo, the improvised rifle, the improvised shotgun. Adds a hand saw. Adds things to the crafting menu. Adds things to the autolathe menu.

* PR not yet ready - just cleaning issues.

Just trying to remark some of the issues resolved so I can see where I'm at a bit easier.

* Reverting changes to shotgun ammo names in the autolathe.

No point calling it 12G when there's no 20G anymore.

* Weapon weight + sprite improvements.

Makes sprites for gun parts bulkier with a low alpha pixel outline to make them easier to click on. They also look a bit closer to what their final product will be.

* oops forgot the "

* Revert "Merge branch 'master' into Improvised-Part-1"

This reverts commit 1e43d228d1bc35b0582244ed0bd91934573b3cdd, reversing
changes made to 207e9fccd4e8cffbe9ed26401a6f516fc44245dd.

* Revert "Revert "Merge branch 'master' into Improvised-Part-1""

This reverts commit 22d421d010c4a4c5c5e26f49fe6bffcf6198df42.

* My Github or environment isn't flipping out. no more.

Derp. Also projectile damage modifier fixed. I can actually compile without hundreds of errors.

* Made small weapon parts have w_class small.

I was testing it out and seeing the trigger assembly take so much space in my inventory seemed really odd.

* Duplicate definition refused.

Hurrdurr I suck.
Glad I gave this a quick look-voer.
Shotgun description edited to reflect the 0.8x damage modifier.

* Resolved tools.dmi merge conflict.

Just took the dmi from master and put the new sprites on at the end.

* DNM - Trying to see why usptream tools.dmi with my stuff added on the end is conflicting.

* Please don't conflict
2020-05-28 23:24:42 -07:00
..
2020-05-20 23:40:20 +02:00
2020-04-17 11:57:18 -07:00
2020-05-06 17:50:50 +02:00
2020-04-22 10:54:42 -07:00
2020-05-20 23:40:20 +02:00
2020-05-09 11:23:38 -07:00
2020-05-08 02:24:49 +02:00
2020-05-27 18:00:32 -07:00
.
2020-04-14 19:18:08 +02:00
WIP
2020-03-30 05:29:39 +02:00
2020-04-06 08:49:19 -07:00
2020-04-17 07:48:11 +02:00
2020-05-27 18:00:32 -07:00
2020-04-10 15:36:42 +02:00
2020-02-20 23:12:28 -06:00
2020-03-28 23:50:06 -07:00
2020-05-16 05:00:26 +02:00
kay
2020-05-08 22:59:51 -07:00
2020-05-08 03:36:08 +02:00
2020-04-23 15:15:26 +02:00
2020-02-07 10:59:43 +02:00
2020-04-17 07:48:11 +02:00
2020-05-12 07:38:52 -07:00
2020-05-20 23:14:36 -07:00
ok
2020-05-08 04:32:57 -07:00
2020-05-20 18:45:36 -07:00