Razgriz
a269d28a8b
Merge pull request #805 from CHOMPStationBot/upstream-merge-9276
...
[MIRROR] [MIRROR] No more unnearsightedness!
2020-11-05 03:19:31 -07:00
Verkister
a8aedccb38
Merge pull request #9276 from VOREStation/upstream-merge-7753
...
[MIRROR] No more unnearsightedness!
2020-11-05 10:06:02 +00:00
Razgriz
2f18c69fb2
Merge pull request #797 from LunarFleet/Lun-Egg
...
Egg Laying Implant Updates - Makes cascading toggleable
2020-11-03 02:26:59 -07:00
LunarFleet
aaa61d6377
Makes cascading toggleable
2020-11-02 23:46:52 -05:00
cadyn
109f8c9b13
Merge branch 'master' into tweakfixes
2020-10-28 21:33:40 -07:00
Nadyr
3b8655f2e4
Merge pull request #768 from CHOMPStationBot/upstream-merge-9257
...
[MIRROR] This is *not* what _onclick is for FFS
2020-10-28 05:01:59 -04:00
Verkister
420b44c449
Merge pull request #9257 from ShadowLarkens/paifix
...
This is *not* what _onclick is for FFS
2020-10-28 07:11:48 +00:00
Cadyn
947fe850ff
Yummy bugfixes
2020-10-27 19:58:49 -07:00
Razgriz
545b1a8486
Merge pull request #761 from CHOMPStationBot/upstream-merge-9253
...
[MIRROR] [MIRROR] Adds new balloons
2020-10-27 02:15:44 -07:00
Razgriz
548c123e77
Merge pull request #760 from CHOMPStationBot/upstream-merge-9225
...
[MIRROR] [MIRROR] Makes wall-mounted machines layer above windows
2020-10-27 02:15:15 -07:00
Verkister
b7f4c2192c
Merge pull request #9253 from VOREStation/upstream-merge-7748
...
[MIRROR] Adds new balloons
2020-10-27 08:17:38 +00:00
Verkister
9848c0e719
Merge pull request #9225 from VOREStation/upstream-merge-7708
...
[MIRROR] Makes wall-mounted machines layer above windows
2020-10-27 08:16:29 +00:00
Razgriz
d1d2e5905c
Merge pull request #744 from cadyn/husksurgery
...
Adding dehusk and tox/oxyloss surgery
2020-10-23 19:57:51 -07:00
Nadyr
a9bdc52b09
Merge pull request #719 from CHOMPStationBot/upstream-merge-9227
...
[MIRROR] [MIRROR] Adds sifgrass floor tiles. Grass tiles spawn greengrass
2020-10-22 09:35:07 -04:00
Cadyn
732025c8ce
Adding dehusk and tox/oxyloss surgery
2020-10-21 23:32:27 -07:00
Verkister
7d408e9996
Merge pull request #9227 from VOREStation/upstream-merge-7714
...
[MIRROR] Adds sifgrass floor tiles. Grass tiles spawn greengrass
2020-10-19 10:39:13 +00:00
Verkister
16a23eadec
Merge pull request #9235 from VOREStation/upstream-merge-7726
...
[MIRROR] Fix most borosilicate shards disappearing instantly after being made
2020-10-19 10:37:24 +00: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
