Commit Graph

14745 Commits

Author SHA1 Message Date
Neerti
4e721965cf Merge pull request #2552 from Anewbe/burn_pain
Lessens the amount of pain from burns
2016-09-26 16:36:20 -04:00
Neerti
8d857eaa0e Merge pull request #2544 from Anewbe/emp_slug
Adds emp shotgun shells, not yet obtainable.
2016-09-26 11:52:27 -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
PsiOmegaDelta
c7aa3cc48a Clears the appearance flag for multi-tile objects. 2016-09-25 19:40:11 +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
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
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
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
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
redstryker
adf4d6a00e Shoes 2016-09-21 18:08:52 -04:00
Yoshax
653610e194 Adds the ability to apply pressure to bleeding wounds 2016-09-21 22:22:47 +01:00
Yoshax
95533dd3cb Long, time-consuming not one-line fix 2016-09-21 17:16:51 +01:00
PsiOmegaDelta
79baa0258e Tweaks vent crawling.
The ability to ventcrawl is now checked by the /handle_ventcrawl() proc, making it possible to properly check before and after the do_after() call.
Moves various checks into the base can_ventcrawl proc.
Now lists the first object that prevents a mob from ventcrawling, making it easier to correct the exception list.
Removes the issmall() check, instead checks if the crawling mob has the relevant verb. Fixes #14081.
2016-09-21 17:16:12 +01:00
Zuhayr
18c2f33eab Ported ventcrawling from vg. 2016-09-21 17:16:03 +01:00
Yoshax
fbf645afd9 Removes a stray world << 2016-09-21 04:44:11 +01:00
Yoshax
22e46e08bb Adds shanking 2016-09-21 03:34:51 +01:00
redstryker
840801c684 Ripped Jeans (And White Shorts) 2016-09-20 21:42:25 -04:00
Anewbe
a13f438836 Tweaks Riot armor 2016-09-20 19:31:21 -05:00
Anewbe
8693f7b89b Merge pull request #2509 from SinTwo/Fixes-9-14-16
Fixes
2016-09-20 18:55:02 -05:00
Anewbe
02032690b2 Merge pull request #2504 from Neerti/9/19/2016_daily_circuits
Circuit UI and Assembly Tweaks
2016-09-20 18:25:03 -05:00
Neerti
0a389a418b Revert "Ported ventcrawling from vg." 2016-09-20 17:21:58 -04:00
Neerti
72cc5f0646 Circuit UI and Assembly Tweaks
Adds new drone assembly, which has stats between the medium and large assembly.  Sprites by Mechoid.
Assemblies now have a light UI when examined while opened, which displays what's inside, as well as how close to the cap for parts or complexity you are getting.  Click the names of a component to open the wiring interface for that component.  You can also rename each component from the UI.  Bonus:  Having multiple components of the same name will no longer appear as one component.
Adds ability to rename the assembly, using the new UI.
2016-09-20 13:40:54 -04:00
Anewbe
0bb15b2732 Merge pull request #2502 from Neerti/9/18/2016_shotgun_tweak
Shotgun Reloading Tweak
2016-09-18 22:38:46 -05:00
Neerti
05954c7fb9 Shotgun Reloading Tweak
Adds ability to hit a shotgun or similar weapon with a container containing ammo, to load said ammo into the shotgun one at a time automatically, instead of having to play inventory tetris, as requested by some people.
2016-09-18 23:31:09 -04:00
Neerti
8e46089350 Merge pull request #2500 from MagmaRam/medbotfix
Fixes not being able to put things in medkits.
2016-09-18 21:21:43 -04:00
MagmaRam
4d239d27a3 Fixes not being able to put things in medkits. 2016-09-18 19:37:20 -05:00
Anewbe
57a98b30fd Merge pull request #2498 from Neerti/9/18/2016_circuits2
Adds EPv2 Circuit
2016-09-18 18:12:38 -05:00