Commit Graph
2016 Commits
Author SHA1 Message Date
LinandGitHub fd662047f3 Merge pull request #12518 from kevinz000/pp_fix
refactors projectile ricochet and fixes a runtime with projectile motion
2020-06-15 13:59:41 -05:00
GhomandGitHub 7513e032e3 petrification improvements (#12375)
* petrification improvements

* Standards.
2020-06-14 23:04:12 -07:00
LinandGitHub 47adbd3e90 Merge pull request #12516 from kevinz000/vv_fix
Fixes VV not allowing proper access to datums in associative lists. Upgrades SDQL2 printout for the 3rd? 4th? 5th? time
2020-06-14 14:54:29 -05:00
kevinz000 8162303bad Merge remote-tracking branch 'citadel/master' into pp_fix 2020-06-13 12:03:01 -07:00
kevinz000 180b7d31d9 sigh 2020-06-13 09:24:22 -07:00
LinandGitHub d73b2b8635 Merge pull request #12505 from deathride58/morelgbtholidays
Adds more LGBTQIA+ related holidays
2020-06-12 21:28:32 -05:00
kevinz000 9a08623308 sigh 2020-06-12 18:39:45 -07:00
kevinz000 8e6dee515a null isn't an object 2020-06-12 17:16:36 -07:00
GhomandGitHub 77c428479e changes the inefficient attack message string and threshold. (#12498) 2020-06-12 17:08:10 -07:00
kevinz000 146542b077 sdql2 2020-06-12 16:33:36 -07:00
LinandGitHub f39f933363 Merge pull request #12489 from Citadel-Station-13/kevinz000-patch-16-1
Disks are now smaller
2020-06-12 16:41:22 -05:00
LinandGitHub bfe8ccdfb5 Merge pull request #11627 from kevinz000/combat_rework
"Unofficial" Combat Rework Part 3: Blocking/Parrying
2020-06-12 16:39:11 -05: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
GhomandGitHub 8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
deathride58 d0ff964c28 Adds more LGBTQIA+-related holidays! 2020-06-09 20:19:52 -04:00
GhomandGitHub 798de9baf1 Porting "Speeds up /datum/light_source/proc/update_corners() by 16% or so" (#12496) 2020-06-08 21:15:26 -07:00
kevinz000andGitHub f1f655268d Update volumetrics.dm 2020-06-07 22:02:45 -07:00
kevinz000 bad809ffce fixes 2020-06-04 19:56:06 -07:00
deathride58andGitHub 3eb3934e26 Adds Pride Month as a holiday! (#12436)
* Adds pride month as a holiday, complete with assistants spawning with rainbow jumpsuits

* yknow what, while i'm at it, let's compress it
2020-06-04 15:40:31 -07:00
kevinz000 1a9787a9c2 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-06-02 21:49:43 -07:00
GhomandGitHub 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
GhomandGitHub 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 c613726c2a render 2020-05-30 22:05:19 -07:00
kevinz000 0723399ed4 render 2020-05-30 20:55:33 -07:00
kevinz000 588443e928 fix 2020-05-30 20:12:50 -07:00
kevinz000 e5c32c1746 changes 2020-05-30 20:11:18 -07:00
kevinz000 6b0b20b171 infinite loop protection 2020-05-30 01:00:41 -07:00
kevinz000 05fe0c7dcc ok 2020-05-30 00:59:29 -07:00
kevinz000 ae9fc5789d adds more support to stuff 2020-05-30 00:35:17 -07:00
kevinz000 65bb3bbb91 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-29 19:13:22 -07:00
RohesieandGitHub 5ab8d41d9a horns (#12384) 2020-05-30 03:25:27 +02:00
KathrinBaileyandGitHub 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
kevinz000 f326c06324 fixEs 2020-05-27 21:07:07 -07:00
kevinz000 162e79df23 fixes dreamchecker errors 2020-05-27 18:17:00 -07:00
kevinz000 433bd1af79 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-27 18:11:15 -07:00
GhomandGitHub 16dea7ceed Revamped the paper wizard robes. (#12348)
* Better paper wizard robes.

* return value.

* ooo

* Aaa

* aaaa
2020-05-27 18:01:22 -07:00
GhomandGitHub 968426fd48 Combat mode component. (#12338)
* Combat mode component.

* Whoops.

* test.

* Oh

* refs begone, and documentation.
2020-05-27 18:00:32 -07:00
deathride58andGitHub 93a168d8a8 updates dmapi from dmapi 5.1.0 to dmapi 5.2.1 (based off tgstation/tgstation#51100 ) (#12364) 2020-05-27 17:58:43 -07:00
GhomandGitHub 85186a9714 Porting updates related to material datums. (#12317)
* Porting updates related to material datums.

* art_type

* oh oh
2020-05-25 14:21:00 -07:00
kevinz000 e4eb49050c Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-24 15:03:06 -07:00
kevinz000 95c6c7345c implementations 2020-05-24 14:56:01 -07:00
LinandGitHub ad57647e64 Merge pull request #12173 from kevinz000/projectiles_2
Refactors projectile speed to pixels per second
2020-05-24 21:21:41 +00:00
ArturlangandGitHub 32135cc008 Makes bloodsuckers unguttable and undecappable (#12335)
* Bloodsuckers cant be gutted or beheaded anymore

* Mistakes were made
2020-05-24 13:08:18 -07:00
GhomandGitHub ab5d65a454 Porting the BEPIS research machinery. (#12277)
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
2020-05-24 13:05:15 -07:00
kevinz000 ab2efa0485 rustg fix 2020-05-20 23:18:37 -07:00
kevinz000 fac705669a rustg dm 2020-05-20 23:14:36 -07:00
TrilbyspacecloneandGitHub fcb2b58664 Upgrade able Medical bot and Floor bot as well! + Clean bot fix! (#12112)
* Misstake are now

* Still dosnt all work

* no more range upgrade it just dosnt work

* bithell

* a this
2020-05-20 19:03:20 -07:00
GhomandGitHub 3ac61c0704 Porting tg painting code. (#12305)
* Porting tg painting code.

* yes.
2020-05-20 18:45:36 -07:00
GhomandGitHub 6696560656 slendermen fix. (#12303)
* slendermen fix.

* Whops

* Update dwarfism.dm
2020-05-20 18:43:14 -07:00
GhomandGitHub 7f38e0714b Skill calculation fixes, tweaks, antag and brain damage modifiers. (#12302)
* Skill calculation fixes, tweaks, antag and brain damage modifiers.

* Experience through patience.

* Priority Fix etcetera.
2020-05-20 18:42:58 -07:00