cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-05 22:00:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,931 Commits 8 Branches 26 Tags
74a67c3010f4169522eed404ffa9bc687c59ea4f
Commit Graph

25119 Commits

Author SHA1 Message Date
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
b66523659e Additional fixes 
- Fixes camera layering.
- Fixes misaligned sleepers in pirate ship.
- Fixes broken disposals by security office.
- Fixes broken holocarp.
 2017-01-02 04:24:55 -05: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
killer653
064485a0f8 50 sheet stacks fix 
The pathfile for fifty sheets is now /obj/fiftyspawner/glass for example

instead of glass/fifty
 2016-12-27 08:42:59 -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
Anewbe
bbd86b7646 Merge pull request #2862 from MagmaRam/beakerlabel 
Labels for beakers can now be longer, and are in the description, too.
 2016-12-18 13:40:51 -06:00
Anewbe
a45b1ab846 Merge pull request #2861 from MagmaRam/defibcrate 
Adds a crate with defibrilators for 30 points
 2016-12-18 13:40:42 -06:00
Anewbe
6db74d7648 Merge pull request #2859 from Neerti/12/17/2016_vending_throw_fix 
Vending machines now correctly throw products
 2016-12-18 02:10:20 -06:00
MagmaRam
190a2bc70c Replaces [stack]/fifty atoms with atoms that spawn the normal stack 
The stack/fifty objects were really buggy, this should fix all of that in one go.
 2016-12-17 17:27:04 -06:00
Atermonera
9669505550 Removes debug messages, adds Exosuit Tracking Beacon to the exosuit gripper's list. 2016-12-17 15:08:02 -08:00
Anewbe
f9d7ad9d16 Walking barefoot no longer slows you. 2016-12-17 16:07:38 -06:00
Anewbe
b092c624a9 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into movement_speeds 2016-12-17 16:05:44 -06:00
Atermonera
82a33d16d9 Causes attackby() to happen. 2016-12-17 13:02:52 -08:00
MagmaRam
4d8c2aaa3e hurf durf dumb html mistake 2016-12-17 10:25:59 -06:00
MagmaRam
52f3ee7e19 Labels for beakers can now be longer, and are in the description, too. 2016-12-17 09:47:05 -06:00
MagmaRam
d3be058c5d Adds a crate with defibrilators for 30 points 2016-12-17 09:46:05 -06:00
Neerti
68b1a3e355 Vending machines now correctly throw products 2016-12-17 03:30:14 -05:00
Anewbe
a1a17a0811 Merge pull request #2858 from Woodratt/1.6.7_Map_Changes 
Fancy Map Change DLC
 2016-12-16 20:44:29 -06:00
MagmaRam
4e27e439ca Merge pull request #2857 from Anewbe/another_language_selection 
Adds another language selection point
 2016-12-16 17:54:24 -06:00
woodratt
5825f74f2b Fancy Map Change DLC 
For more details see this thread http://ss13polaris.com/forums/viewtopic.php?f=18&p=12482&sid=941d47c798cf146ebc711c87cdf1cb22

- T-Comms turret control should be fixed, yet again.
- Maintenance door added to Medical breakroom
- Windoors in the armory fixed.
- Slight adjustments to where the carp spawns have been placed.
- Exterior window added to research maintenance.
 2016-12-16 02:53:43 -08:00
Anewbe
c872ee2093 Adds another language selection point 2016-12-15 18:47:50 -06:00
Anewbe
5c41c32dc9 Adds device cell to the loadout 2016-12-15 18:19:48 -06:00
Spades
3c0df7dbc0 Merge pull request #759 from JoanRisu/Fluff_Items_worshop 
Fluff Items 13: Languages, PDAs, and The G44
 2016-12-13 21:52:48 -05:00
Spades
b6056f599b Merge pull request #758 from Cameron653/master 
Special Stomach Interactions
 2016-12-13 21:52:23 -05:00
killer653
07b2db850f Fixes invisible size shrooms 2016-12-13 21:14:02 -05:00
killer653
1c3a6db0ef Adds warnings, since I can't figure out a fix. 2016-12-13 16:36:04 -05:00
killer653
652c70f044 One last fix until tomorrow 2016-12-12 22:34:27 -05:00
killer653
379abaa7dc Adds in prey transfer (and a bug) 
Adds in prey transfer.

Has a bug in which if the pred deletes their tranfer location stomach,
then the prey will be able to be moved there, trapping them in limbo.

Shouldn't happen often if ever, but I still need to figure out how to
fix it.

Merging this in case anyone has a solution of how to do the sanity
check.

Lines 416-428 in belly_vr.dm
 2016-12-12 22:16:33 -05:00
killer653
b02438e191 Solves digestion/absorption not working. 2016-12-12 19:28:02 -05:00
Cameron653
2c234591c8 Clarification and fix 2016-12-12 18:31:42 -05:00
Cameron653
6b90cb2279 Prevents numbers like 999999999999 
Rounds then sanitizes them
 2016-12-12 17:03:41 -05:00
JoanRisu
22b9c5ad15 Fix box 2016-12-13 06:57:36 +09:00
Cameron653
9f360a65c9 Hope this works 
Out of all the things to go wrong, it of course it would have to be this.
 2016-12-12 15:55:56 -05:00