Commit Graph

22634 Commits

Author SHA1 Message Date
Spades 1ddecf112e Merge pull request #5292 from Ketrai/fishbranch
Adds lobsters and cuttlefish
2019-06-03 21:06:22 -04:00
Heroman 6c65828dd6 Fixes closing laptops with no proper support 2019-06-04 08:19:11 +10:00
Novacat db88e4ce47 Merge pull request #5297 from Heroman3003/mercrename
Renames Syndicate Commandos to Mercenary Commandos
2019-06-02 13:07:54 -04:00
Heroman 34115d5a48 Renames Syndicate Commandos to mercs 2019-06-02 17:49:37 +10:00
Neerti 5a3040a08d Merge pull request #6183 from Mechoid/FixPrecursotechOversights
Fixes some Precursotech oversights.
2019-05-31 22:18:00 -04:00
Ketrai 405bbe60c6 Fixes 2019-05-31 19:15:06 +02:00
Ketrai 6d94902ddf typos 2019-05-31 19:12:00 +02:00
Ketrai 861f3b6086 ohno 2019-05-31 18:45:51 +02:00
Ketrai ba79dc55d1 trash items 2019-05-31 17:41:23 +02:00
Ketrai a9e139e152 Merge remote-tracking branch 'Ketrai/fishbranch' into fishbranch 2019-05-31 17:17:59 +02:00
Ketrai 95edaac47c Adds monkfish
ITS HOOG
2019-05-31 17:17:29 +02:00
Ketrai 8af709f599 Update snacks_vr.dm 2019-05-30 20:35:48 +02:00
Novacat ae20565d46 Merge pull request #5286 from VOREStation/upstream-merge-6154
[MIRROR] Sif Trees and Icon Scaling
2019-05-30 13:15:12 -04:00
Unknown c7333d5a30 Conflict Resolution 2019-05-30 13:04:41 -04:00
Ketrai e9cc1e48ab Adds lobsters and cuttlefish 2019-05-29 22:37:59 +02:00
Novacat eb5b57286d Merge pull request #5288 from VOREStation/upstream-merge-6169
[MIRROR] Ports Radial Menus
2019-05-28 15:31:51 -04:00
Neerti f5f20628fd Merge pull request #6169 from GeneriedJenelle/patch-1
Ports Radial Menus
2019-05-28 14:25:49 -04:00
Neerti 914fc74a7a Merge pull request #6182 from mistyLuminescence/eventroundstart
No More Pre-Roundstart Events
2019-05-28 14:24:35 -04:00
Novacat 3d40c4f38c Merge pull request #5284 from VOREStation/upstream-merge-6176
[MIRROR] Fixes graveyard drones becoming antag
2019-05-28 13:57:24 -04:00
Atermonera f78a4e1dc8 Sif Trees and Icon Scaling 2019-05-28 13:21:39 -04:00
Atermonera 0a8c048eb6 Merge pull request #6176 from GeneriedJenelle/patch-2
Fixes graveyard drones becoming antag
2019-05-28 13:12:55 -04:00
Atermonera 4cde759fac Merge pull request #6175 from Heroman3003/braceself
Fixed mining drill brace deconstruction issue
2019-05-28 13:11:27 -04:00
Unknown 2071f9273e Allows Benches/Racks to support laptops 2019-05-27 12:15:51 -04:00
Unknown 34547c3282 Adds some differences for rugged laptops 2019-05-27 12:09:31 -04:00
Unknown 7515df6187 Another new sprite 2019-05-27 12:01:00 -04:00
Unknown 63fff025bb New Modular Computer Sprites
- New laptop sprite, currently only used for the elite model
- New console sprite that matches pre-existing consoles

Also fixes a bug with Pathfinder spawning
2019-05-27 11:22:33 -04:00
Unknown d13e8ee784 Critical Fixes
- Fixes HREF Exploit
- Replaces Timer Subsystem with a Bay port in a desperate attempt to fix the timer SS crashes
- Port of https://github.com/PolarisSS13/Polaris/pull/6180 and https://github.com/PolarisSS13/Polaris/pull/6178
- Fixes #5272
2019-05-26 23:58:56 -04:00
Novacat 10a1f2f0ed Update borer.dm 2019-05-24 02:04:10 -04:00
Atermonera 38e657c83f Borers TLC 1 2019-05-24 02:01:56 -04:00
mistyLuminescence 42cc20278e Big Bugfix Bonanza 2019-05-23 12:59:29 -04:00
Mechoid 7a35723d85 Sif Animal Expansion 1 2019-05-21 19:58:19 -04:00
Neerti 3e1555c4f8 Merge pull request #6167 from Heroman3003/laptop-bugfixes
Fixes some bugs with laptop
2019-05-19 17:24:10 -04:00
InterroLouis 7b3e62e571 Add files via upload 2019-05-15 13:26:33 -04:00
Novacat 4cb0f34bbf Merge pull request #5227 from VOREStation/upstream-merge-6072
[MIRROR] [RNG is the new RNG] Converts a bunch of events to the Game Master datum system.
2019-05-14 00:01:34 -04:00
Novacat 9b291fa5b2 Merge pull request #5226 from VOREStation/upstream-merge-6160
[MIRROR] Fixes access restrictions for com&com MC program
2019-05-14 00:01:14 -04:00
Novacat f39068dd19 Merge pull request #5225 from VOREStation/upstream-merge-6152
[MIRROR] Restricts alarm monitor MC program access to engineering
2019-05-14 00:01:06 -04:00
Novacat 09dedeb6c9 Update alarm_monitor.dm 2019-05-13 22:57:31 -04:00
Neerti f830985d38 Merge pull request #6072 from Mechoid/Start_Conversion_To_Good_RNG
[RNG is the new RNG] Converts a bunch of events to the Game Master datum system.
2019-05-13 22:57:23 -04:00
Neerti fb5a2f1904 Merge pull request #6160 from Heroman3003/commod-fix
Fixes access restrictions for com&com MC program
2019-05-13 22:57:12 -04:00
Novacat ad5fa6c7e3 Update camera.dm 2019-05-13 22:57:06 -04:00
Novacat d95b7fda42 Update camera.dm 2019-05-13 22:56:41 -04:00
Neerti 74aa8184bf Restricts alarm monitor MC program access to engineering 2019-05-13 22:55:57 -04:00
Neerti 31174cee2d Restricts camera access on MC 2019-05-13 22:55:47 -04:00
Heroman3003 6f80f45eed Ports character setup subsystem 2019-05-14 11:48:34 +10:00
Anewbe d1c953fb0e Merge pull request #6161 from Heroman3003/atmosaccessfix
Fixes access restriction for MC atmos control
2019-05-12 13:57:34 -04:00
Novacat c1f9a97767 Merge pull request #5209 from Ketrai/master
Overhauls Fennix Tail.
2019-05-12 10:45:26 -04:00
Novacat 7322cbf7fb Merge pull request #4906 from Sebbe9123/Disbot
Adds new robit, to discourage facetanking.
2019-05-11 17:59:16 -04:00
Novacat 25585908b3 Switches to Expired Medicine 2019-05-11 17:49:24 -04:00
Atermonera 994e12e1d2 Merge pull request #6162 from Heroman3003/smashing
Fixes smasher recipies being microwave ones
2019-05-11 16:04:54 -04:00
Ketrai 83c3c60798 Adds the new tail to selection. 2019-05-10 10:50:35 +02:00