100 Commits
Author SHA1 Message Date
SandPoot bf0c0f530d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-05 19:09:18 -03:00
Hatterhat 2155a8bdce funny ammo 2022-08-03 06:11:04 -05:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
SandPoot 2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
SandPoot 9df4ed8253 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:48:16 -03:00
SandPoot ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03:00
LinandGitHub fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
Solaris-Shade 2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
SandPoot 3da59fc38c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-05 14:27:17 -03:00
silicons 186b552103 merge 2021-10-29 21:50:58 -07:00
SandPoot 1982c3962f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-18 22:03:30 -03:00
f3550fd87c blacklists morphine from dart guns, also haloperidol (#15152)
* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* yeag

* actually adds the blacklist

can't you feel my heart beat so, i can't let you go, want you in my life

* changes

* Update html/changelog.html

Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>

Co-authored-by: Changelogs <action@github.com>
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
2021-09-17 12:54:02 +02:00
SandPoot 91fd04c552 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-10 23:41:21 -03:00
WanderingFox95andGitHub 7884ccf316 Only 5 units are necessary, so why keep it at 10?
I mean, this is the refining process
2021-06-05 14:51:59 +02:00
WanderingFox95andGitHub e69729beb4 So he doesn't need sodium thiopental after all.
Turns out Furranium has a knockdown.
2021-05-31 12:15:16 +02:00
WanderingFox95andGitHub ae2970f318 Adds a special Catranq Dart 2021-05-30 21:17:03 +02:00
SandPoot bab386168e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-18 23:23:02 -03:00
The0bserver 55eb445a07 Adds Derringers (Code) Initial Commit 2021-04-11 04:20:12 -04:00
SandPoot acad841ef4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-28 13:32:08 -03:00
silicons 879ea9c6c8 ok 2020-12-25 14:23:16 -08:00
SandPoot af0f6e7bd0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-18 23:12:54 -03:00
silicons 5b03f5b0ec more 2020-11-12 23:36:18 -07:00
SandPootandGitHub 13834c4bef Morrowinventory Port (#75) 2020-09-24 20:14:53 -03:00
Hatterhat eeefc1cbaa heho woundies 2020-08-11 16:01:29 -05:00
Hatterhat 8370a31942 funny adminspawn wound bullets 2020-08-10 12:12:32 -05:00
timothyteakettle 8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
Timothy Teakettle 7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
timothyteakettle e8fade4f7f changes 2020-07-18 02:29:12 +01:00
timothyteakettle 7714fcfaba more changes 2020-07-18 01:26:38 +01:00
YakumoChenandGitHub 67b5efbce0 Update pistol.dm 2020-07-01 09:03:48 +00:00
kevinz000andGitHub 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 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
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
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
kevinz000 19072abe37 compile 2020-05-08 23:01:05 -07:00
kevinz000 6d6239a8b4 kay 2020-05-08 22:59:51 -07:00
kevinz000 e684c6e574 ok 2020-05-08 22:40:07 -07:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
TrilbySpaceClone 2cd59a6fb0 that was easy 2020-04-06 08:40:34 -04:00
necromanceranneandGitHub a4313ee101 Nerfs scattershot, removes it from nukie uplink, buffs bioterror dart slugs, includes them into nukie uplink (#11675) 2020-03-29 17:45:01 +02:00
necromanceranneandGitHub 02a8104c3b Makes taserslugs actually tasers, makes mech scattershot not a oneshot (#11671) 2020-03-29 17:19:27 +02:00
necromanceranne 6f0fc2bdea I LOVE YOU KITCHEN GUN! 2020-03-17 03:20:53 +11:00
Ghommie 4a621fb1aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560 2020-02-14 19:39:53 +01:00
GhomandGitHub 78ace8e855 Merge pull request #10916 from Citadel-Station-13/kevinz000-patch-6
Projectiles now always hit chest if targeting chest, snipers now have 100% targeting zone accuracy
2020-02-14 19:20:32 +01:00
Hatterhat 1d071ff127 one off 2020-02-10 21:40:51 -06:00