Commit Graph

295 Commits

Author SHA1 Message Date
lolman360
55c8250324 AAAAAAAAAAAAAAAAA 2020-08-28 12:44:59 +10:00
lolman360
daeaf81ab6 e 2020-08-24 01:25:26 +10:00
lolman360
0f9f1e240c w 2020-08-24 00:51:13 +10:00
lolman360
4b2b4afc64 e 2020-08-24 00:49:31 +10:00
lolman360
6463d0b785 Merge branch 'AnPrimAssistants' of https://github.com/lolman360/Citadel-Station-13 into AnPrimAssistants 2020-08-24 00:27:29 +10:00
lolman360
b74c5ba22d ee 2020-08-24 00:27:22 +10:00
lolman360
460c92de74 3 2020-08-24 00:20:04 +10:00
lolman360
05250939c6 e 2020-08-23 23:58:04 +10:00
lolman360
bc14155632 Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-08-23 17:01:45 +10:00
silicons
120bcfc00c Merge pull request #13178 from lolman360/plumb
[READY] ports plumbing (no more waiting for tgui4)
2020-08-20 21:32:26 -07:00
lolman360
bda2c740ba Merge branch 'master' into AnPrimAssistants 2020-08-21 11:08:13 +10:00
lolman360
4e23559065 Update sheet_types.dm 2020-08-18 18:15:24 +10:00
lolman360
8085ab01d9 culst! 2020-08-18 15:38:59 +10:00
lolman360
8f5078a15a Update mineral.dm 2020-08-18 14:47:47 +10:00
lolman360
bb86003510 w e w 2020-08-18 10:04:52 +10:00
lolman360
7ca4fa2f55 compilies/?? 2020-08-15 17:09:12 +10:00
lolman360
49948e77a4 SELLYOULOSE 2020-08-11 18:08:40 +10:00
lolman360
308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
silicons
2a0f2a38a7 Fix 2020-08-05 21:42:05 -07:00
silicons
815ddd1866 oh boy 2020-08-05 21:34:26 -07:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Timothy Teakettle
dc14c02570 fix crates 2020-07-27 21:55:51 +01:00
Hatterhat
14fba6a056 funny parry sticks 2020-07-24 21:19:01 -05:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
lolman360
0f1aa3c0ca 'lolman? did you test your code?'
no i did not ms. kevinz
2020-07-22 10:49:56 +10:00
CameronWoof
431c52b7e2 Merge remote-tracking branch 'upstream/master' into advanced-sutures-and-mesh 2020-07-17 17:22:43 -07:00
CameronWoof
a493ecdc4a suture and mesh additions 2020-07-15 16:44:24 -07:00
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Ghom
17ee8c5960 Merge pull request #12660 from YakumoChen/master
Reverts improv small arms, makes guncrafting easier and faster
2020-07-04 18:35:22 +02:00
silicons
c10350f10e Merge pull request #12677 from Ghommie/Ghommie-cit830
Fixes items' skills list keys missing associated traits and improves modulability a little.
2020-07-04 00:12:37 -07:00
silicons
103b8b7600 Merge pull request #12662 from kappa-sama/patch-29
makes bows and arrows more feasible improv weapons
2020-07-04 00:11:45 -07:00
Ghommie
f5ffd7d2a9 Easing fine tuning of the system. 2020-07-03 03:00:33 +02:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
kappa-sama
406af65d93 you need 5 of these 2020-07-01 08:12:35 -04:00
kappa-sama
9cc6f5aa91 durathread->string 2020-07-01 08:09:43 -04:00
kappa-sama
0b0d9ff1a6 this 2020-07-01 07:56:55 -04:00
kappa-sama
cfc14a04f1 Merge branch 'master' into patch-28 2020-07-01 07:48:46 -04:00
kappa-sama
1f38c3029c yeah ok 2020-07-01 07:40:43 -04:00
YakumoChen
ed017cc22a Update sheet_types.dm 2020-07-01 08:53:08 +00:00
Ghommie
cd1c5511a4 Fixing two handed items and etcetera. 2020-06-30 16:24:04 +02:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Ghommie
29a8d2ed78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813 2020-06-20 00:07:47 +02:00
Artur
ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00
Timothy Teakettle
7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes 2020-06-15 22:48:26 +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
95b8cd3956 first port 2020-06-10 20:33:01 +01:00
Ghommie
495ccc99c5 Porting some cargo/vending updates. 2020-06-08 06:12:51 +02:00
Artur
19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00