Commit Graph

15682 Commits

Author SHA1 Message Date
Arokha Sieyes
9711cf2b9d Merge pull request #867 from Dhaeleena/FleshyBits
Flesh Turfs
2017-01-24 22:37:15 -05:00
Dhaeleena
3cdf56f4c3 Flesh Turfs 2017-01-24 23:48:50 -03:00
Arokha Sieyes
ab374a35fc Disable away missions during unit testing because it never finishes aaaaaaaaaaaaa 2017-01-24 21:26:50 -05:00
Arokha Sieyes
cd3839a9cc Merge pull request #862 from VOREStation/arofluff
Aronai fluffer
2017-01-24 15:38:09 -05:00
Arokha Sieyes
3abc27114c Re-fix Verin? 2017-01-24 10:07:45 -05:00
Arokha Sieyes
45710ef8b3 Readds fed coat?? 2017-01-24 10:06:06 -05:00
Arokha Sieyes
0af7ce8b5b Icon, and removes old gun 2017-01-24 09:58:26 -05:00
Arokha Sieyes
860ce47074 All Aronai fluff change stuff except the icon 2017-01-24 09:58:18 -05:00
Arokha Sieyes
d9d4b338bd New "MKII" Hypospray
Adds a new hypospray to the game that uses 30u vials as 'mags' rather than requiring syringing.
2017-01-24 01:23:05 -05:00
Spades
d6f1102715 Merge pull request #860 from JoanRisu/Fluff_Items_worshop
Modern Federation Coats and Officer Caps
2017-01-23 21:39:54 -05:00
Spades
20b9ac6f57 Merge pull request #854 from Screemonster/moreferaltweaks
More xenochimera tweaks
2017-01-23 21:39:45 -05:00
JoanRisu
8961a73ecb Modern Federation Coats and Officer Caps 2017-01-24 01:13:41 +09:00
Cameron653
885c95cc58 Update sprite_accessories_vr.dm 2017-01-22 11:01:44 -05:00
killer653
e090d45e35 Github client didn't save this. 2017-01-22 10:47:53 -05:00
killer653
4a206aabf0 Adds in inkling hair
Adds in Molenar's inkling hair (Had to be put under ears due to not
being able to ckey lock normal hair)

Adds in normal inkling hair.

Fixes #825
2017-01-22 10:40:29 -05:00
Cameron653
5d2fa0db2c Fixes #857, adds sanity check to dogborgs
Fixes #857
2017-01-22 10:22:08 -05:00
Screemonster
fc6bf4f128 fucked up my maths 2017-01-21 21:36:51 +00:00
Screemonster
64c80a8fdf movement, logging, tweaks 2017-01-21 21:17:30 +00:00
Screemonster
9846a23fd2 Feral critters can't into firearms 2017-01-20 04:09:46 +00:00
Spades
edd6d713c9 Merge pull request #822 from BothNevarBackwards/attkChoose
Allows Human Type Mobs to Select a Primary Attack
2017-01-19 00:39:34 -05:00
Spades
9b61d10a0a Merge pull request #837 from Cameron653/master
January Polaris Sync and various fixes
2017-01-19 00:39:08 -05:00
Spades
48c95efa2b Merge pull request #849 from VOREStation/lcvend
Life crystal tweaks
2017-01-19 00:36:13 -05:00
Spades
d7c272bfa2 Merge pull request #851 from VOREStation/rigchange
Rig changes
2017-01-19 00:34:06 -05:00
Arokha Sieyes
c299c7ce22 Rig changes
Reduced armor further, removed stealth field. Paramedics probably don't need those.
2017-01-18 20:20:45 -05:00
Arokha Sieyes
d27cef2d5e Life crystal tweaks
Adds to medical vendors (the big ones, not the wall ones), tweaks case name to be more normal. Includes in the examine text of the crystal that you can attach it to jumpsuits to remind people.
2017-01-18 11:38:04 -05:00
Spades
3cda1a9bd3 Merge pull request #839 from VOREStation/langfix
Further language implant fix
2017-01-17 01:10:38 -05:00
Cameron653
93351c47af Merge branch 'master' into master 2017-01-16 22:30:45 -05:00
Arokha Sieyes
243a732a33 Fixes Verin's trenchcoat
Forgot some lines and it should have been fluff path anyway
2017-01-16 16:12:10 -05:00
Arokha Sieyes
e4b6ace4d5 Further language implant fix
It just can't be a child of the other language implant at all.

