Kelshark
8b32b39c6f
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
2017-11-07 08:17:53 -05:00
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
elgeonmb
8560a35ec3
fixed megaphone lore
2017-11-04 01:59:00 -07:00
Cyantime
d5f582013f
Reagent generator implants now support multiple reagents at once.
2017-11-04 01:04:37 -04:00
Anewbe
7e62570129
Merge pull request #4205 from MisterLayne/LostDroneCharger
...
Lost Drone Pod Charger
2017-11-03 23:38:43 -05: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
516b7e7c2d
Merge pull request #4206 from Cyantime/windos
...
Minor window fixes
2017-11-03 16:11:27 -05:00
Mechoid
f538c584e6
Merge pull request #4191 from Anewbe/ling_sting
...
Ling Stings no longer affect FBPs
2017-11-03 13:15:48 -07: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
MisterLayne
2be106026b
Makes lost drone pod charger-able.
2017-11-03 14:26:59 -04:00
Mechoid
d81b1b2cba
Merge pull request #4108 from Anewbe/more_dangerous_voidsuits
...
Voidsuits breach more easily
2017-11-03 08:47:27 -07:00
Cyantime
31f5321dcc
Window things
2017-11-02 23:58:20 -04:00
Anewbe
303b7096ef
Merge pull request #4194 from Mechoid/Welderpack_Tanks
...
Adds a mounted welder to the welderpacks in Engineering.
2017-11-02 20:38:10 -05: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
Anewbe
35ef57705a
Merge pull request #4197 from Atermonera/ATC_stat
...
ATC ships won't go to the current station
2017-11-01 21:47:54 -05:00
Anewbe
1d19fbe59c
Ling stings can't affect synthetics now
2017-11-01 20:51: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
Mechoid
794bd0ab6f
Adds a mounted welder to the welderpacks in engineering.
2017-10-31 20:07:14 -07:00
Wickedtemp
a3ba6ff5d9
Update hypospray.dm
2017-10-31 20:52:02 -05:00
Anewbe
73ad06c706
Botanist ID now has the proper default job/title
2017-10-31 20:41:15 -05:00
killer653
cd423e7d07
Flying check
2017-10-31 19:20:41 -04:00
killer653
5790e1c5d4
Makes stumbling into something make you stop flying
2017-10-31 19:17:16 -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
