Commit Graph

28397 Commits

Author SHA1 Message Date
lbnesquik
d68d7fb247 reeeeeeeee 2018-10-09 14:37:55 +02:00
Anewbe
0f730974c9 Merge pull request #5638 from lbnesquik/Kates-Chemistry-Fix
Fixes chem master dumping reagents.
2018-10-07 15:43:45 -05:00
Anewbe
226ed4eff7 Merge pull request #5639 from Heroman3003/smes-fix
Fixed smes terminal construction requiring more cable than used.
2018-10-06 15:03:31 -05:00
Heroman3003
40a38aeb0e Fixed smes terminal construction requiring more cable than used. 2018-10-06 09:36:24 +10:00
lbnesquik
5ff6ad56bf Fixes chem master dumping reagents.
Previously, if you used a bluespace beaker and transferred all of it's contents, the chem master buffer would silently drop all of those chemicals without warning.
2018-10-06 01:26:43 +02:00
lbnesquik
2cea82cbcc Minor issues fix. 2018-10-05 03:55:56 +02:00
Anewbe
b32583c6ae Merge pull request #5620 from lbnesquik/master
Shotgun cycling animation framework
2018-10-03 13:30:36 -05:00
Anewbe
7ee626869e Merge pull request #5619 from SpadesNeil/toy-sounds
Text for handheld plushies when poked
2018-10-02 13:19:47 -05:00
Anewbe
b623d83667 Fixes some bloodloss bugs 2018-10-01 22:33:30 -05:00
Anewbe
5c66a64ae9 Merge pull request #5618 from Verkister/patch-15
Fixes grabs breaking defined mob pixel offsets.
2018-10-01 20:24:54 -05:00
lbnesquik
d14b45ea06 Add an animated rifle.
Nothing is particularly impressive except the animation.
2018-10-01 22:19:32 +02:00
lbnesquik
7b5b214ebb Shotgun cycling animation framework
This adds the possiblity for empty sprites on all shotgun/pump/thing and for cycling animations.
https://cdn.discordapp.com/attachments/407267031562453032/488751327531368481/2018-09-10_18-43-05.gif
This particular weapon was made by a friend so i'll wait for their permission before porting it in.
2018-10-01 15:26:22 +02:00
Spades
fffc2c390c Text for handheld plushies when poked
Plushies now make sounds when poked. Squeak!

