81e70a3c4d
Merge remote-tracking branch 'upstream/master' into upstream-merge-7454
2020-11-13 23:13:01 -08:00
1008e4cc95
HOLY FUCK THE HAT WORKS
2020-11-11 19:48:44 -06:00
019926cbc7
Fresh Meat, Leatherworking
2020-11-07 15:08:04 -05:00
a82521cab5
No more unnearsightedness! ( #7753 )
...
* No more unnearsightedness!
* Oops
* Oops pt 2
2020-11-04 13:27:03 -05:00
cf5f84f711
Adds AlliCo Grab-A-Gift
2020-10-30 00:49:05 -04:00
af300cc037
This is *not* what _onclick is for FFS
2020-10-27 16:10:48 -07:00
da61bc2511
Merge pull request #9253 from VOREStation/upstream-merge-7748
...
[MIRROR] Adds new balloons
2020-10-27 10:17:27 +02:00
44830393fc
Merge pull request #9225 from VOREStation/upstream-merge-7708
...
[MIRROR] Makes wall-mounted machines layer above windows
2020-10-27 10:15:15 +02:00
41365c5634
Adds new balloons
2020-10-25 07:34:32 -04:00
d6be6c90ad
Merge pull request #9235 from VOREStation/upstream-merge-7726
...
[MIRROR] Fix most borosilicate shards disappearing instantly after being made
2020-10-18 15:57:07 +03:00
3634234788
Fix most borosilicate shards disappearing instantly after being made ( #7726 )
...
*Fixed borosilicate glass not producing shards in most situations.
2020-10-17 06:06:15 -04:00
125ef651c8
Adds sifgrass floor tiles. Grass tiles spawn greengrass ( #7714 )
2020-10-17 02:05:55 -04:00
de36b996b9
Makes wall-mounted machines layer above windows
2020-10-17 02:03:26 -04:00
b6ac68836a
please work PLEASE
2020-09-29 00:28:25 -04:00
3d7b051f2b
Convert /material to /datum/material
2020-09-27 16:16:44 -07:00
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
534623b1fd
Delete accidentally-added file from Commcard PR
2020-09-21 16:01:46 -04:00
d49640431d
Merge pull request #9062 from ShadowLarkens/tgui_finale
...
NanoUI Goes To Brazil
2020-09-21 14:13:16 -04:00
6fad165033
Merge pull request #9067 from VOREStation/upstream-merge-7651
...
[MIRROR] Tweaks to pickup/equip sounds.
2020-09-21 13:51:44 -04:00
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
a94f3189fd
Remove broken, unused commcard system from communicators
2020-09-21 12:37:52 -04:00
cbfd4789d7
Fix duplicate results from analyzing some objects ( #7660 )
2020-09-20 07:18:35 -04:00
95ff8c2080
Tweaks to pickup/equip sounds.
2020-09-20 06:57:07 -04:00
378ba4f4c0
Adds two new augments to Traitor uplink
2020-09-20 06:49:58 -04:00
3f191e4204
NanoUI Goes To Brazil
2020-09-20 02:36:46 -07:00
308e32c860
TGUI Agent Card
2020-09-19 22:57:51 -07:00
e9566c606d
TGUI pAI Radio
2020-09-17 20:09:34 -07:00
bff1c92997
TGUI Communicators
2020-09-17 07:27:14 -07:00
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
a7481a394a
Merge pull request #9035 from ShadowLarkens/tgui_pda_rebase
...
TGUI PDAs/Uplink
2020-09-17 09:37:50 -04:00
165bb939c7
TGUI Uplink
2020-09-16 21:31:51 -07:00
637576848e
TGUI PDAs Finale (minus newscaster)
2020-09-16 21:31:50 -07:00
411486f7b4
Move PDA to code/modules/pda
2020-09-16 21:31:49 -07:00
8c593664fe
Merge pull request #7607 from Mechoid/FixHacktool
...
Fixes the hacktool.
2020-09-16 23:16:38 -04:00
735230d642
TGUI Metal Menu (Travis stop it)
2020-09-11 21:21:50 -07:00
1da2502dc1
Add Rapid Pipe Dispenser to R&D
2020-09-11 21:09:39 -07:00
dd4f9c9967
TGUI NTOS - Total Conversion
2020-09-05 17:02:58 -07:00
75186c414e
Merge pull request #8987 from VOREStation/upstream-merge-7624
...
[MIRROR] Fixes explosion maths.
2020-09-05 12:25:19 -04:00
5be90e22ff
Update tanks.dm
2020-09-05 12:14:14 -04:00
f4e5ab45af
Fixes explosion maths.
2020-09-05 11:05:59 -04:00
e4d0b1a81b
Adds board versions of a bunch of lawsets ( #7611 )
2020-09-05 10:20:42 -04:00
c32f05e1f7
TGUI Civilian
...
UI's Converted:
- Aurora Cooking
- Chaplain Book Selection
- ColorMate
- Cryo Storage
- Holodeck
- Jukebox
- Looking Glass
- Microwave
- Newscasters
- Timeclock
- Vending Machine Improvements
2020-09-02 13:32:42 -07:00
dba5a14b5f
Merge pull request #8952 from Heroman3003/constructible-vorelaws
...
Constructible vorelaws
2020-09-01 08:02:26 -04:00
732448d389
Fixes indent errors
2020-09-01 20:37:56 +10:00
045be423b3
.dm
2020-09-01 16:27:42 +10:00
00913ff339
Adds boards for AI vore laws
2020-09-01 16:26:39 +10:00
99009e6266
Jetpack cleanup, don't use fuel when unneeded
2020-08-31 21:13:04 -04:00
7c57c7c0bd
Vendor enhancement fixes ( #7577 )
...
* Vendor enhancement fixes
* skrellsnax trash, tuna name
2020-08-30 02:49:00 -04:00
ffdd8de3ce
Site Management lookover for _vr stuff
2020-08-29 05:22:52 +10:00
10ca73bc6e
Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7576
2020-08-28 13:30:54 -04:00
ShadowLarkens