cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-06-24 14:53:55 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,974 Commits 9 Branches 26 Tags
e6f679d147c75a405b080aa41e5b64158366b114
Commit Graph

10976 Commits

Author SHA1 Message Date
Arokha Sieyes 0cb233514a Replace IV Drips with medical stands 2020-02-22 00:51:49 -05:00
Aronai Sieyes 5a75891c77 Salvageable machines 2020-02-21 16:54:41 -05:00
Aronai Sieyes 7206d8e7f4 New cent/NT headset sprites 
Old ones green?
 2020-02-21 11:46:36 -05:00
Aronai Sieyes 11edb0febe New rollerbed sprites 
Less eye-melting blue
 2020-02-21 11:34:09 -05:00
Heroman 67b6e7e160 Changes the behaviour of emagged pizza voucher 2020-02-21 17:06:40 +10:00
Atermonera 1010fd283b Merge pull request #6690 from VOREStation/vplk-ntnet-fixer 
Fixes to Modular Computers and NTNet Relays
 2020-02-21 01:58:20 -05:00
Heroman 0210d3de35 Removes emag interaction from pizza voucher 2020-02-21 13:45:59 +10:00
Shadow b95c2261b2 Holowarrants 2020-02-20 16:04:51 -06:00
Arokha Sieyes 1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
ShadowLarkens 22c85075f4 Ported tg asset cache 2020-02-19 19:55:01 -05:00
Arokha Sieyes d5b820fc58 VChat: Redone chat output in Vue.js 
Co-authored-by: Leshana <Leshana@users.noreply.github.com>
 2020-02-19 19:55:01 -05:00
Atermonera 224d45f3bc Merge pull request #6711 from PolarisSS13/revert-6706-vplk-fix-commnews 
Revert "Fix runtime in helper.dm,92"
 2020-02-19 19:27:11 -05:00
Novacat a5696aa0b0 Merge pull request #6613 from VOREStation/revert-5680-Verkister-patch-6 
Revert "Bandaid for helper.dm runtime lag"
 2020-02-19 01:54:40 -05:00
Novacat e9c3be3318 Revert "Bandaid for helper.dm runtime lag" 2020-02-19 01:43:43 -05:00
Leshana 93cba6c326 Fix runtime in helper.dm,92 (#6706) 
Lists in byond are 1-indexed not 0-indexed.
 2020-02-19 01:26:05 -05:00
Aronai Sieyes 24ebfa36f1 Merge pull request #6581 from Heroman3003/pluspineapple 
Adds pineapple pizza to pizza voucher pool
 2020-02-18 14:08:53 -05:00
Unknown a5f3776a91 adds _vr to trash pile 2020-02-17 00:01:50 -05:00
Unknown b5f337a3b0 Replaces Tramadol maint pills with Paracetamol 2020-02-16 10:54:55 -05:00
Heroman ae21ea53f5 AND DELETES ORIGINAL 2020-02-16 04:58:48 +10:00
Heroman 10e3dd6368 Moves falling datum for pizza delviery to voucher file 2020-02-16 04:58:32 +10:00
Heroman e162f75286 Adds pineapple pizza to pizza voucher pool 2020-02-16 04:55:40 +10:00
Novacat 4f4a29b5fc Merge pull request #6568 from VOREStation/stream 
Remove use of <<
 2020-02-14 09:34:12 -05:00
Heroman3003 718feb1ebe Adds pineapple pizzabox (#6682) 2020-02-13 17:11:43 -05:00
Arokha Sieyes 47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Novacat 06b7651799 Update nanopaste.dm 2020-02-10 18:59:12 -05:00
Atermonera 6374108fa2 Applies same restrictions as first aid to external synth repair 2020-02-10 18:53:31 -05:00
Heroman3003 0d21e91b68 Merge branch 'master' into belt-mining 2020-02-10 22:47:42 +10:00
Atermonera 0bbc8109ae Merge pull request #6675 from GeneriedJenelle/patch-1 
Logs graffiti and crayon drawings: Non-Cursed PR
 2020-02-09 23:45:06 -05:00
Atermonera 7b20362aaf Merge pull request #6662 from Shadow-Quill/Baton-Intent-Change 
Stunbatons will now only harmbaton on grab/harm intents
 2020-02-09 14:47:00 -05:00
Novacat 22c0fd363f Update bed.dm 2020-02-08 15:56:26 -05:00
Meghan-Rossi 3935aa3e47 fix conflict causing compile error 2020-02-08 19:32:03 +00:00
Atermonera c9e3257d17 2020 Civilian Wing Overhaul 2020-02-08 13:56:05 -05:00
Novacat bd2b049c74 Merge pull request #6543 from Heroman3003/taurlocator 
Also applies taur riding teleport limitation to translocators
 2020-02-07 23:05:38 -05:00
Heroman b8c07ae29b Also applies taur riding teleport limitation to translocators 2020-02-08 13:35:41 +10:00
Heroman 8e26511aa1 Prevents some teleporting abuses with taur riding 2020-02-08 07:45:53 +10:00
Arokha Sieyes 3c5cfa838d Update sleevemate warning message 2020-02-04 20:16:13 -05:00
Atermonera 1f227a9b55 Merge pull request #6664 from PrismaticGynoid/loadouttoys 
Adds some toys to the loadout
 2020-02-03 20:50:45 -05:00
Atermonera 80ec8ac200 Merge pull request #6656 from Amunak/countable-lists 
Prettifies closet contents list with (newly added) countable variant of english_list
 2020-02-01 18:01:23 -05:00
Heroman 38bf0a33c6 Fixes and re-implements Rogue Mining (Belt Mining) 2020-01-23 18:43:20 +10:00
Atermonera 908489b1bd Merge pull request #6640 from TheFurryFeline/patch-5 
Aaaa, typo fixy
 2020-01-21 18:14:22 -05:00
Novacat 1688d86772 Merge pull request #6478 from VOREStation/upstream-merge-6621 
[MIRROR] Moar descriptions for things
 2020-01-21 01:33:06 -05:00
Novacat 7b815bd594 Update radio.dm 2020-01-21 01:23:57 -05:00
Atermonera d10a72a77f Adds a mega cooking recipe 2020-01-20 23:15:01 -05:00
Atermonera 9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
Novacat 708e0b477e Merge pull request #6463 from VOREStation/upstream-merge-6619 
[MIRROR] Can now (de)construct chem masters
 2020-01-15 23:35:39 -05:00
Atermonera 7ae5204eaf Merge pull request #6619 from Shadow-Quill/Chem-Master-Building 
Can now (de)construct chem masters
 2020-01-15 23:16:19 -05:00
Atermonera c50ef77161 Merge pull request #6612 from Shadow-Quill/PDA-Ctrl-Click 
Ctrl+Click now removes pens from PDAs
 2020-01-15 23:08:06 -05:00
Unknown d3aa3bed3c Removes gnomes 
https://cdn.discordapp.com/attachments/173832207784214528/666485419747180554/7f1b99fdd795299aabd6ddef202ecf98.png

This is why we cannot have nice things.
 2020-01-13 22:49:15 -05:00
Heroman f032c80486 Also buffs vore laws chance for lost voreborgs 2020-01-13 17:55:00 +10:00
Novacat c7b689246d Merge pull request #6423 from drexample/WE-ALWAYS-DELIVER 
DO YOU NEED A SLICE OF JOY IN YOUR LIFE?
 2020-01-12 22:14:17 -05:00