Ported from https://github.com/VOREStation/VOREStation/pull/4231
2018-10-01 08:54:34 -04:00
Mechoid
3ab519a52b Custom RIG Framework (#5613)
* Framework for Custom RIG sprites.

* Fixfix
2018-09-30 16:49:34 -05:00
Verkister
5d9dc37cc0 Fixes grabs breaking defined mob pixel offsets.
Yeah.
2018-09-30 23:15:49 +03:00
Atermonera
b85c84f277 Merge pull request #5614 from Anewbe/autospray
Hyposprays can now have different sounds
2018-09-30 00:44:39 -07:00
Atermonera
33eacf5026 Merge pull request #5611 from Anewbe/phase_rifle
Phase rifle size correction
2018-09-28 19:36:45 -07:00
Anewbe
b0b3ad6039 Hyposprays can now have different sounds 2018-09-28 19:08:20 -05:00
Anewbe
f81f27ff4f Should fix the new bugs with webslinger spiders (#5612) 2018-09-27 17:20:28 -07:00
Atermonera
acf956eaca Merge pull request #5605 from Anewbe/species_tweaks
Species item slowdown changes
2018-09-27 15:28:12 -07:00
Anewbe
f530110ee2 Phase rifle size correction 2018-09-27 16:39:32 -05:00
Neerti
28724f3157 Fixes Circuitry Glasses.
Button in HUD should work now.
2018-09-25 22:21:35 -04:00
Neerti
c0e43d9cc1 Merge pull request #5607 from Anewbe/pose
Pose now shows up under descriptors
2018-09-25 02:35:04 -04:00
Anewbe
a5b26786ad Pose now shows up under descriptors 2018-09-24 18:42:03 -05:00
Anewbe
d21f1f9567 Species item slowdown changes 2018-09-24 16:27:41 -05:00
Anewbe
073597fc37 Merge pull request #5604 from Mechoid/Fix_My_Idiocy
Keys now actually exist again.
2018-09-24 16:23:31 -05:00
Anewbe
3f9896b0b5 Merge pull request #5590 from Mechoid/Statue_Stupidity
Make the Statue 'better'.
2018-09-24 16:07:57 -05:00
Anewbe
0fd9af6580 Merge pull request #5600 from Mechoid/Motherlode_2_Abuse_Strikes_Back
Adds a generic proc to the mining vendor to add custom / blank entries.
2018-09-24 16:07:34 -05:00
Mechoid
18e91702d2 Keys now actually exist again. 2018-09-24 13:21:38 -07:00
Atermonera
b8314c336c Merge pull request #5593 from Anewbe/machine_tweaks
Tweaks emitters and Pacman
2018-09-24 11:02:11 -07:00
Mechoid
37342fc2d6 Adds a generic proc to the mining vendor to add custom / blank entries. 2018-09-23 02:21:54 -07:00
Mechoid
b7231dc8cc Don't spawn things in Null please. 2018-09-23 00:24:34 -07:00
Mechoid
28d4f39aff Be Smart about damage things. 2018-09-22 17:59:24 -07:00
Mechoid
b3f40308ca Adds some Holy drinks, and Promethean-safe drinks / acclimators. (#5574)
* Adds some Holy drinks, and Promethean-safe drinks / acclimators.

* Carbon + Water + Oil = Sludge

* TRUEFALSE & * removed
2018-09-22 18:53:55 -05:00
Wickedtemp
21878523b1 Adds the Biopsy Scanner to the Surgery Kit (#5589)
* Adds the Biopsy Scanner to the Surgery Kit

Since it's actually used in a surgical operation, it should proooobably be in the kit. Iunno if the kit is really used here aside from antag shuttles, but they might as well have it.

* Added a missing comma

Missed a comma, might be what's causing issues. Iunno. It worked flawlessly in dream-maker.
2018-09-22 18:53:36 -05:00
Anewbe
a942e145b6 Tweaks emitters and Pacman 2018-09-22 18:45:57 -05:00
Atermonera
46f151745f Merge pull request #5581 from Anewbe/mining_toys
Technically adds the Ore Redemption Machine
2018-09-22 13:38:10 -07:00
Atermonera
b07144a7c8 Merge pull request #5587 from Anewbe/wind
Wind in storms slightly nerfed
2018-09-22 12:10:33 -07:00
Anewbe
a31813145f Psychiatric Medication Fix (#5588)
* Psychiatric medications are faster when ingested

* Psychiatric med fix
2018-09-22 12:08:20 -07:00
Atermonera
6289e91239 Merge pull request #5586 from Anewbe/height
Descriptors now properly respect species differences
2018-09-22 12:07:43 -07:00
Mechoid
86504d1e4d Make the Statue NOT entirely immortal. 2018-09-22 01:11:38 -07:00
Anewbe
c75741545a Descriptors now properly respect species differences 2018-09-20 19:30:25 -05:00
Anewbe
6e4a77f010 Boot knives fit in boots 2018-09-19 15:42:08 -05:00
Neerti
aec83fd4f2 Merge pull request #5577 from Anewbe/grilles
Fixes a couple of tool related oversight/runtimes
2018-09-19 16:08:37 -04:00
Neerti
bc331befd9 Merge pull request #5576 from Anewbe/dermal_implant_fix
Dermal implant doesn't cover hair
2018-09-19 16:08:28 -04:00
Neerti
b17b2f63ce Merge pull request #5578 from Anewbe/cuffs
Fixes hand and leg cuffs
2018-09-19 16:08:11 -04:00
Anewbe
3d4bed20c2 Merge pull request #5548 from Poojawa/pls-stop-moosic
Ports /vg/ instrument frame work, adds client based sound pref toggle.
2018-09-19 15:04:06 -05:00
Anewbe
d5979ec960 Merge pull request #5575 from Woodratt/09172018_spacesuitmess
Rig and Spacesuit additions
2018-09-19 15:00:30 -05:00
Woodratt
5a312e14d1 Update combat.dm 2018-09-19 12:11:11 -07:00
Anewbe
c35b99e315 Technically adds the Ore Redemption Machine 2018-09-19 02:04:10 -05:00