Commit Graph

50246 Commits

Author SHA1 Message Date
Novacat
c9f77d563f Merge pull request #6745 from VOREStation/upstream-merge-6774
[MIRROR] Sprite fixes
2020-03-03 02:11:54 -05:00
Novacat
440a739ef9 Merge pull request #6744 from VOREStation/upstream-merge-6772
[MIRROR] Fixes a teshari mining undercoat
2020-03-03 01:51:05 -05:00
VirgoBot
33774841ed Sprite fixes 2020-03-03 01:47:45 -05:00
Atermonera
7f5f8daf1b Merge pull request #6774 from Schnayy/spritefix-march
Sprite fixes
2020-03-03 01:47:45 -05:00
Novacat
4df4f1c941 Merge pull request #6743 from VOREStation/upstream-merge-6770
[MIRROR] High-priority Job Display
2020-03-03 01:46:40 -05:00
VirgoBot
3eac0ccd97 Fixes a teshari mining undercoat 2020-03-03 01:38:13 -05:00
Atermonera
882aeee371 Merge pull request #6772 from Heroman3003/teshfix
Fixes a teshari mining undercoat
2020-03-03 01:38:13 -05:00
VirgoBot
9b680a30a6 High-priority Job Display 2020-03-03 01:37:00 -05:00
Atermonera
2af53022fe Merge pull request #6770 from Mechoid/ReadyUpNotice
High-priority Job Display
2020-03-03 01:37:00 -05:00
Novacat
e3e6370884 Merge pull request #6739 from Heroman3003/sofix
Removes _vr only sofa definitions
2020-03-02 00:21:04 -05:00
Novacat
7b742ecfd5 Merge pull request #6740 from Wickedtemp/master
Extends Tempest's hypo and glasses whitelists to Off-duty Medic
2020-03-02 00:20:47 -05:00
Wickedtemp
40e2518633 Update loadout_fluffitems_vr.dm 2020-03-01 21:48:12 -06:00
Heroman
743ae581af Removes _vr only sofa definitions 2020-03-02 13:46:37 +10:00
Aronai Sieyes
4fb1160e3a Merge pull request #6738 from Heroman3003/earfix
Fixes Pip's ears
2020-03-01 22:45:11 -05:00
Heroman
0586676320 Fixes Pip's ears 2020-03-02 12:58:52 +10:00
Novacat
f61dd5b25f Merge pull request #6736 from VOREStation/upstream-merge-6766
[MIRROR] changelog
2020-03-01 21:50:33 -05:00
VirgoBot
d8a08cb64b changelog 2020-03-01 20:22:49 -05:00
Schnayy
3e171dc61b Merge pull request #6766 from PolarisSS13/changelog
changelog
2020-03-01 20:22:49 -05:00
Novacat
d8d1349b64 Merge pull request #6732 from VOREStation/aro-vcunderline
Underline links in VChat and fix LOOC color
2020-03-01 19:50:12 -05:00
Aronai Sieyes
4395a8ebcf Fix LOOC color 2020-03-01 19:41:46 -05:00
Aronai Sieyes
9ba8c91653 Merge pull request #6731 from VOREStation/aro-moremedstand
Fix building med stands
2020-03-01 19:35:09 -05:00
Aronai Sieyes
61477ec131 Underline links in VChat 2020-03-01 19:34:44 -05:00
Aronai Sieyes
a320b2ecd5 Merge pull request #6730 from VOREStation/aro-vbugs1
Fixes 2 VChat bugs
2020-03-01 19:22:21 -05:00
Aronai Sieyes
c03532be58 Fixes missed commenting out of line 2020-03-01 19:21:44 -05:00
Aronai Sieyes
545a6cc447 Fix building med stands 2020-03-01 19:13:40 -05:00
Aronai Sieyes
4ae6283cd1 Fixes 2 VChat bugs 2020-03-01 19:05:52 -05:00
Novacat
5b566bd024 Merge pull request #6727 from VOREStation/aro-orescanfix
Ore Scanner is written incorrectly
2020-03-01 18:29:47 -05:00
Aronai Sieyes
f71bfa7100 Ore Scanner is written incorrectly
Only revealed by vchat
2020-03-01 17:22:31 -05:00
Novacat
95e1c84036 Merge pull request #6719 from VOREStation/aro-narrate
Allow narrate/globalnarrate shenanigans
2020-03-01 16:14:01 -05:00
Novacat
c7573caf08 Merge pull request #6720 from VOREStation/aro-bicontweak
Disable bicon() icon object cache, and create text tag cache
2020-03-01 16:13:51 -05:00
Novacat
52e543fbf2 Merge pull request #6721 from VOREStation/aro-aibugtweaks
Few AI runtime fixes
2020-03-01 16:13:38 -05:00
Aronai Sieyes
2e6fa059c1 VS: AI Tweak bugfixes 2020-03-01 15:14:23 -05:00
Aronai Sieyes
affcbbde5f AI Tweak bugfixes 2020-03-01 15:14:15 -05:00
Aronai Sieyes
a5af4695fc Disable bicon() icon object cache, and create text tag cache 2020-03-01 15:02:08 -05:00
Novacat
3fa10f8a9d Merge pull request #6717 from VOREStation/aro-nano
NanoUI Subsystem Fixes
2020-03-01 14:38:00 -05:00
Novacat
85088d3789 Merge pull request #6718 from VOREStation/aro-srgsans
Remove sergal comic sans
2020-03-01 14:37:44 -05:00
Aronai Sieyes
b33c359df5 Allow narrate/globalnarrate shenanigans
Allows HTML if your entire thing is HTML
2020-03-01 14:35:31 -05:00
Novacat
89f409514d Merge pull request #6716 from VOREStation/aro-aivis
Increment VIS defines for mob huds
2020-03-01 14:21:29 -05:00
Aronai Sieyes
7a5cf8d8b2 Remove sergal comic sans
Oops.
2020-03-01 14:19:16 -05:00
Aronai Sieyes
6af54bfec2 NanoUI Subsystem Fixes
Don't do this, the asset subsystem does this for you
2020-03-01 14:14:52 -05:00
Aronai Sieyes
9db702abf7 Increment VIS defines for mob huds
Prevents mob intents from being visible
2020-03-01 13:42:56 -05:00
Novacat
974eaccdaa Merge pull request #6714 from Heroman3003/sofabrown
Replaces cargo sofa with brown one
2020-03-01 10:56:27 -05:00
Novacat
41bbefddb4 Merge pull request #6713 from Novacat/nova-basicfixes
Fixes runtimes with chemspill map
2020-03-01 10:56:09 -05:00
Novacat
be406c91ed Merge pull request #6703 from Heroman3003/secondary-command
Removes teleporter room from secondary command
2020-03-01 10:55:55 -05:00
Novacat
85d7b3d8f1 Merge pull request #6657 from VOREStation/aro-customtabs
Adds 3 additional tablet types
2020-03-01 10:55:00 -05:00
Novacat
54c792ba9b Merge pull request #6648 from VOREStation/aro-medstand
Replace IV drips with medical stands
2020-03-01 10:54:45 -05:00
Novacat
82fb69489a Merge pull request #6647 from VOREStation/aro-table
Additional table type
2020-03-01 10:54:31 -05:00
Novacat
d98cd87585 Merge pull request #6646 from VOREStation/aro-salv
Add salvageable machines
2020-03-01 10:54:21 -05:00
Novacat
1602627443 Merge pull request #6643 from VOREStation/aro-detect
Add alternative detective wear
2020-03-01 10:54:03 -05:00
Novacat
1b147264d0 Merge pull request #6642 from VOREStation/aro-vends
A few new vending sprites
2020-03-01 10:53:51 -05:00