Commit Graph

24037 Commits

Author SHA1 Message Date
Neerti
35896acee9 Merge pull request #2545 from Anewbe/cargo
Fixes #2536
2016-09-26 11:52:02 -04:00
woodratt
3915842f7b Trenchcoats and more
- Added unarmored versions of the grey and brown trenchcoats to the loadout.
- Added their accompanying fedoras as well.
- Added a unarmored variant of the 'gentlemen's coat' to the loadout as well, called grey jacket.
2016-09-25 23:40:28 -07:00
Anewbe
0fce0dee00 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into emp_slug 2016-09-25 23:53:51 -05:00
Anewbe
e65b0851f3 Adds emp shotgun shells, not yet obtainable. 2016-09-25 23:52:30 -05:00
Anewbe
5be382a59c Lessens the amount of pain from burns 2016-09-25 23:21:59 -05:00
redstryker
ae1d03095e Colored Armbands 2016-09-25 22:50:58 -04:00
Neerti
ddaec11afd Merge pull request #2543 from Hubblenaut/master
Appearance Flags
2016-09-25 22:22:22 -04:00
Anewbe
b7a5147188 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into parapen 2016-09-25 21:16:24 -05:00
Anewbe
9092c11ce6 Removes parapen from SpecOps crate 2016-09-25 21:16:07 -05:00
redstryker
f47c97829d Author Alt Title 2016-09-25 21:59:07 -04:00
Anewbe
f9144ed039 Supermatter manual is accurate and concise 2016-09-25 20:44:11 -05:00
Anewbe
623ad86511 Fixes cargo exploit 2016-09-25 19:59:47 -05:00
PsiOmegaDelta
c7aa3cc48a Clears the appearance flag for multi-tile objects. 2016-09-25 19:40:11 +02:00
PsiOmegaDelta
4bc630d122 atom_movables now have the TILE_BOUND appearance flag.
Fixes #13606 and friends.
2016-09-25 19:40:00 +02:00
Anewbe
b92334a9ac Merge pull request #2542 from Eearslya/fix2453-captain-replacement
Fix a few lingering references to "Captain"
2016-09-25 11:21:12 -05:00
Anewbe
9040e714b8 Merge pull request #2541 from Neerti/9/25/2016_circuits_yet_again
Adds More Circuits
2016-09-25 11:02:18 -05:00
Eearslya
c7ebb6c185 Fix a few lingering references to "Captain" 2016-09-25 08:58:37 -07:00
Neerti
162af1fbc3 Adds More Circuits
Drone assembly can be made in RnD now.
Adds injector component, which does what it implies, and injects a reagent into someone or something nearby.
Adds reagent pump, similar to the above but meant for moving reagents around different containers, inside or outside of the machine.
Adds adjacent locator, which can find specific objects next to the machine.
Adds two flavors of the reagent storage component, which does what it says.  The second variant is a cryo-beaker version.
2016-09-25 11:52:39 -04:00
MagmaRam
7084236b4e Fixes emitter beam sprites 2016-09-25 00:43:52 -05:00
Anewbe
cab561ef78 Merge pull request #2538 from Neerti/9/24/2016_port_of_port_of_circuits
Ports the Port of Integrated Circuits
2016-09-24 20:40:44 -05:00
Neerti
40eff1ccc1 Merge pull request #2533 from redstryker/MakingSomePurseTheirLips
Handbags
2016-09-24 21:38:53 -04:00
Neerti
b8df2a03ff Fixes some problems from port, mainly ref stuff. 2016-09-24 20:01:55 -04:00
Anewbe
70fa92cd5a Merge pull request #2534 from Eearslya/limit-supply-orders
Fix supply shuttle overflow
2016-09-24 17:09:56 -05:00
Neerti
801a162ba7 Ports the Port of Circuits
Ports PsiOmegaDelta's port of integrated circuits, which has several improvements in code quality.
Ports a few small things like the weakref datum and some macros.
2016-09-24 18:06:11 -04:00
Neerti
6f8603e042 Pulling & Size Fixes
Fixes inability for mobs to pull certain structures like mining crates.
Fixes w_class numbers I missed.
2016-09-24 16:18:32 -04:00
Eearslya
ce19948fd1 Excessive supply orders will no longer be lost 2016-09-24 05:26:11 -07:00
redstryker
6ab9bee9ee Fixed Var 2016-09-24 00:34:11 -04:00
redstryker
83b080f65c Handbags 2016-09-24 00:20:48 -04:00
Anewbe
57c5de6d1c Merge pull request #2532 from redstryker/SomeoneShootMe
Colorable Flats
2016-09-23 20:36:22 -05:00
Kholdstare34
d5a849a3aa Adds the "Zieglertail" hairstyle. 2016-09-23 20:03:49 -05:00
redstryker
a1c4dc58ae Colorable Flats 2016-09-23 20:32:10 -04:00
Kholdstare34
a37dcc8be2 Adds the "Oxton" hairstyle. 2016-09-23 16:38:45 -05:00
Neerti
40ada04530 Revert "Revert "Revert "Revert "Adds hub passwordu"""" 2016-09-23 16:15:30 -04:00
redstryker
58a543b50b Removed Underscores to Fix Error 2016-09-23 15:35:32 -04:00
redstryker
34176fa441 Fixed some errors and added it to technomancer sounds. 2016-09-23 15:29:20 -04:00
redstryker
c24cd8259a Sounds for Bone Breaks V2 2016-09-23 15:22:04 -04:00
Spades
d6090c5abc Heavy Armor values reworked for FUN™ 2016-09-23 14:01:05 -04:00
Anewbe
2b81c0ed63 Merge pull request #2525 from Neerti/9/21/2016_w_class_defines
Centralizes weight class / inventory definitions
2016-09-22 16:46:05 -05:00
Neerti
828dacf485 Centralizes weight class definitions
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.

Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it.  This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files.  In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.

The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
2016-09-22 00:51:51 -04:00
Anewbe
296d88114e Merge pull request #2517 from Yoshax/smokes
Makes cigs branded too
2016-09-21 20:45:52 -05:00
Neerti
130357e29c Merge pull request #2410 from SpadesNeil/elevator-fix
Fixes Elevator terrain behavior.
2016-09-21 18:56:39 -04:00
Neerti
b5c2d6bcbe Merge pull request #2522 from Yoshax/organpressure
Adds the ability to apply pressure to bleeding wounds
2016-09-21 18:53:18 -04:00
Neerti
038fe05a47 Merge pull request #2515 from Yoshax/vents
Ported ventcrawling from vg.
2016-09-21 18:39:34 -04:00
Neerti
1b098b08fd Merge pull request #2513 from Yoshax/wheresyourtool
Adds shanking
2016-09-21 18:37:23 -04:00
Anewbe
debddc7b03 Merge pull request #2523 from redstryker/Shooo!SHOOO!
Shoes
2016-09-21 17:23:36 -05:00
Anewbe
172ea8ce9c Merge pull request #2512 from redstryker/TimeToBeEdgy
Ripped Jeans (And White Shorts)
2016-09-21 17:18:17 -05:00
redstryker
adf4d6a00e Shoes 2016-09-21 18:08:52 -04:00
Anewbe
a55698ef50 Merge pull request #2519 from SpadesNeil/commando-fix
Fixes Death Commando having Loyalty implants
2016-09-21 16:48:29 -05:00
Yoshax
653610e194 Adds the ability to apply pressure to bleeding wounds 2016-09-21 22:22:47 +01:00
Spades
b6a288ed35 Removes implants from Deathsquad 2016-09-21 12:51:09 -04:00