Commit Graph

14383 Commits

Author SHA1 Message Date
Neerti d659dd9208 Merge pull request #2171 from redstryker/Flannel_fix
Fixes Flannels.  Also adds a Brown Flannel
2016-07-22 19:22:44 -04:00
redstryker dccc6f5713 Fixes Flannels. Also adds a Brown Flannel 2016-07-22 16:09:51 -04:00
Neerti c185b7c22b Merge pull request #2165 from Yoshax/removebucklecuffing
Makes handcuff resisting take priority over unbuckle resisting by removing bucklecuff resisting
2016-07-22 14:21:31 -04:00
Yoshax b2a704904c Removes adverse effects to Tajaran drinking coffee 2016-07-22 18:07:08 +01:00
Yoshax f493ac7e17 Removes debug lines 2016-07-22 15:53:54 +01:00
Yoshax 013a509b17 Makes handcuff resisting take priority over unbuckle resisting by removing bucklecuff resisting 2016-07-22 15:48:47 +01:00
Neerti 3e19b337de Merge pull request #2157 from redstryker/SG_Logo
Adds SolGov Logo to Paperwork and SolGov Stamps
2016-07-22 01:26:03 -04:00
Neerti d12e9ac5fa Merge pull request #2161 from Yoshax/bigtrio
Makes FBP burn repair actually work
2016-07-22 01:25:47 -04:00
Yoshax 3a953d895f Fixes undislocation 2016-07-22 04:19:49 +01:00
Yoshax d4d76b07a7 Makes FBP burn repair actually work 2016-07-22 03:57:29 +01:00
redstryker 2e25267791 Adds SolGov logo to Paperwork and SolGov Stamps 2016-07-21 15:29:08 -04:00
Mark9013100 f950b7ea23 Adds the corporate berets to loadout 2016-07-19 22:07:57 -04:00
Jon 31e66c0037 Fixes vomiting. 2016-07-18 19:12:12 +01:00
EmperorJon 910ce2f584 Merge pull request #2144 from Neerti/7/16/2016_teshari_fix
Teshari Now Have Upper Bodies
2016-07-17 09:37:40 +01:00
Neerti 9483f5b231 Merge pull request #2143 from Anewbe/wring_of_drones
Fixes grammar error
2016-07-16 23:28:15 -04:00
Neerti ef8a9dd5e0 Teshari Now Have Upper Bodies
Fixes a long standing bug.  Turns out BP_CHEST is undefined and the compiler never caught it for some reason.
2016-07-16 23:26:23 -04:00
Anewbe 217713d306 Fixes grammar error 2016-07-16 21:29:02 -05:00
EmperorJon d533ef743b Merge pull request #2134 from Neerti/7/14/2016_accuracy_penalties
Adds accuracy penalties for certain detrimental states.
2016-07-16 17:04:38 +01:00
Neerti ba33340ce0 Merge pull request #2099 from Anewbe/tricord_nerf
Halves the effect of Tricordrazine
2016-07-15 07:07:14 -04:00
Neerti 666d56d794 Merge pull request #2131 from Anewbe/meatier_limbs
Increases the amount of damage limbs can take
2016-07-15 07:04:59 -04:00
Neerti 728cd2bdd3 Adds accuracy penalties for certain detrimental states.
Being blind gives an additional 75% chance to miss.
Having blurry eyes gives an additional 15% chance to miss.
Being confused gives an additional 30% chance to miss.

