Commit Graph

13289 Commits

Author SHA1 Message Date
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
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
Mechoid
8939d21014 Stops MMIs created with a ghosted brain from being put into cyborgs. (#4110)
* Stops MMIs created with a ghosted brain from being put into cyborgs.

* Fixes a typo and wording.
2017-10-19 13:59:06 -05:00
Belsima
aacb9d4c04 Updates chaplain files. (#4102)
* Updates chaplain files.

* Talmudic, not Tulmudic.
2017-10-19 09:36:40 -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
cad5ef12e7 Does work on the event manager role again 2017-10-18 20:00:01 -05: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
72ab35f6f9 Merge pull request #4085 from mistyLuminescence/cargonialandicallmyhome
Sell thaler for cargo points!
2017-10-17 15:49:07 -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
elgeonmb
36fa36586a fixed double periods when ghost-texting 2017-10-16 19:41:30 -07:00
Neerti
5af9c1971d Merge pull request #4077 from Anewbe/rings
Rings
2017-10-16 19:04:36 -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
83eb259080 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Efficient_Me_Fabricators 2017-10-16 12:03:44 -07:00
Anewbe
b14766ff92 Merge pull request #4078 from Mechoid/Projectile_Turretfunctions
Turret Targetting Update
2017-10-16 14:03:05 -05:00
Mechoid
4a71de6b62 Mech and Prosthetic Fabricators now check to make sure they have the correct amount of material, respecting upgrades, rather than the base object cost. 2017-10-16 12:02:46 -07:00
mistyLuminescence
242b0dba20 Sell thaler for cargo points! 2017-10-16 18:58:07 +01: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
killer653
fb8ba69ada Fixes all the other stuff 2017-10-15 20:56:13 -04: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
Mechoid
9a04744ab6 Turrets detect targets through metal foam. 2017-10-15 13:48:38 -07:00
Anewbe
35dd1a957e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into rings 2017-10-15 15:07:21 -05:00
Anewbe
3c2831e5d9 Adds rings 2017-10-15 15:05:52 -05:00
Ansari
768dc2d7c0 Port over Chemistry bag from Paradise (#4067)
* Add in chemistry bag from Paradise, based on /tg/ bag. Add it to biogenerator. Add it to wardrobe.

* Make itemsize large so it cannot be put in backpack. Slowdown = 1.
2017-10-15 15:04:56 -05:00
Belsima
cdb93fb7f8 fixes biogenerator grammar (#4063) 2017-10-14 20:42:59 -05:00
Neerti
0a3d85647a Merge pull request #4011 from Anewbe/railgun
Ports Bay's railguns, and assorted gun sprites
2017-10-14 01:43:45 -04:00
Neerti
e8edcfb40e Merge pull request #4059 from Anewbe/tunguska
Comments out the Tunguska spawn chance, in preparation for the new map
2017-10-14 01:41:40 -04:00
Mechoid
56ec5ec94c Adds three flame-themed illegal Mech weapons and more. (#4058)
* Adds three flame-themed illegal Mech weapons. Allows anything using apply_effects to be incendiary and ignite/apply firestacks. Also absolute-paths the spilled fuel effects.

* Removes world << because I'm a good coder honest.

* Why does Git do this for no reason.
2017-10-13 23:32:52 -05:00
Belsima
e61efc752a more gammers (#4052)
* Update medsci.dm

* Update miscellaneous.dm

* Update arcade.dm

* Update transform.dm

* Update implanter.dm

* Update shuttle_console.dm
2017-10-13 23:32:22 -05:00
Anewbe
f9fd492caf Merge pull request #4060 from Neerti/10/13/2017_balling_out_of_control
Adds the Ionic Rapier
2017-10-13 23:31:38 -05:00
Anewbe
165ad5f839 Removes the loyalty implanting from CD and IAA 2017-10-13 18:07:13 -05:00
Anewbe
15ece5cd98 Merge pull request #4042 from MisterLayne/10/10/2017_AddsTRays
Implements new T-Rays
2017-10-13 09:49:28 -05:00
Spades
a244d50058 Sensible Job Titles (#4026)
* Sensible Job Titles

Basically #3986 except condensed to the ones that were actually good,
plus one more.

- Gardener is now Botanist. Gardener has been moved to an alt title.
This is more fitting for what the role actually does. Besides, who calls
them the gardener? I call them botanists.
- The alt title Commander is now Security Commander, to avoid further
confusion.
- Research Director is now Research Supervisor by default which was
formerly an alt-title. Head of Research has been added as an alt title
in its place. Research _Director_ has been removed entirely. Really,
either of these would be nice as the new main title.

I thought about changing "Colony Director" to "Site Director" while I
was at it, but it's a self sufficient facility no matter how you look at
it, so it's a colony.

* ¯\_(ツ)_/¯
2017-10-13 09:28:06 -05:00
Neerti
a8513844ec Adds a Trait system (#4048)
* Works on trait system, wip.

* Finalizes traits.
Fixes a few bugs with medical machines assuming a max health of 100.
2017-10-13 01:17:39 -05:00
Neerti
0e57b66f6a Adds an Esword subtype that wrecks synthetics.
Ports /tg/'s esword and double esword sprites, both item and inhands.
Hivebot isSynthetic() now returns true.
2017-10-13 02:17:27 -04:00
Anewbe
7fc9e1a60b Comments out the Tunguska spawn chance, in preparation for the new map 2017-10-13 00:51:16 -05:00
Neerti
e582a52e91 Merge pull request #4047 from Anewbe/cloning_machine_fix
Should make upgraded cloners spit out clones again
2017-10-13 01:25:30 -04:00
Belsima
e97124bb6c Minor grammar fixes + cold protection. (#4044)
* Removes extra space.

* Grammar fixes + cold protection.
2017-10-12 22:51:16 -05:00
Anewbe
069adbb538 Ids should have accounts now 2017-10-12 17:01:20 -05:00
Anewbe
332bcbd114 Fixes job access 2017-10-12 15:27:18 -05:00
Belsima
3069df74a4 Spelling + drone (#4050) 2017-10-12 11:14:46 -05:00
Belsima
ad9d876922 they spelled it wrong (#4049) 2017-10-12 11:14:30 -05:00
Anewbe
755ac361bb Should make upgraded cloners spit out clones again 2017-10-11 22:49:23 -05:00
Anewbe
dea7346b94 Fixes the autologging items in antag records 2017-10-11 21:16:18 -05:00
Neerti
7cafd7d239 Merge pull request #4002 from Anewbe/outfits
Ports Bay's outfit system
2017-10-11 22:00:45 -04:00
MisterLayne
392aa1d8bc Makes the new T-Ray Scanners available 2017-10-11 17:11:49 -04:00
Neerti
d848197534 Merge pull request #4029 from Anewbe/skeletons
Adds Skeletons for background use
2017-10-11 14:48:41 -04:00