Commit Graph
89 Commits
Author SHA1 Message Date
Trilby 3307711f08 suppression 2020-10-28 13:00:02 -04:00
Hatterhat c063004d60 blued, but dark 2020-10-06 14:50:58 -05:00
Hatterhat 5a517be5e7 thanks toriate 2020-10-06 12:47:00 -05:00
Hatterhat dbdec5bbae man i am really indecisive 2020-10-06 11:39:19 -05:00
Hatterhat 2e7101fdc5 funny revolver sprites - squashed 2020-10-05 22:56:52 -05:00
Ghommie fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
Hatterhat 6a5e26eb1c unatomic as shit 2020-08-01 12:31:13 -05:00
timothyteakettle 74b2764591 sprites and some missed things 2020-07-18 03:08:03 +01:00
KathrinBaileyandGitHub 862ed61b86 [Ready] Improvised Weapons Update: Part 2 (#12386)
* 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

* All of the stuff.

Fixes missing saw icons.
Improvised pistol, laser.
New weapon parts.
Part loot tables.
Ammo loot tables.
32acp ammo type + box.
Crafting changes.

* Fixing Travis errors + Pistol requires 1 plastic sheet

* Conflcits step 1 DNM

Do not merge do not merge do not merge

* Merge conflicts part 2 give mergies 🔪

fixes merge conflicts.
I like to upload a no changes file first then put stuff back on because it helps me find out what's having a fit.

* Plastic cost upped to 15 from 1 on pistol. You also need 1 plasteel.

3 plasteel total needed

* Made shotgun 2h because it's the only way to fix the issues this thing has.

Also the damage has been increased from 0.8* to 0.9* raising slugs from three shots to softcrit to two since it's now two-handed.

* mistake fixed

* Sprite updates!

New sprites for the old guns! <3

* Cleaned up guncrafting.dm

Made the descriptions more generic in case people add new weapons using these parts.

* Made more appropriate weight classes.

A lens shouldn't be weight class medium nor should the pistol grip.
Lens made tiny, grip made small.

* Adds rifle sling and updates backpack slot slung gun sprites.

Also fixes the description to say that you can't fire the 12G shotgun with one hand because ow owiee my wrists.
2020-06-12 13:38:27 -07:00
f95222fee0 For the stranger there among them had a big iron on his hip. Big iron on his hiiiiiiip. (#12155)
* HoS modular revolver, ported from vore

* Bugfixing, sanity checks etc.

* Update hos.dm

* Sprite fixed

* Automatic changelog compile [ci skip]

* HoS Weapon Selection

* Icons

* Clamp fix, removing rogue items from ye olde list

* Update ammo.dmi

* Requested Changes Part 1

* Beacon fixed (kind of)

* Subtypes fix

* User

* Giving process_chamber a user so that the proc can use to_chat without requiring loc, fixes switching so the gun only switches to the same type when empty

* redundant item

* Adds an examine notice on how to remove the magazine

* Requested Changes

* Icons

Co-authored-by: Changelogs <action@github.com>
2020-05-30 03:17:56 +02:00
KathrinBaileyandGitHub 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
ZeroMan 8149eebb3b a three bazinga moment 2020-04-24 13:11:42 -04:00
ZeroMan a64b927ad5 a one a two 2020-04-24 13:11:28 -04:00
ZeroMan fc8354111c i prefer the ripples 2020-04-23 22:43:59 -04:00
ZeroMan 883b932a48 i will eliminate security 2020-04-23 22:28:50 -04:00
ZeroMan f4ce4e07f7 i did the thing 2020-04-07 20:37:14 -04:00
necromanceranneandGitHub 2b11b7ac95 Energy Gun Sprite cleanup and Animations (#11518)
* Sprite changes and animations by goldnharl

* While I'm here I'll port over a sprite from tg for the disabler
2020-03-20 02:37:57 +01:00
kappa-sama 1ca4eda4be it begins 2020-03-06 22:58:12 -05:00
BlackMajor 43e77f7d3a Last few fixes. Adds arcane wand to dead wizard roid. 2020-03-04 19:12:56 +13:00
Hatterhat 0cd936e33e bowstrings 2020-02-22 15:02:07 -06:00
kevinz000andGitHub 6f31e1270e Merge pull request #11098 from Trilbyspaceclone/bows!
Silk into clothing, bows, arrows, quivers and more!
2020-02-19 19:05:49 -07:00
Ghommie e1eb781d4b ffs 2020-02-16 18:56:57 +01:00
Ghommie 1a0fba8a2a Something about consistency and magnetic rifles. 2020-02-16 18:37:51 +01:00
TrilbySpaceClone bbe1ddc0cf silk, bows, and graytide! 2020-02-14 23:04:02 -05:00
Ghommie a365f3b499 Demodularize and nerfs mag rifles with re(?)added power cell requirements. 2020-02-03 05:16:32 +01:00
kevinz000 d4d315b447 :^) 2020-01-27 02:51:01 -07:00
Linzolle 70e50e57cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-17 20:21:49 -06:00
UserothandGitHub 28ddfd29b6 Merge branch 'master' into new-tg-plants 2019-12-07 14:25:38 +01:00
Useroth 1158c03ed7 Added bamboo. 2019-12-06 19:00:10 +01:00
Linzolle cc54e5230f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-11-25 21:01:25 -06:00
Ghommie 3310a2c435 Little APC overlays tweak. Removing rogue pixels from the energy gun. 2019-11-22 04:26:00 +01:00
LinandGitHub 6aa6eaafe6 Merge branch 'master' into abductor-update 2019-11-15 23:24:51 +00:00
kappa-sama 26281fbc57 bye bye modcit 2019-11-13 16:56:23 -05:00
kappa-sama f093024967 better guns 2019-11-12 17:04:36 -05:00
Linzolle 2c36aaabee weird icon stuff 2019-10-30 00:24:21 -05:00
Linzolle 266f1ff958 Merge remote-tracking branch 'upstream/master' into abductor-update 2019-10-29 23:58:01 -05:00
kevinz000 31f9ed9665 fixes 2019-10-24 15:31:45 -07:00
Linzolle 9250b1c103 big uppdate season 2019-10-23 21:08:47 -05:00
Thalpy acc0ff8a17 Adds craftable extended mags 2019-10-15 12:37:35 +01:00
TrilbySpaceClone a91eb608cd All of the objects 2019-09-06 13:56:10 -04:00
Sishen ed2c3f3cbd Fixes spelling mistakes, adds pharaoh gear to chaplain vendor 2019-08-19 13:53:05 -04:00
kevinz000andGitHub f59abbf073 Merge pull request #8942 from jakeramsay007/WardenShotgun
Changes the Warden's shotgun to instead be foldable, with greatly increased penalties for being folded.
2019-08-03 00:48:59 -07:00
Chayse Ramsay 085251f5f7 update_icon 2019-07-30 04:35:54 +01:00
TrilbySpaceClone 13936e97de emiting happyness 2019-07-24 14:40:59 -04:00
Fermi 0fa445c153 Fixes and test. 2019-06-02 03:24:01 +01:00
Fermi 3cf3268c76 New non-harmful medicinal darts. 2019-06-01 22:52:03 +01:00
kevinz000andGitHub cbc0607086 Merge pull request #8290 from Trilbyspaceclone/Laser_gun_adv
Readds Laser carbines.
2019-04-30 05:31:33 -07:00
TrilbyspacecloneandGitHub f1ca63fd36 Add files via upload 2019-04-26 20:33:49 -04:00
TrilbyspacecloneandGitHub 5c88d7d8df Delete projectile.dmi 2019-04-26 20:32:55 -04:00
TrilbyspacecloneandGitHub e39962ad39 Add files via upload 2019-04-26 00:42:49 -04:00