Commit Graph

33644 Commits

Author SHA1 Message Date
Novacat
a9f4906995 Merge pull request #4667 from VOREStation/upstream-merge-5772
[MIRROR] Refactors poi rotation to use degrees instead of dir
2019-03-27 15:16:02 -04:00
Novacat
5806e2d712 Merge pull request #4666 from VOREStation/upstream-merge-5826
[MIRROR] Blob factories now properly remove their listings from mobs when destroyed.
2019-03-27 14:12:59 -04:00
Novacat
cfe200ffc9 Merge pull request #4665 from VOREStation/upstream-merge-5824
[MIRROR] Fixes non-black/white paint buckets not actually having paint in them
2019-03-27 14:12:46 -04:00
Novacat
0a170b1409 Merge pull request #4664 from VOREStation/upstream-merge-5827
[MIRROR] Fixes infinite microwave sound when recipe fails
2019-03-27 14:12:31 -04:00
Novacat
1599c9881d Merge pull request #4661 from Heroman3003/fuck-is_multitool
Removes the usage of non-working is_tool procs
2019-03-27 14:12:08 -04:00
Novacat
823354433e Merge pull request #4659 from VOREStation/upstream-merge-5796
[MIRROR] Adds New PoI Features + Bonus PoI
2019-03-27 13:52:46 -04:00
Novacat
b611edacfa Merge pull request #4658 from VOREStation/upstream-merge-5812
[MIRROR] Fixes lift and shuttle moves not updating lighting
2019-03-27 13:52:30 -04:00
Novacat
b176b056e0 Merge pull request #4655 from VOREStation/upstream-merge-5793
[MIRROR] Upgrades SDQL2 and refactors it to a datum
2019-03-27 13:52:08 -04:00
Unknown
538d12ba92 Conflict Resolution 2019-03-27 13:02:35 -04:00
Neerti
ee18328ce0 Refactors poi rotation to use degrees instead of dir 2019-03-27 12:57:16 -04:00
Neerti
015d0362ba Blob factories now properly remove their listings from mobs when destroyed. 2019-03-27 12:54:40 -04:00
Unknown
a92eb4a414 Reverts to Polaris File 2019-03-27 12:50:51 -04:00
Neerti
373e1c766a Fixes infinite microwave sound when recipe fails 2019-03-27 12:45:09 -04:00
Novacat
42df71908b Merge pull request #4644 from VOREStation/upstream-merge-5803
[MIRROR] Guns sounds refactor and improvements
2019-03-27 12:35:26 -04:00
Unknown
54b1d524ea Conflict Resolution 2019-03-27 12:19:15 -04:00
Neerti
91a5203e32 Adds New PoI Features + Bonus PoI 2019-03-27 12:15:50 -04:00
Novacat
dbd85f3243 Merge pull request #4656 from VOREStation/upstream-merge-5816
[MIRROR] Guns should once again let people know that they've been fired
2019-03-27 12:07:35 -04:00
Unknown
0e6c82ed60 Conflict Resolution 2019-03-27 12:05:38 -04:00
kevinz000
dfbd0bd72b Upgrades SDQL2 and refactors it to a datum 2019-03-27 11:50:49 -04:00
Novacat
bac2ebb883 Merge pull request #4653 from VOREStation/upstream-merge-5811
[MIRROR] Gives the Doppler Array a sprite again. It still works somehow!
2019-03-27 11:30:50 -04:00
Novacat
b91b10aaa5 Merge pull request #4642 from TheFurryFeline/patch-2
Boost Belly Limit
2019-03-27 11:22:30 -04:00
Novacat
9e00a1b164 Merge pull request #4641 from VOREStation/upstream-merge-5808
[MIRROR] CODERS HATE HIM: THIS TOTAL LOSER FIXES TYPOS
2019-03-27 11:22:21 -04:00
Novacat
2670a031d6 Merge pull request #4640 from VOREStation/upstream-merge-5806
[MIRROR] Fixes #5780
2019-03-27 11:22:02 -04:00
Novacat
682b06f126 Merge pull request #4639 from VOREStation/upstream-merge-5809
[MIRROR] Allows Prometheans to choose Sol Common as a language.
2019-03-27 11:21:54 -04:00
Unknown
1e45296d31 Conflict Resolution 2019-03-27 10:58:53 -04:00
Spades
eb0e2ec1f5 Guns sounds refactor and improvements 2019-03-27 10:42:18 -04:00
Anewbe
b8360ae0e8 Fixes #5780 2019-03-27 10:31:59 -04:00
Spades
60ce08ef82 Fixes a typo that broke the saketini recipe (#5807)
Ported from https://github.com/VOREStation/VOREStation/pull/4534
2019-03-27 10:28:43 -04:00
Novacat
db08a8dd60 Merge pull request #4631 from VOREStation/upstream-merge-5804
[MIRROR] IC News update for 1st Jan
2019-03-27 04:49:46 -04:00
Novacat
e660a872e5 Merge pull request #4636 from TheFurryFeline/patch-1
Collar Crate
2019-03-27 04:46:19 -04:00
Novacat
70d0a30868 Merge pull request #4635 from TheFurryFeline/master
Holocollar Addition to Autolathe. Take 3
2019-03-27 04:46:02 -04:00
Novacat
dc617243e9 Merge pull request #4634 from Verkister/patch-31
Tweaks borg belly passive drain.
2019-03-27 04:45:53 -04:00
Novacat
d8d0ccb682 Merge pull request #4630 from VOREStation/upstream-merge-5799
[MIRROR] Fixes Character Preview
2019-03-27 04:45:27 -04:00
Novacat
7ce67d9fb8 Merge pull request #4629 from VOREStation/upstream-merge-5802
[MIRROR] Dragging mobs now causes slowdown
2019-03-27 04:45:14 -04:00
Unknown
039b6c2b6c Why is this even a conflict 2019-03-27 04:41:57 -04:00
Atermonera
49bdfc2db6 IC News update for 1st Jan 2019-03-27 04:41:39 -04:00
Anewbe
0e75d3ad8b Merge pull request #5799 from Neerti/character_preview_fix
Fixes Character Preview
2019-03-27 04:27:15 -04:00
Unknown
0424f4b907 More Fixes 2019-03-27 04:22:08 -04:00
Unknown
4e67e1b9ab Conflict Resolution 2019-03-27 04:11:30 -04:00
Anewbe
09b01407e3 Adds Various Sounds, Looping Sound System 2019-03-27 03:55:21 -04:00
Novacat
7a13562736 Merge pull request #4620 from VOREStation/upstream-merge-5779
[MIRROR] Emergency tanks start full
2019-03-27 03:40:45 -04:00
Novacat
1a9107a037 Merge pull request #4619 from VOREStation/upstream-merge-5797
[MIRROR] Fixes Beam()
2019-03-27 03:40:28 -04:00
Novacat
8cb235f1e7 Merge pull request #4615 from VOREStation/upstream-merge-5795
[MIRROR] Standardises SifGov to VirGov
2019-03-27 03:40:16 -04:00
Novacat
2f3edf4a72 Merge pull request #4612 from VOREStation/upstream-merge-5770
[MIRROR] Standardizes rotation verbs
2019-03-27 03:40:04 -04:00
Neerti
29b54f0ba5 Fixes Beam() 2019-03-27 03:30:20 -04:00
Unknown
486602c194 Conflict Resolution 2019-03-27 03:27:53 -04:00
Unknown
0c391cc252 Conflict Resolution 2019-03-27 03:22:15 -04:00
Neerti
b9adc37685 Standardizes rotation verbs 2019-03-27 03:17:07 -04:00
Atermonera
831ce7475e Merge pull request #5792 from Neerti/christmas_stuff
Ports the lightpost and present tree from tg.
2019-03-27 03:13:15 -04:00
Novacat
a5cfa5519a Merge pull request #4602 from VOREStation/upstream-merge-5765
[MIRROR] Speeds up getFlatIcon
2019-03-27 03:07:16 -04:00