Commit Graph

17691 Commits

Author SHA1 Message Date
lbnesquik
5641b828c5 Move almost everythign food related into the kitchen module.
Not moving reagents and tools.
2018-10-05 02:56:36 +02:00
Anewbe
b32583c6ae Merge pull request #5620 from lbnesquik/master
Shotgun cycling animation framework
2018-10-03 13:30:36 -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
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
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
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
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
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
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
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
Anewbe
596e51da42 Dermal implant doesn't cover hair 2018-09-18 13:15:51 -05:00
Atermonera
c8dc627af4 Merge pull request #5573 from Mechoid/Blob2_Revenge_Of_The_Blob
More Blob modularity / Event-Manager compatability, Nests.
2018-09-18 11:11:51 -07:00
Woodratt
9f24c4eba2 Rig and Spacesuit additions
- Added the 'military' Rigsuit from Bay.
- Added 'pmc' rigsuits
- Added exploration and pilot voidsuits along with alternate sprites (alternate sprites done by Naidh)
- Addition of suit cyclers for exploration and pilot voidsuits

None of these suits are currently accessible in game outside of admin bus. Currently only the pilot voidsuits have other species sprites. Exploration suits are missing sprites for Teshari (Naidh made some for their alternates but I have to add them) and the rig suits are human only. This is to be fixed in the near future, just wanted to get the make workload actually in the game first.
2018-09-18 00:35:06 -07:00
Atermonera
f2ac15be91 Merge pull request #5511 from Anewbe/descriptors
Ports character physical descriptors from Bay
2018-09-17 11:21:28 -07:00
Atermonera
ee95a53d98 Merge pull request #5563 from Mechoid/We_are_going_to_Cyber_Space
Cybersuit is now a space rig.
2018-09-17 11:17:49 -07:00
Atermonera
77ef274b98 Merge pull request #5553 from Mechoid/VroomVroom
Vehicle Expansion 1: Zoom Harder
2018-09-17 11:14:54 -07:00
Mechoid
4fb5455fd3 Makes Blobs more useful. 2018-09-16 22:12:17 -07:00
Anewbe
17a5010f44 Signal pistol can be reloaded (#5566) 2018-09-16 17:23:39 -07:00
Anewbe
c12d7e25b0 Readds size traits 2018-09-13 17:22:11 -05:00
Neerti
3aca2c38e2 Yet Another Circuit Update (#5549)
* Circuit updates, adds new components, improves printer, new assemblies.

* Finishes powernet circuit.

* Adds wearable assemblies.

* Finialization before merging with GLOB port.

* Finishes circuit update, hopefully.

* Forgot to undo map.

* Removes debug output.
2018-09-12 20:51:32 -05:00
Mechoid
426d4b45f3 The cybersuit is now a space suit. 2018-09-11 19:59:00 -07:00
Mechoid
0651206a51 Refactor cargo trains, they're just normal trains now. Adds the Quad, and re-enables/fixes the Space Bike! 2018-09-08 23:05:08 -07:00
Atermonera
40a8a9ba15 Merge pull request #5550 from Anewbe/helmet_hair
Helmets now show only certain hairstyles
2018-09-08 11:02:20 -07:00
Cerebulon
d2cf9c7203 Adds new set of cyborg sprites for medical/science/default/security/combat (#5546) 2018-09-08 11:01:35 -07:00