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
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
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
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
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
Spades
4dd1192651
Merge pull request #820 from OrbisAnima/Fix--Promethean-colouration-error
...
Fix promethean colouration error
2017-01-12 14:44:14 -05:00
Spades
4a1c04a39e
Merge pull request #821 from Cameron653/master
...
Fixes #813
2017-01-12 14:41:20 -05:00
Cameron653
57469d748b
Fixes typos
2017-01-11 13:54:11 -05:00
killer653
6f95e6e6d3
Fixes #813 . Credit to Aronai
...
Fixes #813
2017-01-10 21:30:18 -05:00
OrbisAnima
c11a9455c2
Fix: Promethean Colouration Error
...
Fix #801 , Avoids #818 , sorry for #819 , I had tested it, before, tested
it this time, this one should be inmune to any merge or shenanigans,
since I work as Aronai intended.
2017-01-10 22:50:21 -03:00
Spades
c9579a3247
Revert "Fix: Promethean coloration error"
2017-01-09 20:42:41 -05:00
Spades
b19e1e191a
Merge pull request #806 from OrbisAnima/Fix--Prometeans-color
...
Fix: Promethean coloration error
2017-01-09 15:00:15 -05:00
Spades
09cf2fc081
You're not a corgi.
2017-01-09 01:49:01 -05:00
Spades
8ad50bc34c
Added Fluffy correctly.
...
https://github.com/VOREStation/VOREStation/pull/811 except done
correctly.
2017-01-09 01:46:19 -05:00
Spades
cda702a5ee
Merge pull request #808 from BothNevarBackwards/fixHolder
...
Makes teshari use the macro micro pickup mechanic rather than their default sprite and slot use.
2017-01-07 14:54:34 -05:00
BothNevarBackwards
9acfde3a18
Makes teshari use the macro micro pickup mechanic rather than their default sprite and slot use.
2017-01-06 22:56:41 -05:00
Spades
409effe5a9
Merge pull request #805 from OrbisAnima/Fix--Species-Age
...
Fix: Added minimun age to 18, to go with the server policies
2017-01-06 14:23:42 -05:00
OrbisAnima
ff73133b3a
Fix: Promethean coloration error
...
Fixes #801 , I tested and everything seemed to work, but given the nature
of organ_icon, I suggest someone else checks it too.
2017-01-06 15:48:54 -03:00
OrbisAnima
44571603fe
Fix: Added minimun age to 18, to go with the server policies
2017-01-06 15:17:37 -03:00
Screemonster
74a67c3010
Forgot to remove myself from the whitelist after testing
2017-01-06 10:57:19 +00:00
Screemonster
8733de2583
Adds Miria's ears and tails
2017-01-06 10:52:38 +00:00
Spades
ebe5a5c9d9
Merge remote-tracking branch 'refs/remotes/origin/master' into dev-ace
2017-01-02 03:38:29 -05:00
Spades
0157cc7049
Some fixes.
...
- Fixes alien mobs being invisible.
- Alters weight rate messages to be clearer.
2017-01-02 03:38:20 -05:00
Cameron653
8cef69e9df
Makes mushroom sprites show up correctly when harvested ( #788 )
2016-12-30 23:06:57 -05:00
Spades
21cd4e4791
Voremob tweaks, bellies now escapable ( #783 )
...
* Voremob tweaks, bellies now escapable
Also disabled all the non-vore variants in the code to avoid confusion,
excluding aliens for now, since other stuff is handled there.
* comment removal
* Zoo.dmm hotfix
Makes the snakes play nice.
* Travis stop being a cunt
* Minor Tweak
2016-12-30 11:27:07 -05:00
Cameron653
51ecc03a67
Fixes birds meowing ( #784 )
2016-12-29 15:37:20 -05:00
Spades
0c3db41e89
Fixes lights for macros, hopefully.
2016-12-29 02:05:17 -05:00
Spades
0687f4d7fe
Merge pull request #779 from VOREStation/mimic-fix
...
Nerfs Mimics
2016-12-29 00:52:59 -05:00
Spades
1eeff9d5d3
Nerfs Mimics
...
Why the fuck were mimics given 250 health?
Also why did they spawn carp meat? You can't even get the carp meat!
They turn into a box on death!
2016-12-28 04:36:12 -05:00
Spades
ef8403ac48
Merge pull request #778 from Screemonster/tails
...
Adds Reika's tail, and a bunch of generics while I'm at it.
2016-12-27 14:37:58 -05:00
Screemonster
a0ccad74f6
Adds demon spadetail, bee wings, colourable variants of bat/succubus wings, and reika's beefox wing/tail combo.
2016-12-27 18:17:19 +00:00
killer653
3c0b93cbfa
Fixes compile error
2016-12-27 09:16:46 -05:00
killer653
ff7786ede3
Fixes an accidental overwrite
...
Someone accidentally defined a custom cane as the normal cane path
2016-12-27 09:11:04 -05:00
Cameron653
426237c3a4
For some reason this didnt manually apply to sync
2016-12-27 08:25:27 -05:00
Cameron653
f9aeef7bff
Cleaning up some problems with the sync
2016-12-27 08:23:46 -05:00
killer653
9c359cb202
Polaris sync
2016-12-27 08:21:55 -05:00
Anewbe
525643eb02
Merge pull request #2865 from MagmaRam/fifty_stacks
...
Replaces [stack]/fifty atoms with atoms that spawn the normal stack
2016-12-19 17:14:37 -06:00
Anewbe
c6315ca7f0
Merge pull request #2864 from Atermonera/Fixes_#2630
...
Gripper Fixes, round one.
2016-12-18 16:42:03 -06:00
MagmaRam
aa0ae1c676
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into fifty_stacks
2016-12-18 13:43:20 -06:00