Fixes #838
2017-01-16 15:33:01 -05:00
Cameron653
300dd33e51 Fixes the floorlength braid... again 2017-01-16 15:07:27 -05:00
killer653
712f5610fb Wickedtemp custom items
Adds a fixed sprite for Wickedtemp's health hud
Adds a custom taur sprite for Wickedtemp
2017-01-16 00:45:30 -05:00
killer653
832418c7c9 Polaris sync 2017-01-15 18:12:15 -05:00
Arokha Sieyes
4e1dd1d237 Merge pull request #835 from VOREStation/arosuit
Event medic suit
2017-01-15 17:21:08 -05:00
Arokha Sieyes
7dd40a12be Event medic suit
Basically a medic suit for me for events or gateway missions or whatever. Doesn't spawn.
2017-01-15 17:10:42 -05:00
Anewbe
d16f09749d Merge pull request #2918 from Neerti/1/14/2017_minor_mic_circuit_fix
Fixes Small Bug in Microphone/EPv2 Circuit
2017-01-15 14:41:37 -05:00
Spades
34ef727794 Merge pull request #830 from VOREStation/ealimplant
Fix language/EAL implant.
2017-01-15 14:24:54 -05:00
Spades
b0a98c173d Merge pull request #829 from VOREStation/verin
Verin Fluff Coat
2017-01-15 14:23:34 -05:00
Anewbe
46486249f0 Makes the automute less strict on timing 2017-01-14 23:06:24 -06:00
MagmaRam
1351e5b013 Merge pull request #2890 from Anewbe/chem_spills
Fixes phoron/fuel spills not affecting the spilled-upon mob
2017-01-14 14:39:08 -06:00
Neerti
58b1b16be9 Also fixes EPv2 circuit not pushing data.
Also makes code compile.
2017-01-14 14:04:19 -05:00
Neerti
fadec38c59 Fixes Small Bug in Microphone Circuit
Microphone circuits should push data properly.
2017-01-14 13:52:34 -05:00
Arokha Sieyes
6cf76748eb Fix language/EAL implant.
Polaris added an item with the exact same path, hence the weird behavior of the EAL implant teaching you every language. Two items with the same path = weirdness. Should be better now.
2017-01-14 02:32:02 -05:00
killer653
6f66241fe5 Better fix proposed by Aronai 2017-01-13 20:32:23 -05:00
Arokha Sieyes
7bb0b8fc5f Verin Fluff Coat
Credit to Yosh for coding and providing the .diff for it. I just added a comment and put in the custom_items.txt change.
2017-01-13 19:53:40 -05:00
killer653
21cb9d3746 Changes it to Aronai's more efficient way 2017-01-13 19:31:24 -05:00
killer653
6728441d5c Prevents accidental stomach flavor text deletion 2017-01-13 19:12:04 -05:00
MagmaRam
39f5c4705c Merge pull request #2912 from Anewbe/baystation_cosmetic_things
Ports a bunch of Baystation's underclothes and hair
2017-01-12 18:08:37 -06:00
MagmaRam
5ffebc5e5a Merge pull request #2910 from Anewbe/flash_refix
Hugs/grabs should only miss if you're flashed
2017-01-12 17:37:25 -06:00
MagmaRam
2fc29c2f4c Merge pull request #2898 from Anewbe/spidereggs
Lowers spider egg implantation rate, warns victim
2017-01-12 17:37:18 -06:00
Spades
4dd1192651 Merge pull request #820 from OrbisAnima/Fix--Promethean-colouration-error
Fix promethean colouration error
2017-01-12 14:44:14 -05:00