Commit Graph

16690 Commits

Author SHA1 Message Date
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
Anewbe
caea997f7d Diona limbs should be easier to remove 2017-03-29 14:58:12 -05: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
Schnayy
a5384dab83 Fixed in-hand sprites, made adjustment to open icon. 2017-03-29 14:00:57 -05:00
Anewbe
c9bfabd426 Device Cell QOL 2017-03-29 13:58:35 -05:00
Anewbe
e9ad3eba3a Merge pull request #3174 from VOREStation/aro-pol-squish
Copypaste error on *squish
2017-03-29 13:25:12 -05:00
Arokha Sieyes
a66eba807f Copypaste error on *squish
Whups!
2017-03-29 14:16:16 -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
Cerebulon
1d09caa08d Merge branch 'master' of https://github.com/PolarisSS13/Polaris into engineering_sprites 2017-03-29 06:24:06 +01:00
Anewbe
f284970358 Adds craftable whetstones, changelog 2017-03-28 23:50:21 -05:00
Cerebulon
365f92101d Reverted botched changes. 2017-03-29 05:49:44 +01:00
Cerebulon
55fd0a2041 Adds hand sprites to many items in the engineering department 2017-03-29 04:09:33 +01:00
MagmaRam
d98745d9d3 Merge pull request #3169 from Anewbe/italics_switch
Italics switch from / to | characters
2017-03-28 21:54:23 -05: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
Anewbe
cdf69e0eec Italics switch from / to | characters 2017-03-28 21:13:46 -05:00
Cerebulon
d5a9e15f28 Fixed get_FBP_type() method for determining min/max ages to use new type names. 2017-03-29 03:07:52 +01:00
MagmaRam
a3c83ac025 Robots, cyborgs, etc can now use grinders in the kitchen and chemlab 2017-03-28 20:47:38 -05:00
Anewbe
7ae8d934f5 Should fix a Travis issue 2017-03-28 20:24:17 -05:00
MagmaRam
2f976a22f8 Merge pull request #3158 from Anewbe/fbp_screams
FBPs should no longer scream when they collapse
2017-03-28 20:03:01 -05:00
MagmaRam
9ff0180315 Merge pull request #3138 from Anewbe/radio_freqs
Antag Radio changes
2017-03-28 20:02:44 -05:00
MagmaRam
33dffeb0b8 Merge pull request #2955 from Anewbe/heart_damage
Big Ol' Medical Tweaks
2017-03-28 20:02:24 -05:00
MagmaRam
c7e224b6e2 Merge pull request #3075 from Anewbe/armor_soak
Implements Armor Soak
2017-03-28 20:02:00 -05:00
MagmaRam
add4607d98 Merge pull request #3159 from Anewbe/electric_welder
Adds the electric welder
2017-03-28 19:56:43 -05:00
Cerebulon
dfe5afe197 Changes character setup to use correct in-lore names for brain types. 2017-03-29 01:55:46 +01: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
Anewbe
0924e4e7a2 Merge pull request #3135 from Belsima/skrell
Skrell sprite updates.
2017-03-28 18:28:58 -05:00
Anewbe
dc58616dc8 Merge pull request #3153 from Yoshax/iconsplitting
'Improved' solution to the full uniform.dmi problem
2017-03-28 18:22:04 -05: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
Yoshax
b7f0e47be1 Fixes a few things 2017-03-28 21:15:45 +01: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
Anewbe
a65722929f Merge pull request #3086 from ghost/robot
Adds a fuckton of robot, hologram, and AI sprites.
2017-03-28 14:38:08 -05:00
Anewbe
cddbc6e976 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into radio_freqs 2017-03-28 14:28:15 -05: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