Commit Graph

3556 Commits

Author SHA1 Message Date
Cadyn 4d2f915f33 Merge master and build TGUI 2020-11-15 02:17:53 -08:00
Chompstation Bot faa287d91b [MIRROR] Adds AlliCo Grab-A-Gift 2020-11-14 07:32:50 +00:00
Razgriz 0e07c9a739 Merge pull request #824 from r4d6/cigar
Add cigar cases to the loadout
2020-11-11 19:30:25 -07:00
Cadyn 613033221d trying to appease travis some more 2020-11-11 16:52:47 -08:00
Cadyn e0c685e59a travis is a bitch 2020-11-11 16:01:57 -08:00
Cadyn 9f54f4fb3d stupid runtime reee 2020-11-11 15:34:13 -08:00
Cadyn cfc8f579a2 Added spicy tools 2020-11-11 15:07:16 -08:00
r4d6 d628ce8ff4 Move the cigar cases to a new _ch file 2020-11-10 00:04:17 -05:00
r4d6 d0cbf7f856 Add cigar cases to the loadout. 2020-11-09 19:23:00 -05:00
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 947fe850ff Yummy bugfixes 2020-10-27 19:58:49 -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 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
Cadyn 732025c8ce Adding dehusk and tox/oxyloss surgery 2020-10-21 23:32:27 -07: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 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
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
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 308e32c860 TGUI Agent Card 2020-09-19 22:57:51 -07: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
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
Shadow Quill eb19c52598 Welderbomb! 2020-09-11 14:03:47 -05: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
Darlantan 09768ea90c Confetti cannon
-Adds confetti cannon
-Adds grenade object needed to make the cannon work
-Makes the cannon printable at RnD
2020-09-05 07:15:49 -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