Commit Graph

25101 Commits

Author SHA1 Message Date
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
Cameron653
a04e7faecf Adds stoamch special interactions 2016-12-12 15:36:35 -05:00
Cameron653
ceb3515fdb Adds vars, adds absorb/digest/escape chances and results. 2016-12-12 15:15:16 -05:00
Cameron653
76144c242d Update vorepanel_vr.dm 2016-12-12 14:40:13 -05:00
Cameron653
d93e15a3f4 Update vorepanel_vr.dm 2016-12-12 14:24:11 -05:00
JoanRisu
59fb1f2e7b Did some more custom PDA adjustments and fixed the g44 stuff. 2016-12-12 22:42:40 +09:00
JoanRisu
6347f2edec Adding the G44 and its energy variant. 2016-12-12 20:18:59 +09:00
JoanRisu
0ecd0a51be Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2016-12-12 18:37:33 +09:00
JoanRisu
2ca24521d9 fixing PDAs and adding squirrelkin language. 2016-12-12 18:36:12 +09:00
killer653
2e47d44371 Should be the last thing needed to get this to work. 2016-12-11 22:11:36 -05:00
Cameron653
202fbe3889 Update vorepanel_vr.dm 2016-12-11 20:32:43 -05:00
Cameron653
1906cb4e1e Update vorepanel_vr.dm 2016-12-11 20:32:18 -05:00
Cameron653
475f307753 Fixes dresses
Ports over 301f97a2b3

Instead of syncing (Which would take longer) I'm just manually putting the bugfix in. This will cause a conflict with the next sync, but all that needs to be done is the comment I put in taken out (Along with the heading in github when a conflict occurs) and it'll work fine.

I'll solve the conflict next time we sync next month.
2016-12-11 18:27:23 -05:00
Anewbe
6d7d5af896 The TSC jumpsuits should be properly selectable now. 2016-12-11 16:50:04 -06:00
Spades
ccfed7f5a4 Refactor 2016-12-10 15:43:59 -05:00
Spades
cc0cfba27b Map Sync, some Zoo and Vore Mob fixes
- Polaris map synced with ours (Resolves #331)
- Nerfed pounce chance on most vore mobs. The default chance of being
eaten is now only 1:20 whereas previously it was 1:2 chance.
2016-12-10 15:36:17 -05:00
Cameron653
6869e3c048 Removes is_skrell 2016-12-10 14:09:56 -05:00
killer653
0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00
woodratt
9e20a8cf15 Dress bugfix
Fixes the issue of dresses using the greydress sprite for on mob sprites.
2016-12-10 01:29:12 -08:00