cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-01 03:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,530 Commits 8 Branches 26 Tags
bd2f4e99d3dbf71b11f76f8880540418280dbffb
Commit Graph

5392 Commits

Author SHA1 Message Date
Unknown
f6fc13003b Balance fixes and bugfixes 
- Adjusts some of the contents of the ERT ship.
- Fixes mercenary coms not working
- Hopefully! Fixes antag coms not working
- Fixes uplinks not deducting telecrystals when things are bought
 2020-11-14 12:20:46 -05:00
ShadowLarkens
81e70a3c4d Merge remote-tracking branch 'upstream/master' into upstream-merge-7454 2020-11-13 23:13:01 -08:00
Mechoid
019926cbc7 Fresh Meat, Leatherworking 2020-11-07 15:08:04 -05:00
Shadow-Quill
a82521cab5 No more unnearsightedness! (#7753) 
* No more unnearsightedness!

* Oops

* Oops pt 2
 2020-11-04 13:27:03 -05:00
Atermonera
cf5f84f711 Adds AlliCo Grab-A-Gift 2020-10-30 00:49:05 -04:00
ShadowLarkens
af300cc037 This is *not* what _onclick is for FFS 2020-10-27 16:10:48 -07:00
Verkister
da61bc2511 Merge pull request #9253 from VOREStation/upstream-merge-7748 
[MIRROR] Adds new balloons
 2020-10-27 10:17:27 +02:00
Verkister
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
Schnayy
41365c5634 Adds new balloons 2020-10-25 07:34:32 -04:00
Verkister
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
Meghan-Rossi
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
Atermonera
125ef651c8 Adds sifgrass floor tiles. Grass tiles spawn greengrass (#7714) 2020-10-17 02:05:55 -04:00
Meghan-Rossi
de36b996b9 Makes wall-mounted machines layer above windows 2020-10-17 02:03:26 -04: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
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
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
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
ShadowLarkens
735230d642 TGUI Metal Menu (Travis stop it) 2020-09-11 21:21:50 -07: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
Novacat
5be90e22ff Update tanks.dm 2020-09-05 12:14:14 -04:00
Verkister
f4e5ab45af Fixes explosion maths. 2020-09-05 11:05:59 -04:00
Heroman3003
e4d0b1a81b Adds board versions of a bunch of lawsets (#7611) 2020-09-05 10:20:42 -04:00
ShadowLarkens
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
Novacat
dba5a14b5f Merge pull request #8952 from Heroman3003/constructible-vorelaws 
Constructible vorelaws
 2020-09-01 08:02:26 -04:00
Heroman
732448d389 Fixes indent errors 2020-09-01 20:37:56 +10:00
Heroman3003
045be423b3 .dm 2020-09-01 16:27:42 +10:00
Heroman3003
00913ff339 Adds boards for AI vore laws 2020-09-01 16:26:39 +10:00
Cyantime
99009e6266 Jetpack cleanup, don't use fuel when unneeded 2020-08-31 21:13:04 -04:00
Cerebulon
7c57c7c0bd Vendor enhancement fixes (#7577) 
* Vendor enhancement fixes

* skrellsnax trash, tuna name
 2020-08-30 02:49:00 -04:00
Heroman
ffdd8de3ce Site Management lookover for _vr stuff 2020-08-29 05:22:52 +10:00
Unknown
10ca73bc6e Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7576 2020-08-28 13:30:54 -04:00
Novacat
28c19ee066 Merge pull request #8868 from VOREStation/upstream-merge-7571 
[MIRROR] Colony Director -> Site Manager
 2020-08-28 13:17:58 -04:00