Commit Graph

109 Commits

Author SHA1 Message Date
silicons
40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
The0bserver
6b4051071d Finally, ammo for the funny gun. 2021-04-21 10:46:04 -04:00
The0bserver
146ffcd2bd tweaks 2021-04-21 09:58:08 -04:00
The0bserver
db046f3dbb I want to play Thermonuclear War (Initial Commit) 2021-04-21 03:12:01 -04:00
The0bserver
f16c6931e2 Fixes, removes the functionality after confering. 2021-04-13 23:50:11 -04:00
The0bserver
27c49b3f34 fox fix 2021-04-13 23:38:50 -04:00
The0bserver
64a3cd9404 T. Derringer has twin calibers, Station gets .38 2021-04-13 23:22:35 -04:00
The0bserver
1d31fb084f More concealment, fixes a problem with the .45-70 2021-04-11 19:40:54 -04:00
The0bserver
9fe8fb7671 More work 2021-04-11 07:20:06 -04:00
The0bserver
bdaf0987e4 im going insane 2021-04-11 05:31:23 -04:00
The0bserver
e75088420d Error fixing. 2021-04-11 04:38:46 -04:00
The0bserver
55eb445a07 Adds Derringers (Code) Initial Commit 2021-04-11 04:20:12 -04:00
Hatterhat
30a9ad5059 yeehaw :) 2021-03-23 18:55:00 -05:00
Hatterhat
6bac90f8de uhh initial commit ig 2021-03-22 21:23:00 -05:00
silicons
15dd80a085 less awful 2021-03-20 13:39:59 -07:00
dzahlus
594aa9b3c0 sorry no funny taser 2021-03-03 01:34:19 +01:00
dzahlus
d214392a9c Update rechargable.dm 2021-03-02 18:18:23 +01:00
dzahlus
f0a34723d7 tase lase 2021-03-01 23:58:29 +01:00
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
silicons
adc75a1d50 Merge branch 'master' into revert-13122-haha 2020-08-28 15:31:38 -07:00
silicons
ff6beea525 rebalances shotgun shell stripper clips since no one else wants to (#13116)
* Update volumetrics.dm

* Update ammo_boxes.dm
2020-08-26 17:19:29 +02:00
lolman360
ee4da21d38 Merge branch 'haha' of https://github.com/lolman360/Citadel-Station-13 into haha 2020-08-19 12:20:38 +10:00
lolman360
f35989b09e Merge remote-tracking branch 'upstream/master' into haha 2020-08-19 12:20:07 +10:00
lolman360
09bba25050 Update code/modules/projectiles/boxes_magazines/_box_magazine.dm
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2020-08-19 12:02:45 +10:00
lolman360
a7a964154e Update code/modules/projectiles/boxes_magazines/_box_magazine.dm
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2020-08-19 12:02:34 +10:00
lolman360
6f21b23a87 Fixes Shit. 2020-08-18 14:28:57 +10:00
lolman360
8027706bea Update _box_magazine.dm 2020-08-18 13:45:44 +10:00
lolman360
2d1edc9fa2 Update _box_magazine.dm 2020-08-18 13:30:49 +10:00
silicons
50eca19658 Revert "load_delay var for /obj/item/ammo_box, nerfs shotgun stripper clips (hatter why'd you pr them)" 2020-08-17 20:20:04 -07:00
silicons
d35cba095f Merge pull request #13108 from Hatterhat/357-dumdum
.357 DumDum Rounds (they're adminspawn only don't worry)
2020-08-17 08:58:00 -07:00
lolman360
3aba9eb5a6 kee 2020-08-12 15:11:55 +10:00
lolman360
8c70b56706 whoops 2020-08-11 19:04:59 +10:00
lolman360
472ef6165f imamurderer 2020-08-11 18:52:26 +10:00
Hatterhat
8370a31942 funny adminspawn wound bullets 2020-08-10 12:12:32 -05:00
silicons
6876edbd85 Merge pull request #12992 from Hatterhat/rifle-book-pt2
unatomic as shit PR about nukie guns
2020-08-06 19:40:09 -07:00
Hatterhat
6a5e26eb1c unatomic as shit 2020-08-01 12:31:13 -05:00
timothyteakettle
8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
YakumoChen
d9e5847b8f Update pistol.dm 2020-07-01 08:56:13 +00:00
YakumoChen
6a48b9199f Update ammo_boxes.dm 2020-07-01 08:55:42 +00:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
kevinz000
118ac1a775 Merge pull request #12548 from timothyteakettle/more-events
ports several tg events including fugitives
2020-06-17 20:10:04 -07:00
Timothy Teakettle
eba1e8f301 fixes the merge conflicts 2020-06-15 23:29:49 +01:00
Timothy Teakettle
7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes 2020-06-15 22:48:26 +01:00
Timothy Teakettle
d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
KathrinBailey
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
Timothy Teakettle
38bf529f3c a tonne of fixes 2020-06-11 20:18:36 +01:00
Timothy Teakettle
4c55e86da7 part 2 2020-06-10 23:14:25 +01:00
Chayse Ramsay
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
Hatterhat
6067370a6f shotgun shell clips (#11955)
* shell clips revised by based ghom

* lmao yeet better not forget that bit

* nitpicking but also merge 11976 first

* No freeloaders.

* Update weapon_designs.dm

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-09 02:49:25 +02:00