Commit Graph

28935 Commits

Author SHA1 Message Date
Spades
def5fadfa9 Merge pull request #2327 from VOREStation/Cameron653-patch-2
Gives prometheans the drain trait
2017-10-20 02:07:09 -04:00
Cameron653
02e61a6f04 Update station_special_abilities_vr.dm 2017-10-19 21:46:47 -04:00
Cameron653
b270124ae7 I accidentally reversed the messages 2017-10-19 21:43:41 -04:00
Cameron653
1f78750513 Gives prometheans the drain trait
Because why not
2017-10-18 21:42:20 -04:00
Cameron653
35afdc29c9 Fixes a 512 compile error. 2017-10-17 23:40:07 -04:00
Cyantime
231859ae27 Fixes the sizegun's origin_tech 2017-10-17 19:15:43 -04:00
Verkister
a5146769e0 Fixes a game breaking conflict related to disabled polaris trait system 2017-10-17 13:27:20 +03:00
Verkister
23b81fa0ed Fixes the special type tails using wrong blend mode.
-The ones using effects/species_tails_vr.dmi
-Unathi, tajaran, sergal(old), akula, nevrean, tesh, fox, fennec.
2017-10-17 09:36:12 +03:00
killer653
280722332b Part 2 2017-10-16 22:17:14 -04:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04: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
Cameron653
266e300d27 Merge pull request #2306 from saysage/master
Hotfix for custom clothes
2017-10-16 16:47:50 -04: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
saysage
934288aa9e Update custom_clothes_vr.dm 2017-10-16 16:02:35 +03: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
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
shazbot194
d199d4caf7 Adds in the option to color all synth parts and two sets of parts
As the titles says
2017-10-15 14:56:14 -08:00
killer653
61e1333f88 Adds a "finalize" variable and toggle for drain. 2017-10-15 18:31:28 -04:00
Mechoid
a9e9236d7f Prosthetic Organ Expansion 2017-10-15 15:12:51 -07:00
Cameron653
4716e4900d Merge branch 'master' into SUCCUBUS_DRAIN 2017-10-15 17:46:52 -04:00
Mechoid
9a04744ab6 Turrets detect targets through metal foam. 2017-10-15 13:48:38 -07:00
Spades
9e5594d7cf Merge pull request #2291 from Verkister/excercise
Makes the metabolism traits affect movement drain and weight gain/loss.
2017-10-15 16:32:47 -04:00
Spades
056ed4ca34 Merge pull request #2301 from Screemonster/revivemarkings
reapplies markings after revive for human mobs
2017-10-15 16:32:07 -04:00
Spades
eb9979163a Merge pull request #2300 from Screemonster/bugfixeslol
Xenochimera tweaks
2017-10-15 16:23:15 -04:00
Spades
d2ffc7c4f1 Merge pull request #2297 from saysage/master
JackNoir413 custom clothes
2017-10-15 16:22:58 -04:00
Spades
10069d1096 Merge pull request #2293 from VOREStation/Cameron653-patch-2
Logs stepping on people.
2017-10-15 16:21:49 -04: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
elgeonmb
9213d36bfb Adds new names to the NT ship list (#4064)
* adds new names to the NT ship list

a bunch of overlooked scientists, also Jans and Friede of the "you must be this smart to ride this ride" positronic test

* removes duplicate tesla
2017-10-15 15:04:26 -05:00
Kholdstare34
becc2e4290 Adds heads of staff cloaks, adds them to the loadout. 2017-10-15 15:02:25 -05:00
Cameron653
dd18ee66fd Update station_special_abilities_vr.dm 2017-10-15 15:25:22 -04:00
Cameron653
3235b77eaa Update station_special_abilities_vr.dm 2017-10-15 15:22:31 -04:00
Mechoid
e21b65ec85 Nails the Parentheses back on. 2017-10-15 11:13:46 -07:00
Mechoid
ee4df4f862 Fixes roboheads being crammed onto flesh-bodies. 2017-10-15 11:01:20 -07:00
killer653
2673025daa Removes halloss, adds digestion check 2017-10-15 11:30:19 -04:00
Screemonster
fc103186cb removes a scree fluff item 2017-10-15 10:08:27 +01:00
Screemonster
5b03f953f1 reapplies markings after revove 2017-10-15 09:32:46 +01:00