Arokha Sieyes
a8ebc54170
One-click mouse scooping and edibility
...
Makes mice scoopable with one click, and can be ate rather than needing to be grabbed.
Resolves #1255
2017-03-30 14:07:30 -04:00
Arokha Sieyes
a28c9eacb2
Drop some custom items
2017-03-29 23:40:02 -04:00
Arokha Sieyes
e38701ddb1
leg holster
2017-03-29 23:37:19 -04:00
Arokha Sieyes
1651700be0
Merge pull request #1283 from VOREStation/aro-boots
...
Lets you put people in shoes again
2017-03-29 18:40:57 -04:00
Cameron653
2bba9d29dc
Merge pull request #1282 from VOREStation/aro-squish
...
Copypaste error on *squish
2017-03-29 16:32:06 -04:00
Arokha Sieyes
660d14f72b
Lets you put people in shoes again
...
Same ol same ol. Max 2 per customer.
2017-03-29 15:08:17 -04:00
Arokha Sieyes
83a782a3de
Copypaste error on *squish
...
Whups!
2017-03-29 14:15:07 -04:00
Arokha Sieyes
c0f66f2ccb
Merge pull request #1281 from VOREStation/aro-cag
...
Adds 500 Cards against The Galaxy cards
2017-03-29 13:28:22 -04:00
Arokha Sieyes
56cfe66a18
Adds 500 Cards against The Galaxy cards
...
So now it's more of a playable game
2017-03-29 12:52:20 -04:00
OrbisAnima
43462dd1c4
Add Slug Tail sprite by @Natje0
...
Solves #1243
2017-03-29 09:32:21 -03:00
Arokha Sieyes
13da60a829
Merge pull request #1274 from VOREStation/fix-media-oops
...
Oops. Accidently did mediamanager shutdown wrong. Fixed.
2017-03-28 22:39:29 -04:00
Arokha Sieyes
b196708ed5
Merge pull request #1276 from Yoshax/fbp
...
Fixes the color application on Vey-Med prosthetics
2017-03-28 22:39:04 -04:00
Arokha Sieyes
b3e602569f
Merge pull request #1275 from Cameron653/master
...
BatterBatter! (Repost)
2017-03-28 22:37:59 -04:00
Yoshax
1120d8c633
Fixes the color application on Vey-Med prosthetics
2017-03-29 00:42:53 +01:00
killer653
a58957db4d
BatterBatter!
...
Duplication of #1259
Since another PR prevented #1259 from being merged, I went ahead and
just copied and pasted it for Dhael
2017-03-28 19:38:55 -04:00
Leshana
698a5c4dee
Oops. Accidently did mediamanager shutdown wrong. Fixed.
2017-03-28 19:36:56 -04:00
Arokha Sieyes
1e39e60e9a
Merge pull request #1269 from Cameron653/master
...
Bugfix, cleanup, & xenoarch belter access
2017-03-28 19:13:54 -04:00
Arokha Sieyes
fce6634ef7
Merge pull request #1273 from VOREStation/aro-synthfix
...
Prevent synths overheating inside mechs/people in space
2017-03-28 19:13:09 -04:00
Arokha Sieyes
777ee87319
Prevent synths overheating inside mechs/people in space
...
This is a weird if() statement and should be revisited. This is just a quick patch to allow synths to actually use mechs in space, as well as be prey to people who step onto space turfs. Rule of fun and all.
2017-03-28 19:03:10 -04:00
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
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
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
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
