Commit Graph

18745 Commits

Author SHA1 Message Date
killer653
7a3bf3cd89 More edits 2017-11-04 13:45:26 -04:00
killer653
11c195debb Polaris Sync 2017-11-04 13:37:13 -04:00
Spades
225932aa5e Merge pull request #2412 from Verkister/previewscales
Adds scaling to character previews!
2017-11-04 13:08:44 -04:00
Spades
7ff4a6434e Merge pull request #2410 from Cyantime/reagentratios
Reagent generator implants now support multiple reagents at once.
2017-11-04 13:08:35 -04:00
Spades
8481082982 Merge pull request #2411 from Verkister/niftf
Makes species TF not destroy NIFs.
2017-11-04 13:07:43 -04:00
Spades
11038d20d5 Merge pull request #2406 from VOREStation/Cameron653-patch-1
Gives akula rip & tear
2017-11-04 13:07:02 -04:00
Spades
59b13ab098 Merge pull request #2387 from Cameron653/WING_FLIGHT
Allows flight with wings.
2017-11-04 13:06:52 -04:00
Verkister
5ea0ffe83e Evens out the spacing and lines the bottom with the background tiling 2017-11-04 14:48:27 +02:00
Verkister
32dd9c4e0d Adds scaling to character previews!
-How cool is that?!
-Also centers the icons so they don't push each other out of frame.
2017-11-04 13:52:22 +02:00
Verkister
f0818789a4 Makes species TF not destroy NIFs.
-Also affects to other means of species changes with organ list rebuilds.
2017-11-04 11:30:30 +02:00
Cyantime
d5f582013f Reagent generator implants now support multiple reagents at once. 2017-11-04 01:04:37 -04:00
killer653
0091693180 Missed these 3 2017-11-03 18:24:37 -04:00
killer653
42c8d39def Fixes issues 2017-11-03 18:23:20 -04:00
Anewbe
0c6a93e38c Merge pull request #4203 from Verkister/loadandblend
Enables the combo blend mode for most colorable loadout gear.
2017-11-03 15:11:37 -05:00
Anewbe
fce9fe2c72 Merge pull request #4188 from Atermonera/VR_2
Virtual Reality
2017-11-03 15:10:53 -05:00
Anewbe
af21d68eea Merge pull request #4192 from Wickedtemp/Wickedtemp-Hypovial
Adds the Vial-Based Hypospray
2017-11-03 15:10:43 -05:00
Mechoid
d81b1b2cba Merge pull request #4108 from Anewbe/more_dangerous_voidsuits
Voidsuits breach more easily
2017-11-03 08:47:27 -07:00
Neopatra
2f575ce971 Fixed Deathbell Color
Does that. Fixes Color.
2017-11-02 21:38:00 -04:00
Neopatra
6e864d6492 Adds Deathbell Recipie
Makes Deathbells mixable.
2017-11-02 21:21:13 -04:00
Neopatra
946329df87 Adds Deathbell Drinks
Adds Serana Te'saln's Deathbells to the code.
2017-11-02 21:14:18 -04:00
Cameron653
7de867d915 Gives akula rip & tear 2017-11-02 21:09:22 -04:00
Verkister
26ea6ec92d Enables the combo blend mode for most colorable loadout gear.
-The most meaning the colorable uniforms, suits, gloves, shoes, headgear, earwear, and accessories.
-Only affects mob icons for now, the inventory/floor icons still in old blend.
-Sort of a framework for possible additional options to come.
-Also messed around with some other stuff such as adding on-ear icons to the rest of the flower pins and bows, and made the base icons for the beanies lighter than the middle gray they were.
2017-11-02 15:33:52 +02:00
Atermonera
28e7426597 Hug gender (#4195)
* Revert "Update #3? 4?"

* Revert "Revert "Update #3? 4?""

* Hug doesn't reveal gender

* Wrong logic
2017-11-02 01:00:05 -05:00
Belsima
28ab1e51f3 Removes some loadout items that have colorable versions. (#4173)
* Removes the 5000 flats options.

* Removes the 5000 hair flower pin options.
2017-11-01 22:19:20 -05:00
Anewbe
6abe54c323 Merge pull request #4189 from Verkister/comboblendoo
Converts colorable species into the combo blend mode.
2017-11-01 22:18:47 -05:00
Neerti
df7c7ead5f Merge pull request #4182 from Anewbe/rerobust_simple_mobs
Adjusts simple mobs
2017-11-01 23:11:24 -04:00
Neerti
9bb5db3755 Merge pull request #4187 from Anewbe/electrocute_act
Improves electrocute_act, adds ELECTROCUTE damage type
2017-11-01 23:11:07 -04:00
Anewbe
67792ad5b5 Adds a necessary rand 2017-11-01 21:59:43 -05:00
Anewbe
6611cb271b Merge pull request #4190 from mistyLuminescence/plushierework2561
Plushie tweaks!
2017-11-01 21:57:56 -05:00
killer653
f81499a052 whoops 2017-11-01 17:54:43 -04:00
killer653
529b55798e Stops runtimes 2017-11-01 17:46:35 -04:00
Verkister
d36753c2fd almost forgot tesh had no separate deform sheet to convert 2017-11-01 09:45:27 +02:00
Atermonera
61a9c434f1 ATC ships won't go to the current station 2017-10-31 22:59:34 -07:00
Wickedtemp
a3ba6ff5d9 Update hypospray.dm 2017-10-31 20:52:02 -05:00
killer653
cd423e7d07 Flying check 2017-10-31 19:20:41 -04:00
killer653
954d254f11 Makes the var on /mob, making it easier to porrt. 2017-10-31 19:08:45 -04:00
killer653
2c8043d33c Makes it cost 25 to hover. 2017-10-31 18:44:11 -04:00
killer653
17a19d1a1d Allows bumping into along w/ hovering 2017-10-31 18:39:58 -04:00
killer653
e6c573ba8e Quick fix 2017-10-31 17:27:32 -04:00
killer653
74b338bf2b Makes you glide while flying. 2017-10-31 17:18:38 -04:00
mistyLuminescence
f67a3858cd Plushie tweaks! 2017-10-31 15:47:00 +00:00
Verkister
45f53405fe Converts colorable species into the combo blend mode.
-Unathi, Tajaran, Skrell, and Teshari now use mult+add combo blending.
-As do their tails, tail anims, and extra tesh feathers.
-No issues detected on latest test runs.
2017-10-31 12:50:15 +02:00
Atermonera
64942bd04c VR Core 2017-10-30 22:32:36 -07:00
Anewbe
cc7ba41c34 Improves electrocute_act, adds ELECTROCUTE damage type 2017-10-30 22:00:25 -05:00
Anewbe
8d8052f486 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into rerobust_simple_mobs
# Conflicts:
#	code/modules/mob/living/simple_animal/simple_animal.dm
2017-10-30 21:32:14 -05:00
Neerti
318ccff1c9 Merge pull request #4177 from Anewbe/background
Ports the background icons for char setup
2017-10-30 20:35:55 -04:00
Neerti
156423f0a2 Merge pull request #4174 from Anewbe/simple_animal_attacks
Buffs simple mob hit chance
2017-10-30 20:35:21 -04:00
Neerti
a981f9388f Merge pull request #4183 from Dunkhan/master
Added a set of atmospheric analysis sensors...
2017-10-30 20:33:07 -04:00
Cameron653
afb103838e Bumps trait up to 2 points. 2017-10-30 20:09:42 -04:00
killer653
02e25ebe3d I hate this keyboarrd 2017-10-30 18:19:00 -04:00