Commit Graph

18004 Commits

Author SHA1 Message Date
Cameron653
eb6238f613 Removes duplicate heart
https://github.com/PolarisSS13/Polaris/blob/master/code/modules/organs/internal/heart.dm
2017-10-21 15:24:08 -04:00
Anewbe
6a52111680 Merge pull request #4116 from Neerti/10/20/2017_syndie_borgs_are_back
Syndicate Borgs II, Return of the Salt
2017-10-21 13:58:52 -05:00
Neerti
c1f971a1e2 Merge pull request #4120 from Anewbe/costume_tweaks
Improves Halloween costumes, tweaks the admin verb for equipping
2017-10-21 14:29:52 -04:00
MisterLayne
b7dcac5057 Adds more emotes. 2017-10-21 11:11:00 -04:00
Neerti
aa9231d0fa Update syndicate.dm 2017-10-21 11:02:05 -04:00
Neerti
083369c614 Update borghydro.dm 2017-10-21 10:42:53 -04:00
Belsima
5dcd04cfe8 Adjusts giant mobs. 2017-10-20 20:02:42 -04:00
Mechoid
d0d7f17b08 Allows the Flamethrower and Fireaxe to be held in the firebug suit's storage. 2017-10-20 14:44:32 -07:00
Anewbe
4034a0aaa7 Makes footsteps less common on walk intent 2017-10-20 16:13:46 -05:00
Anewbe
3f2d996f7d Improves Halloween costumes, tweaks the admin verb for equipping 2017-10-20 16:01:09 -05:00
Mechoid
1770d1ef76 Adds the Mercenary Fire-fighter suit. 2017-10-20 12:43:19 -07:00
Neerti
12ae485e48 Merge pull request #4117 from Anewbe/glass_bugfix
Should be able to transfer reagents between glasses again
2017-10-20 15:18:10 -04:00
Neerti
05f83497fd Merge pull request #4105 from Anewbe/event_manager
Does work on the event manager role again
2017-10-20 15:16:50 -04:00
mistyLuminescence
ae308a3a91 Reworks cryopod storage 2017-10-20 19:14:45 +01:00
Anewbe
52cbe08c76 Should be able to transfer reagents between glasses again 2017-10-20 12:56:07 -05:00
Neerti
9c0ac5ec2a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/20/2017_syndie_borgs_are_back 2017-10-20 13:26:06 -04:00
Neerti
1aff3fc8c0 Syndicate Borgs II, Return of the Salt
Adds an option in mercenary uplinks to purchase three different 'classes' of drones.
See PR for more details.
2017-10-20 13:01:45 -04:00
Anewbe
9135341847 Steals Bays modular armor, for later use 2017-10-19 23:32:33 -05:00
Mechoid
920e823a46 Fuel-Rod Gun, Minor fixes related. (#4103)
* A whole load of things.

* Fixes the SM Rod's travel distance.
2017-10-19 15:07:52 -05:00
Anewbe
04c393a953 Adds the Vatborn lore blurb, fixes some things. 2017-10-19 10:28:34 -05:00
Anewbe
79eb840538 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vatborn 2017-10-19 09:57:26 -05:00
mistyLuminescence
e76447a719 Loadout stuff, but done right! (#4094)
* Loadout and accessory path tweaks.

* updated: armbands

* except it's better now

* no ian shirt and psych medHUD, travis fixed?

* OKAY ROUND THREE
2017-10-19 09:36:15 -05:00
Anewbe
ef735ea89b Merge pull request #4098 from Neerti/10/15/2017_surface_stuff
Touches Up the Surface Somewhat
2017-10-19 09:36:03 -05:00
Anewbe
85274d501c Voidsuits breach more easily 2017-10-19 02:40:33 -05:00
Neerti
f726e96fe7 Merge pull request #4097 from Anewbe/mrate_static
Removes mrate_static on some chems
2017-10-18 23:59:05 -04:00
Anewbe
cad5ef12e7 Does work on the event manager role again 2017-10-18 20:00:01 -05:00
Neerti
4208cfb29d Merge pull request #4093 from Anewbe/hoodies
Touches up the hoodie sprites
2017-10-18 18:41:16 -04:00
Neerti
95d93dae00 Touches Up the Surface Somewhat
Changes the rock texture to hopefully be a bit better.  It's a recolored version of /tg/'s lavaland rock, and modified slightly to look less repetitive.
Ports the lavaland rock tile sprite entirely for future away missions.
Adds tree chopping down feature.  All trees now have health, and hitting it with things will reduce it.  Generally you need something sharp to have a chance of actually felling the tree.
Adds log material, which is obtained from chopping trees.  Hitting these with a sharp weapon converts them into two planks per log.  Can be used to build log walls but otherwise can't be used to craft, at the moment.
Ports /tg/ tree sprites.  Might have a use for them in away missions, who knows.
Makes crystals start anchored and glow.
Shoveling snow checks toolspeed now.
2017-10-18 12:04:39 -04:00
Anewbe
c11fee54a4 Removes mrate_static on some chems 2017-10-17 23:39:03 -05:00
Anewbe
90a1b1c851 Adds the NRTI hoodie 2017-10-17 14:19:08 -05:00
Anewbe
fcce3a3b58 Custom backpacks overwrite a worn backpack 2017-10-16 23:42:23 -05:00
Anewbe
4a6cf66183 Merge pull request #4087 from Mechoid/Efficient_Me_Fabricators
Fixes SCIENCE-fabs, Changes Mech-fab Sprite.
2017-10-16 23:01:43 -05:00
Spades
edfa947278 These are not Vorestation edits. (#4088)
Y'all are confusing the shit out of us.
2017-10-16 23:01:30 -05:00
Neerti
5af9c1971d Merge pull request #4077 from Anewbe/rings
Rings
2017-10-16 19:04:36 -04:00
Neerti
d42edb679b Merge pull request #4069 from Anewbe/costumes
Halloween Costume Outfits
2017-10-16 19:01:25 -04:00
Anewbe
d886e52ac3 Merge pull request #4080 from shazbot194/Synth_color
Synth Coloring
2017-10-16 17:55:24 -05:00
Neerti
9ae54fb2ac Merge pull request #4083 from Anewbe/trait_fix
Trait tweaks
2017-10-16 18:51:01 -04:00
Neerti
7b5f8bddd1 Merge pull request #4081 from Cameron653/512_FILTER_FIX
BYOND 512 Compiling Errors Fix
2017-10-16 18:47:47 -04:00
Mechoid
b43201aa79 Fixes the circuit printer and protolathe's material cost check as well. Updates this local to match Master. 2017-10-16 13:12:08 -07:00
Anewbe
4f86947108 Merge pull request #4079 from Mechoid/Organ_Harvesting_Not_Included
Prosthetic Organ Expansion
2017-10-16 14:21:19 -05:00
Anewbe
b14766ff92 Merge pull request #4078 from Mechoid/Projectile_Turretfunctions
Turret Targetting Update
2017-10-16 14:03:05 -05:00
Anewbe
fc59e6ee4c Merge pull request #4076 from Kholdstare34/outbox
Adds heads of staff cloaks, adds them to the loadout.
2017-10-16 04:27:30 -05:00
mistyLuminescence
f87a6d7d8c Adds a white robe. (#4074)
* - Adds a hooded robe themed after the Rishizirr, the mythological Tajaran angels of death said to shepherd the souls of those who die while snowed in to their designated afterlife. Perfect for Hallowe'en!

* Adds a hooded white robe.

* Fixes the white robe.

* Fixes the robe, again
2017-10-16 04:27:03 -05:00
Anewbe
03aa2d691d Trait tweaks 2017-10-16 01:07:56 -05:00
Anewbe
c2b7542c4e Merge pull request #4075 from Mechoid/NANOMACHINES_SON
Fixes roboheads being crammed onto flesh-bodies.
2017-10-16 01:04:18 -05:00
Anewbe
dc0d445383 Merge pull request #4073 from Mechoid/Knight_Of_The_Living_Shield
Dead bodies are no longer perfect shields.
2017-10-16 00:37:10 -05:00
Anewbe
f42457b997 Starts work on the Vatborn Human species 2017-10-15 23:26:22 -05:00
killer653
0080539924 More fixes 2017-10-15 19:54:50 -04:00
killer653
0f20177c5f Some more fixes 2017-10-15 19:02:26 -04:00
killer653
3cd3054811 Fixes filter being used, which prevented compiling 2017-10-15 19:01:55 -04:00