Commit Graph

5673 Commits

Author SHA1 Message Date
LunarFleet
aaa61d6377 Makes cascading toggleable 2020-11-02 23:46:52 -05:00
LunarFleet
bd1503a35d Realized I could touch up the interactions a bit 2020-10-15 23:37:26 -04:00
LunarFleet
163dc56069 Only eggs can sustain me 2020-10-15 20:34:13 -04:00
Razgriz
0a8521f900 Merge pull request #568 from cadyn/vspull
Direct pull from virgo
2020-10-06 20:52:54 -07:00
Razgriz
ef5f28cb0c Merge pull request #551 from Holdelta/master
Reverting changes to the RMS
2020-10-06 15:40:56 -06:00
Cadyn
1d0e69633f Fix silly stuff 2020-10-05 19:46:50 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
David Winters
b6ac68836a please work PLEASE 2020-09-29 00:28:25 -04:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Razgriz
8cc3e87f1b Update scannable fabricator pathname 2020-09-26 15:13:00 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Novacat
4b83c18fb7 Merge pull request #9071 from VOREStation/upstream-merge-7660
[MIRROR] Fix duplicate results from analyzing some objects
2020-09-21 16:54:29 -04:00
Rykka
534623b1fd Delete accidentally-added file from Commcard PR 2020-09-21 16:01:46 -04:00
Novacat
d49640431d Merge pull request #9062 from ShadowLarkens/tgui_finale
NanoUI Goes To Brazil
2020-09-21 14:13:16 -04:00
Novacat
6fad165033 Merge pull request #9067 from VOREStation/upstream-merge-7651
[MIRROR] Tweaks to pickup/equip sounds.
2020-09-21 13:51:44 -04:00
Novacat
9eff136dc9 Merge pull request #9063 from VOREStation/upstream-merge-7642
[MIRROR] Adds two new augments to Traitor uplink
2020-09-21 13:50:29 -04:00
Atermonera
a94f3189fd Remove broken, unused commcard system from communicators 2020-09-21 12:37:52 -04:00
Braiden
a8d4104fea added tesh plush ears, fixed PEili not apearing on head. 2020-09-20 17:23:14 -05:00
Meghan-Rossi
cbfd4789d7 Fix duplicate results from analyzing some objects (#7660) 2020-09-20 07:18:35 -04:00
Cerebulon
95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -04:00
SubberTheFabulous
378ba4f4c0 Adds two new augments to Traitor uplink 2020-09-20 06:49:58 -04:00
ShadowLarkens
3f191e4204 NanoUI Goes To Brazil 2020-09-20 02:36:46 -07:00
ShadowLarkens
308e32c860 TGUI Agent Card 2020-09-19 22:57:51 -07:00
Braiden
c55ea87e94 Merge branch 'kbraid.edit/additions' of https://github.com/KBraid/YWPolarisVore into kbraid.edit/additions 2020-09-19 03:03:11 -05:00
Braiden
71266ace1e added new plushies to drop lists 2020-09-19 03:03:09 -05:00
ShadowLarkens
e9566c606d TGUI pAI Radio 2020-09-17 20:09:34 -07:00
ShadowLarkens
bff1c92997 TGUI Communicators 2020-09-17 07:27:14 -07:00
ShadowLarkens
9163d0b9b5 Remove broken, unused commcard system from communicators
This is being done to help facilitate the transfer to TGUI. These
commcards are part of a project that never really got finished, and the
majority of them do not even function in their current implementation,
with only barebone templates and half-made integration.

While it would be neat to have these function one day, I believe it
would be for the best to remove their current implementation wholesale
as this commit does, and allow them to be reintegrated at a later time
when communicators have been converted to TGUI and NanoUI has been
eliminated.
2020-09-17 07:24:30 -07:00
Novacat
a7481a394a Merge pull request #9035 from ShadowLarkens/tgui_pda_rebase
TGUI PDAs/Uplink
2020-09-17 09:37:50 -04:00
ShadowLarkens
165bb939c7 TGUI Uplink 2020-09-16 21:31:51 -07:00
ShadowLarkens
637576848e TGUI PDAs Finale (minus newscaster) 2020-09-16 21:31:50 -07:00
ShadowLarkens
411486f7b4 Move PDA to code/modules/pda 2020-09-16 21:31:49 -07:00
Atermonera
8c593664fe Merge pull request #7607 from Mechoid/FixHacktool
Fixes the hacktool.
2020-09-16 23:16:38 -04:00
Izac Joof Forsgren
d389a57133 Merge branch 'master' into kbraid.edit/additions 2020-09-16 13:38:00 +02:00
Holdelta
a712a23562 I missed a few commas 2020-09-15 23:14:21 -07:00
Holdelta
f0b826a2d7 Reverting changes to RMS.
Removing upstream changes.
2020-09-15 23:04:53 -07:00
Braiden
565bb2a522 fixed a line 2020-09-15 19:35:29 -05:00
Braiden
55d8523787 teshari alternate placement slots (plush only)
was only able to figure out how to do it for the plushie. someone else will need to do the living tesh.
2020-09-15 19:34:40 -05:00
Izac Joof Forsgren
4e7b4df749 Merge branch 'master' into izac 2020-09-14 14:11:02 +02:00
izac112
5fbb0b16b9 Voreupdate 2020-09-13 15:06:19 +02:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
ShadowLarkens
735230d642 TGUI Metal Menu (Travis stop it) 2020-09-11 21:21:50 -07:00
Braiden
e463b40a20 fix 2020-09-11 16:53:17 -05:00
Braiden
8b0a2a285d tesh plushes can be held, they can be worn! 2020-09-11 14:56:56 -05:00
Shadow Quill
eb19c52598 Welderbomb! 2020-09-11 14:03:47 -05:00
Braiden
b8319062fb Better sprites, more sprites!
Do not Merge first!
2020-09-11 04:22:47 -05:00
Braiden
ead7d70d97 a letter 2020-09-10 03:27:02 -05:00
Braiden
5e1b471925 A gift for Jeanne and an upgrade for Strix 2020-09-09 19:43:50 -05:00
ShadowLarkens
dd4f9c9967 TGUI NTOS - Total Conversion 2020-09-05 17:02:58 -07:00
Novacat
75186c414e Merge pull request #8987 from VOREStation/upstream-merge-7624
[MIRROR] Fixes explosion maths.
2020-09-05 12:25:19 -04:00