Commit Graph
2824 Commits
Author SHA1 Message Date
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 907d909861 Merge pull request #12493 from DeltaFire15/eldritch-affairs-exploit-fix
[s] xenobio golems can no longer be used to exploit eldritch affairs mechanics
2020-06-09 02:22:04 +02:00
DeltaFire e2466f1e22 tiny bit of better performance 2020-06-08 21:29:29 +02:00
DeltaFire c29be22f9b no more gamer time 2020-06-08 19:06:41 +02:00
LinandGitHub 1e3fd46c2d Merge pull request #12472 from Citadel-Station-13/kevinz000-patch-9
makes default photosynthesis MUCH less punishing
2020-06-08 11:25:15 -05:00
GhomandGitHub f3af445c94 Update material_container.dm (#12491) 2020-06-08 09:09:53 -07:00
kevinz000andGitHub 5b863e7e9b Update photosynthesis.dm 2020-06-07 03:43:41 -07:00
kevinz000andGitHub 6f62cb8678 Update photosynthesis.dm 2020-06-07 03:40:34 -07:00
LinandGitHub 5e37d3ef3b Merge pull request #12430 from Ghommie/Ghommie-cit811
Fixing various icons problems with some clothings.
2020-06-03 20:23:16 +00:00
GhomandGitHub d53dca7322 Fixing just a couple issues. (#12417) 2020-06-02 15:30:22 -07:00
TrilbyspacecloneandGitHub f926dd7f5e Update pockets.dm (#12421) 2020-06-02 15:29:51 -07:00
GhomandGitHub ea763df326 Photosynthesis element. (#12394)
* Photosynthesis element.

* element yaketi sax.

* Ok, let's just use SSobj which has 20 wait instead of 10.
2020-06-02 15:23:09 -07:00
GhomandGitHub 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
ArturlangandGitHub 597432424c Buffs lunging gloves a bit, so they arent a detriment to the user as much (#12336)
* Buffs leap all around

* Kev suggestions

* Im stoopid
2020-06-01 21:51:41 +02:00
Letter NandGitHub af1aa9758d matrix and orbit thing (#12399) 2020-05-31 02:20:20 +02:00
GhomandGitHub 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
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
GhomandGitHub cea958f822 Fixing various issues. (#12368)
* Fixing various issues.

* Lights.
2020-05-28 00:36:57 -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
RohesieandGitHub d88c815845 vars (#12373) 2020-05-28 01:18:26 +02:00
LinandGitHub 1b8e05875f Merge pull request #12357 from Citadel-Station-13/Ghommie-patch-1
quick tactical fix.
2020-05-26 17:13:32 +00: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
GhomandGitHub 8fd8b6a0bb Update tactical.dm 2020-05-25 11:16:51 +02: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
GhomandGitHub ce1f1bdf5e Turning a few components into elements. (#12325)
* Turning a few components into elements.

* eh
2020-05-24 13:06:27 -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
kevinz000andGitHub e9068f05eb let's play the optimization game featuring lighting (#12310)
* debug proc

* kinda quirky

* let's play the lighting game

* let's play the macro game

* let's play the refactor game

* let's play the optimization game

* let's play the optimization game x2

* yeehaw

* e

* let's play the memory game

* fix

* lighting fix

* sanitization and checks

* mh

* hotkeys fix

* ok
2020-05-23 22:47:42 +02:00
Detective Google d03d20d570 Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-22 13:52:56 -05:00
GhomandGitHub bcd911070a Fixing dwarfism. (#12331)
* Update body.dm

* Update dwarves.dm
2020-05-21 12:38:42 -07:00
ArturlangandGitHub 8dd4fd4e66 Actually fixes mesmerize (#12330) 2020-05-21 21:26:05 +02:00
GhomandGitHub 8a0ed38a58 Fixing a few issues with the nutrition adjustment proc and the circuit printer. (#12320) 2020-05-21 10:10:59 -07:00
GhomandGitHub e3922400a1 swift item action skills fix. (#12324)
* Update _skill_holder.dm

* Update _skill_holder.dm

* Update _skill_holder.dm
2020-05-21 10:09:54 -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
zeroisthebiggayandGitHub 55891e8d50 fixes ninja adrenals not being able to be activated when stamcritted because that is incredibly bad (#12312)
* i fucking hate coding

* i fucking hate coding

* i fucking hate coding

* i fucking hate coding
2020-05-20 18:07:29 +02:00
GhomandGitHub ed90c59d65 Removal of """silk""" (#12221)
* Removal of """silk"""

* AAA

* Ashwalkers now start with durathread seeds
2020-05-19 23:43:46 -07:00
BlackMajorandGitHub fc921289d6 Merge pull request #12149 from kevinz000/DMAPI5
Updates DMAPI to v5
2020-05-19 22:32:17 +12:00
GhomandGitHub 9eccef2836 Porting "Personal interaction messages to simple animals" and more. (#12268)
* Porting "Personal interaction messages to simple animals" and more.

* Travis check.

* doc

* whoopsie.

* )
2020-05-18 04:46:57 -07:00
GhomandGitHub 75dec8ce2c Ports "Removes the absolute istype fest from footsteps" (#12259)
* Ports "Removes the absolute istype fest from footsteps"

* Update species.dm
2020-05-18 04:46:22 -07:00
GhomandGitHub 08280a853e Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers' (#12282)
* Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers'

* Ok, signals.
2020-05-17 17:04:15 -07:00
GhomandGitHub 12ac08d7c5 Porting tesla/electrocute code updates. (#12280)
* Porting tesla/electrocute code updates.

* Why is the dominator being insta-deleted by zaps a good idea?

* Yikes.

* ah
2020-05-17 16:35:17 -07:00
Seris02andGitHub 35a35098bd fixed (#12278) 2020-05-17 00:50:28 +02:00
GhomandGitHub 31604812a9 Fixing gc issues with skill modifiers. (#12284) 2020-05-16 13:18:12 -07:00
GhomandGitHub ab61713b50 Stores unused bad mood skill modifiers in a static list instead of deleting them everytime. (#12273)
* Lowers gc subsystem cpu usage by caching mood skill modifiers.

* WHOPS.

* fug
2020-05-16 13:16:01 -07:00
GhomandGitHub 73a27c8fe5 Porting "Fixes Null Reference + Qdel Issue in Runechat" (#12271) 2020-05-16 07:38:16 -07:00
GhomandGitHub 7c7147cb3e Field of Vision component. (#12075)
* Hopeless WIP for vision cones.

* Core component and hooks done

* Removing clutter.

* linter bashing me for using statements as args.

* Ok.

* continue

* bring back the macro

* Configs and openspace filter.

* Chat plane, reset perspective signal, mechs/vehicles cases, machineries.

* view, viewers and spoopy ghosts.

* Renamed component, admin fun button and snowflakes robots.

* Whoopsie.

* Yikes

* test merge tweak.

* radial yaketi sax.

* Fixed tgui UIs, some messages not displayed to the target.

* Documentation and a little bugfix.

* Pulling QoL, seventh plane made in this PR.

* Fix.

* Tweaks and improvements.

* Update randomverbs.dm
2020-05-15 15:25:04 -07:00