Commit Graph

3527 Commits

Author SHA1 Message Date
kevinz000
278dfab74a Update plushes.dm 2020-06-13 13:10:14 -07:00
kevinz000
6f1dd34c91 Update plushes.dm 2020-06-13 11:57:11 -07:00
Ghom
7dc7961b70 Clearing gc issues for a couple objects. (#12508)
* Clearing gc issues for a couple objects.

* Linter check.
2020-06-12 17:07:36 -07:00
Lin
bfe8ccdfb5 Merge pull request #11627 from kevinz000/combat_rework
"Unofficial" Combat Rework Part 3: Blocking/Parrying
2020-06-12 16:39:11 -05:00
Lin
ff216c9c94 Merge pull request #12507 from Citadel-Station-13/removesilicons
Clicking on atmospherics objects as a ghost will allow you to scan their air much like with an analyzer.
2020-06-12 16:29:40 -05: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
kevinz000
120826e1fc Update tanks.dm 2020-06-10 14:47:58 -07:00
kevinz000
0e58938253 Update scanners.dm 2020-06-10 14:42:27 -07:00
Ghom
8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
b1tt3r1n0
764ba26ace Pouches (#12432)
* The Ammo Pouch

It holds magazines and most forms of ammo.

* The Ammo Pouch

It holds magazines and most forms of ammo.
2020-06-09 03:22:39 -07:00
Timothy Teakettle
3692323615 plushmium: the fermichem that creates sentient plushies (#12450)
* create plushie mob and chem

* better plush

* sentience

* fixes

* more fixes

* spelling error

* okay this works better

* more work on sentiency

* fixes

* further fixes

* revert plush storage changes, add splash effect

* fix icons

* undo a change that i guess isnt needed

* remove spaces

* plushies are now space immune

* make warning text more clear

* dont give them more health than bears?

* give them 0/1 stamina damage

* bugfix

* squeak when attacked

* small refactor
2020-06-09 03:21:18 -07:00
Ghom
8ba5c8f690 Merge pull request #12444 from shellspeed1/Makes-internal-tanks-printable
Makes internal tanks printable at the engineering lathe
2020-06-08 00:37:26 +02:00
kevinz000
92d1af5889 adjustments 2020-06-04 22:18:19 -07:00
kevinz000
a35fce64e2 fixes 2020-06-04 20:02:59 -07:00
kevinz000
bad809ffce fixes 2020-06-04 19:56:06 -07:00
Trilbyspaceclone
a2c4b741ad ahaha what if they didnt heal? 2020-06-04 21:46:38 -04:00
shellspeed1
2002a273de Makes empty internal tanks printable 2020-06-04 16:04:16 -07:00
Lin
5e37d3ef3b Merge pull request #12430 from Ghommie/Ghommie-cit811
Fixing various icons problems with some clothings.
2020-06-03 20:23:16 +00:00
kevinz000
1a9787a9c2 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-06-02 21:49:43 -07:00
Ghom
d7954ca077 Yet another PR fixing some issues. (#12424) 2020-06-02 15:29:01 -07:00
Ghom
07e42c079c Fixing cards states and user-less projectiles checking mean armor values. (#12400) 2020-06-02 15:24:13 -07:00
Ghom
a41f40503d More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. (#12347)
* A more lenient soft stamina crit.

* Yea, your shots are gonna go straight toh.

* accuracy whacks (leaves the bow as is for now).

* Fixing stam penalties calculations, spread the range.

* aaaaaah

* 1.4 seconds delay vs 1.2

* Thanks, linter.

* Missed one.
2020-06-02 15:22:06 -07:00
Ghom
1c3bfa623f Merge pull request #12175 from Detective-Google/snaxi2
Adds a New map, Snow Taxi (A vgstation13 map port)
2020-06-02 23:48:50 +02:00
Ghommie
1a9484cf2e Fixing missing clothing icons etc. 2020-06-02 17:43:31 +02:00
Yawet330
8e26876634 Makes Spears rational. (#12401)
* hate spears, hate elances, hate embedding.

* Update code/game/objects/items/twohanded.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/game/objects/items/twohanded.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/game/objects/items/twohanded.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/game/objects/items/twohanded.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-06-01 01:44:31 +02:00
Sonic121x
b7411bf9a0 Fix The X-01 Multiphase energy gun box (#12409)
Fix /obj/item/storage/secure/briefcase/hos/multiphase_box/PopulateContents()
2020-05-31 13:50:31 +02:00
Ghom
48b327ea74 chemistry/bio bags nerf and little pill volumetric tweak. (#12392)
* chemistry bag nerf and little pill volumetric tweak.

* Yea, sure why not?

* hey.

* Kevinz review.
2020-05-31 00:54:28 -07:00
kevinz000
5b6e797c4f desword adjustments 2020-05-30 23:43:05 -07:00
kevinz000
34d8aa0ee9 refactor 2020-05-30 23:13:16 -07:00
kevinz000
2232271ea5 fixes and render 2020-05-30 22:29:41 -07:00
kevinz000
1fef5825a9 definition fixes 2020-05-30 22:09:13 -07:00
kevinz000
d47841ee54 documentation 2020-05-30 20:38:07 -07:00
kevinz000
588443e928 fix 2020-05-30 20:12:50 -07:00
kevinz000
e5c32c1746 changes 2020-05-30 20:11:18 -07:00
Ghom
25dbed5b0b Made the decal component an element. (#12388)
* Made the decal component an element.

* Is this really worth it?

* Oh.
2020-05-30 14:06:53 -07:00
kevinz000
9d4d6e6b6f your goddamn ass isn't a constant expression 2020-05-30 02:12:49 -07:00
kevinz000
519552cb78 more handling 2020-05-30 01:59:58 -07:00
kevinz000
1214c99a34 is this a good idea 2020-05-30 01:46:43 -07:00
kevinz000
b74d465b6c fix 2020-05-30 01:22:09 -07:00
kevinz000
05fe0c7dcc ok 2020-05-30 00:59:29 -07:00
kevinz000
f8741b6a0b adjust 2020-05-29 19:50:11 -07:00
kevinz000
65bb3bbb91 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-29 19:13:22 -07: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
kevinz000
18bef15afc captain rapier 2020-05-29 02:36:13 -07:00
KathrinBailey
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
TheFakeElon
9d169fc43e Adds unum (#12369)
* unoo

* bracket

* COMMA

* Update toys.dm

* fixes icons

* Update code/game/objects/items/toys.dm

Thanks ghommie

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* pool noodle and viro

* removes dupes

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-28 15:47:44 +02:00
Ghom
ae62566dce Fixing some issues with the now unneeded hack for looms. (#12350) 2020-05-28 00:37:22 -07:00
Ghom
cea958f822 Fixing various issues. (#12368)
* Fixing various issues.

* Lights.
2020-05-28 00:36:57 -07:00
kevinz000
c19e00f6c3 fixes 2020-05-27 21:15:29 -07:00
kevinz000
f326c06324 fixEs 2020-05-27 21:07:07 -07:00