This was done so that if the PR for flashes to apply these effects instead of a stun are merged, they would hopefully still be useful if someone is trying to robust you.  Melee and ranged penalties should be equivalent, despite different numbers due to how the different code works.
2016-07-14 06:19:49 -04:00
Datraen a1e278e978 Fixes #1144
Parses text rather than saving icon strings. Might be better to save the strings in the future into variables, done at the toggle level for custom items.
2016-07-13 21:59:34 -04:00
Anewbe d991c360d3 Increases the amount of damage limbs can take 2016-07-13 18:58:39 -05:00
Neerti f9bf949098 Merge pull request #2120 from Anewbe/organ_split
Splits internal organs into separate files
2016-07-13 19:56:42 -04:00
Neerti b0321958d1 Merge pull request #2115 from Yoshax/ED-Emag
Ensures security robots can be properly emagged
2016-07-13 19:14:23 -04:00
Neerti f3cb92d327 Merge pull request #2110 from Anewbe/tox_buff
Speeds up toxin
2016-07-13 19:11:01 -04:00
Neerti d7a9a4339c Merge pull request #2116 from Yoshax/droppods
Refactors the drop pod contents to make them a tad more useful and in general more iteresting
2016-07-13 19:10:28 -04:00
Yoshax 517dd50038 Merge pull request #2128 from Neerti/7/13/2016_younger_synths
Allows FBPs to potentially have different age limits.
2016-07-13 23:53:22 +01:00
Neerti 6e281def77 Allows FBPs to potentially have different age limits.
Cyborgs have their minimum be equal to their species' minimum, and maximum be their species maximum plus twenty years.
Posibrains have a minimum of 1, and a maximum of 220, as discussed by EmperorJon.
Digital brains (drones) have a minimum of 1 and maximum of 150, as discussed by Spookerton.
2016-07-13 18:25:07 -04:00
Yoshax fd9e8616e3 Ensure laser warfare drop pod has laser proof armor 2016-07-13 20:10:44 +01:00
Yoshax dc7f0d6434 Merge pull request #2126 from Neerti/7/13/2016_health_hud_fix
Health Hud Prosthetics Fix
2016-07-13 20:07:16 +01:00
Neerti bfd838fd5c Health Hud Prosthetics Fix
Adds two lines of code I forgot to port, hopefully should make the prosthetic icons for the HUD be correct now.
2016-07-13 14:46:21 -04:00
Neerti 334f24730e Merge pull request #2124 from Yoshax/hair
Adds a new hairstyle
2016-07-13 14:41:46 -04:00
Neerti f2e0462dcb Merge pull request #2123 from Yoshax/languages
Makes languages great again
2016-07-13 14:38:33 -04:00
Yoshax f2f6ca54f2 Adds a new hairstyle 2016-07-13 18:34:46 +01:00
Yoshax 402e046576 Fixes languages not being properly added to mobs 2016-07-13 18:12:15 +01:00
Yoshax cda6508001 Merge pull request #2119 from Anewbe/burning_bodies
Burning bodies no longer burn forever
2016-07-13 17:13:16 +01:00
Yoshax 3df18c2870 Merge pull request #2111 from Serithi/LAVENDER_UNBORKIFICATION
Properly alphabetizes lavender in the vending machines.
2016-07-13 17:10:10 +01:00
Anewbe 7946349294 Splits internal organs into separate files 2016-07-12 22:32:09 -05:00
Anewbe 811a7be362 fire_stacks decrease over time 2016-07-12 21:27:04 -05:00
woodratt 47ab279b9b 1.5.5 Fancy Green Uniforms
- Adds, one green suit and formal jacket.
- One new military like jacket that can be selected from the loadout.
- A new holster type, leg holster. Can be selected from the loadout as well.
- Cleaned up a couple of the sprites for outfits that have ties (rolled up sleeve versions on a couple still had the tie sprite).
2016-07-12 17:19:39 -07:00
Yoshax 51876c97fe Adjusts the crates and adds one more 2016-07-12 22:53:20 +01:00
Yoshax 628a878199 Refactors the drop pod contents to make them a tad more useful and interesting 2016-07-12 22:45:15 +01:00
Yoshax 44d0ee657c Ensures bots are only emaggable once 2016-07-12 21:40:07 +01:00
Yoshax 9689dd1e17 Ensures security robots can be properly emagged, also makes them stronger when emagged 2016-07-12 20:08:25 +01:00
Serithi 8ad6f5e626 Properly alphabetizes lavender in the vending machines. 2016-07-11 20:16:56 -07:00
Anewbe 52a7c0d797 Speeds up toxin 2016-07-11 22:04:15 -05:00
Yoshax d4e8589d8f Ports Mloc's HUD fixes from Bay and further fixes ours because of code differences 2016-07-11 16:35:21 +01:00
Neerti 8307cff728 Merge pull request #2106 from Yoshax/ammo_states
Add more states to 10mm mag sprites
2016-07-11 04:07:52 -04:00
Neerti f9cfdebb45 Merge pull request #2105 from Yoshax/spookyghosts
Refactors wipe_core(), extends function to pAIs
2016-07-11 04:07:44 -04:00