Commit Graph

184 Commits

Author SHA1 Message Date
silicons
716c2a04e4 Merge pull request #14160 from keronshb/motivation
Adds a new traitor item, Motivation (Part 1)
2021-06-09 11:10:17 -07:00
silicons
d4529b1bf3 Merge pull request #14651 from WanderingFox95/WanderingFox95-ReagentDartgunRebalance
The reagent dart gun uplink item needed work.
2021-04-28 21:17:36 -06:00
WanderingFox95
4e0bf12c0c Modifies dart size and properties
They inject less but pierce again
2021-04-23 23:15:40 +02:00
keronshb
20c190c17d Merge remote-tracking branch 'upstream/master' into motivation 2021-04-14 17:55:24 -04:00
The0bserver
1d31fb084f More concealment, fixes a problem with the .45-70 2021-04-11 19:40:54 -04:00
The0bserver
55eb445a07 Adds Derringers (Code) Initial Commit 2021-04-11 04:20:12 -04:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
keronshb
a4e933185e Merge remote-tracking branch 'origin/master' into motivation 2021-01-29 09:29:55 -05:00
keronshb
a2833ea85f Movitation WIP
WIP still working on this
2021-01-26 13:27:06 -05:00
silicons
a1e92e55aa Merge pull request #14102 from Hatterhat/somatobuff-50513
[READY] somatoray buff - mutation locks + revolution ray
2021-01-25 23:17:29 -07:00
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
Hatterhat
e006587f4b today i will not test my code 2021-01-19 17:24:33 -06:00
DeltaFire
1e8e1ec72b Merge pull request #13786 from kiwedespars/why
x-ray laser nerfs
2020-12-19 05:28:43 +01:00
kiwedespars
98c3335dce doubles xray laser cost, 20 -> 10 shots 2020-12-15 21:04:10 -08:00
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
Trilbyspaceclone
c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04: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
Trilbyspaceclone
1b61a5feb2 Merge branch 'master' into spike-loot-differentces 2020-08-12 15:10:37 -04:00
Hatterhat
8370a31942 funny adminspawn wound bullets 2020-08-10 12:12:32 -05:00
Timothy Teakettle
2153f9ea35 i too, want people to be hit their ricochets 2020-08-03 17:36:40 +01:00
Trilbyspaceclone
e1e6198140 Merge branch 'master' into spike-loot-differentces 2020-08-03 10:53:08 -04:00
Timothy Teakettle
9b34407c9f uplink 2020-08-03 15:27:17 +01:00
Timothy Teakettle
2bbe4631d6 working ricochets 2020-08-03 14:46:24 +01:00
Timothy Teakettle
0bf9553eca hmm 2020-08-02 19:13:39 +01:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons
2eb6f0467d fix guns 2020-07-23 09:56:38 -07:00
silicons
76f885e1a6 ok 2020-07-23 00:16:43 -07:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +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
timothyteakettle
03bd806c73 pickle 2020-07-16 02:51:07 +01:00
Trilbyspaceclone
49b0d38112 Apply suggestions from code review
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-07-07 13:47:56 -04:00
YakumoChen
6ec2cba2be Update laser.dm 2020-07-01 08:54:42 +00:00
YakumoChen
36592431a9 Update pistol.dm 2020-07-01 08:53:54 +00: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
Trilbyspaceclone
51da7dfa71 Merge branch 'master' into spike-loot-differentces 2020-06-17 02:36:52 -04: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
TrilbySpaceClone
8b406df1ec mk III 2020-06-05 22:43:49 -04:00
kevinz000
fd5c635840 adds a snowflakey-ish(??? maybe???) way to modify gun damage so we don't need more shot types for improvised shotguns (#12274)
* Update gun.dm

* Update _firing.dm

* Update code/modules/projectiles/ammunition/_firing.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-18 02:59:50 +02:00
ZeroMan
438a83b5c0 a 2020-04-30 17:56:07 -04:00
kevinz000
3d116f5e7e Merge pull request #12000 from zeroisthebiggay/comprehensivefucksecuritypr
Fuck Ranged Security Knockdowns: The Taser Nerf PR That Will Get Me Killed By A Witchhunt
2020-04-29 12:01:33 -07:00
ZeroMan
883b932a48 i will eliminate security 2020-04-23 22:28:50 -04:00
Hatterhat
2126ca1674 dot on casing name gone 2020-04-22 15:41:22 -05:00
TrilbySpaceClone
2cd59a6fb0 that was easy 2020-04-06 08:40:34 -04:00