killer653
0cf24cd709
Bugfix, cleanup, & xenoarch belter access
2017-03-28 18:01:02 -04:00
Arokha Sieyes
ba6233c524
Merge pull request #1268 from VOREStation/aro-armsgs
...
Make AR glasses show messages like HUDs
2017-03-28 16:26:38 -04:00
Arokha Sieyes
5c805c93ce
Merge pull request #1267 from VOREStation/aro-beepskysmash
...
Adds beepsky and makes him baton more
2017-03-28 16:26:31 -04:00
Arokha Sieyes
462f5d66fb
Merge pull request #1265 from VOREStation/aro-awoo
...
Adds wolfgirls
2017-03-28 16:17:20 -04:00
Arokha Sieyes
6bc464be7c
Beepsky+Baton=Win
2017-03-28 16:16:38 -04:00
Arokha Sieyes
c9f7b77e93
Make AR glasses show messages like HUDs
...
So AR-M get the medibot messages, AR-S get the security bot messages, and now AR-E glasses get atmos and fire alarm messages
2017-03-28 16:09:14 -04:00
Arokha Sieyes
740953215d
Adds wolfgirls
...
AwoooOOOOooo!
http://imgur.com/nsOIiTR
2017-03-28 13:29:14 -04:00
Arokha Sieyes
8df21e989c
Merge pull request #1264 from VOREStation/aro-syncshuttles
...
Polaris Sync
2017-03-28 13:19:32 -04:00
Arokha Sieyes
b0abf36361
Merge pull request #1258 from JoanRisu/Fluff_Items_worshop
...
Fluff items worshop: Fixing things
2017-03-28 13:19:12 -04:00
Arokha Sieyes
1ba87bea73
Merge polaris sync
2017-03-28 12:24:46 -04:00
Anewbe
b5696a9c6f
Merge pull request #3155 from Schnayy/flower_crowns2
...
Flower crowns with fixed conflict? Maybe? Please?
2017-03-27 23:32:47 -05:00
Anewbe
6e7aa75835
Merge pull request #3141 from VOREStation/shuttlebetter
...
Dynamic Shuttle Walls/Landings
2017-03-27 23:26:35 -05:00
Schnayy
e4ca4707d1
Fixed code at Neerti's request, fixed a small sprite error where crowns appeared in the wrong hand.
2017-03-27 21:24:47 -05:00
Leshana
7e8f701448
Add a verb to the Preferences panel to toggle jukebox music.
...
* This should be easier for people to find and use than the character setup page.
2017-03-27 20:31:15 -04:00
Schnayy
0f98eedab4
Fixed indentation
2017-03-27 17:16:06 -05:00
Neerti
d2078e86d6
Merge pull request #3149 from Anewbe/jackets
...
Reworks how some jackets open
2017-03-27 16:44:43 -04:00
Spades
40fa57830d
Merge pull request #1254 from Cameron653/master
...
Disables Random Ian storms
2017-03-27 11:12:51 -04:00
JoanRisu
bd9d9c5078
Fixes typo for dune buggy in code and adds fluff boxes to the quick create menu.
2017-03-27 01:58:49 -07:00
JoanRisu
284460593c
Resolves #1129 . Adds custom_onmob_vr.dmi for onmob sprites for glasses, masks, and shoes.
2017-03-27 01:54:55 -07:00
JoanRisu
729168790a
Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop
2017-03-26 22:43:18 -07:00
Schnayy
971eb97399
Fixed conflict? Maybe? Please?
2017-03-27 00:42:39 -05:00
JoanRisu
8d6377f4b4
adds vehicles to the cargo lists and makes changes to a few things.
2017-03-26 22:39:54 -07:00
Cameron653
d9b923c450
Disables Ian storms
...
They happened every single shift for some reason. This just flat out disables ian storms.
2017-03-26 23:45:56 -04:00
Arokha Sieyes
b88c04f96c
Merge pull request #1252 from VOREStation/aro-vwag
...
One more vwag tweak
2017-03-26 22:05:27 -04:00
Neerti
91fa4c3743
Merge pull request #3151 from Anewbe/smokings_a_drag
...
Adds taking drags from smokables
2017-03-26 21:38:07 -04:00
Arokha Sieyes
12d8d9f570
One more vwag tweak
2017-03-26 21:08:53 -04:00
Arokha Sieyes
5e8d8e082f
Merge pull request #1251 from VOREStation/aro-sync2
...
Polaris Sync
2017-03-26 20:45:00 -04:00
Arokha Sieyes
60d541037c
Fix compile error from merge
2017-03-26 20:32:33 -04:00
Arokha Sieyes
9edf3a6629
Polaris Merge Sync
2017-03-26 20:12:34 -04:00
Arokha Sieyes
32017be265
Fix unsupported tail spam
...
For vwag stuff.
2017-03-26 19:55:47 -04:00
Anewbe
431dd1d290
Adds taking drags from smokables
2017-03-26 18:07:35 -05:00
Anewbe
d665a0dee2
Makes translators more expensive
2017-03-26 17:36:36 -05:00
Neerti
565fea9648
Merge pull request #3144 from Anewbe/uniforms
...
Makes space in the uniforms.dmi file
2017-03-26 18:14:06 -04:00
Anewbe
9fedcf7d1e
Merge pull request #3145 from Cerebulon/medical_handsprites
...
Added hand sprites to most medical items.
2017-03-26 17:06:10 -05:00
Anewbe
2e5e77997a
Reworks how some jackets open
2017-03-26 16:58:27 -05:00
Anewbe
22ae87c376
Fixes a bug with meatbrain FBPs.
2017-03-26 16:34:47 -05:00
Cerebulon
6472f02040
Removed unnecessary icon_state code. Added basic scanner sprite.
2017-03-26 22:00:09 +01:00
Anewbe
511f8ce708
Fixed the things
2017-03-26 11:44:50 -05:00
Arokha Sieyes
4302d2373b
Adds 4 waggable tails, *vwag emote, other fixes
...
Using the *vwag emote you can toggle the vorestation specific tails to wag. Tails marked with (vwag) in the tail selection support this.
New tails are: a new vulp tail (does not replace current one, selectable as a custom tail), a tiger tail, a short tail, and a curl tail (husky or doge). All four support vwag.
Also fixed the mouse tail. It said "mouse, grey" when what it meant was "pink" and then it also said "colorable" mouse tail but that was a lie because it was not colorable at all. Not really. Not in any reasonable way.
Also added fully colorable mouse ears without the pink inner part as an option.
2017-03-26 02:10:17 -04:00
Cerebulon
3c17d1b33f
Added in-hand sprites to most item lacking them from the Medical department.
...
(Full list: Body bag, Advanced Mass Spectrometer, Rescue Suit Control Module, Stethoscope, Stasis bag, Defibrillator, Blood Packs, Advanced Trauma/Burn Kits, Hypospray, Biopsy Scanner, Surgical Drill, Fixovein, Retractor, Bone-Gel, Bone Setter, Cautery, Hemostat, Inflatable Wall Box.
2017-03-26 07:04:01 +01:00
Anewbe
6b0500dd27
Makes space in the uniforms.dmi file
2017-03-26 00:59:14 -05:00
Leshana
d1000f0864
Fixed random Z-Levels to account for simple_animal path changes
2017-03-25 21:58:49 -04:00
Arokha Sieyes
1300ef333d
Dynamic Shuttles - Code and Icon Changes
2017-03-25 21:00:08 -04:00
Neerti
629a044761
Merge pull request #3137 from Anewbe/robot_skintone
...
Adds skintone to FBPs
2017-03-25 20:57:01 -04:00
Schnayy
ade40d627e
Added 3 clothing sprites w/ appropriate ground/held sprites. ( #3134 )
...
* Added 3 clothing sprites w/ appropriate ground/held sprites.
1, white yoga pants, intended to be any color.
2, white kimono, intended to be any color.
3, red and black jacket.
All intended to be in the loadout.
* Put coding in. Jacket has pockets, same cold resistance as a hoodie. Kimono and yoga pants have color selectors. All are in the loadout.
* Removed cold protection from jacket & fixed missing mob sprites. Don't know what happened with the latter, was definitely there when I tested it.
2017-03-25 17:44:04 -05:00
Neerti
d0fa0c4eed
Merge pull request #3140 from Anewbe/antag_age_fix
...
Fixes the antag age blocker
2017-03-25 18:28:09 -04:00
Schnayy
8bb5924481
Adds greyscale sprites for heels worn/held/on the ground. ( #3133 )
...
* Adds greyscale sprites for heels worn/held/on the ground. Still needs coding. First commit, hope I do it right!
* Fixed capitalization, added coding.
* Rennamed heelsheld to heels, as per anewbe's request.
2017-03-25 16:48:39 -05:00
Anewbe
f316fd2dca
Merge pull request #3136 from Belsima/master
...
Updates drone respawn time.
2017-03-25 16:37:08 -05:00
Anewbe
6cd424b2e1
Fixes the antag age blocker
2017-03-25 16:36:17 -05:00
Belsima
50bc49ff86
Five minutes instead.
2017-03-25 17:29:37 -04:00
