cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,219 Commits 5 Branches 0 Tags
f71bfa7100101fb872a079116f7bbf3f4533cecb
Commit Graph

547 Commits

Author SHA1 Message Date
Aronai Sieyes
f71bfa7100 Ore Scanner is written incorrectly 
Only revealed by vchat
 2020-03-01 17:22:31 -05:00
Novacat
b44f8e0911 Merge pull request #6592 from VOREStation/vchat-rebase 
VChat: Redone chat output in Vue.js
 2020-03-01 10:51:29 -05:00
Atermonera
11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Arokha Sieyes
1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
Novacat
33570d10e6 Update ore_box.dm 2020-02-17 01:33:15 -05:00
Novacat
332e3271d9 Update ore_box.dm 2020-02-17 01:31:48 -05:00
Atermonera
c5b6dfa259 Fixes mining borg ore box movement astral sorcery 2020-02-17 01:18:31 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Heroman3003
0d21e91b68 Merge branch 'master' into belt-mining 2020-02-10 22:47:42 +10:00
Atermonera
16989eaa84 Merge pull request #6650 from Shadow-Quill/Stacker-Runtime-Fix 
Fixes constant stacking machine runtimes
 2020-01-28 14:14:06 -05:00
Heroman
69ab62b510 pre-defines vacuum mineral turfs to appease travis 2020-01-23 19:07:19 +10:00
Atermonera
9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
Atermonera
89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Heroman3003
dfb6ce947b Fixes shelter lighting when deployed in lighting-unsimulated area 2019-09-26 10:15:19 +10:00
Unknown
69691a209f No need for wall checks 2019-09-18 15:35:56 -04:00
Unknown
fcaf8906b2 Shelter Capsule Deploy Check 
...Simpler and hopefully it works
 2019-09-18 15:30:59 -04:00
Unknown
45d493c0b0 Adds bar shelter capsule to vendors 2019-09-15 21:03:58 -04:00
Novacat
305e79db40 Merge pull request #5834 from Novacat/nova-heterochromia 
Cargo hardsuit changes
 2019-09-14 00:39:23 -04:00
Unknown
1ae104f4bd Fixes logic problems 2019-09-13 00:11:47 -04:00
Unknown
4f9fb90e90 Fixes check 2019-09-12 23:29:25 -04:00
Unknown
7fcd2e3f3f Removes redundant code, fixes whitelists/blacklists 2019-09-12 23:23:22 -04:00
Unknown
5e2abf9fd4 This is becoming a shelter capsule PR 2019-09-12 22:50:03 -04:00
Unknown
db45400201 Same fix, much better code 2019-09-12 01:13:10 -04:00
Unknown
c0f75d7e7b Miscellaneous Fixes Pt. 2 
- Shelter Capsules deployed indoors will no longer destroy above turfs.
 2019-09-12 00:32:56 -04:00
Unknown
6f5daa6186 Cargo hardsuit changes 
- Adds new empty hardsuits to cargo.
- Splits the mining vendor Industrial suit from the cargo ordered one
 2019-09-09 09:55:00 -04:00
Unknown
0d73c8ad76 Early Polaris Ports 
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434

No vorestation edit markings because they are polariscode ports.
 2019-08-30 23:55:58 -04:00
Unknown
a7bc6b858d Redemption Machine Changes 
- Brings back silver pickaxe
- Merges Polaris and Virgo Exploration Vendors
- Ports early fixes to exploration vendor from Polaris
 2019-08-21 20:17:39 -04:00
Novacat
17c2ba18be Update equipment_vendor.dm 2019-08-21 17:49:53 -04:00
Mechoid
ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
Heroman
e0138738f4 Limits new equipment properly 2019-08-17 12:35:44 +10:00
Unknown
fb61850896 Mining/Explorer Tweaks 
- ORM Vendor no longer provides phase pistols
- Steel Machete renamed to Plasteel Machete
- Industrial Hardsuit modules renamed to simply Hardsuit modules
- Adds some of the new mining stuff to the explorer vendor
- Fixes missing survivalfood flag from liquidprotein rations
 2019-08-01 16:25:58 -04:00
Atermonera
1abe267189 Merge pull request #6314 from Nalarac/patch-1 
Corrects Mining Vendor Entries
 2019-07-22 00:42:53 -04:00
Novacat
d48861c7e3 Merge pull request #5469 from VOREStation/upstream-merge-6245 
[MIRROR] The great rock update.
 2019-07-14 01:36:40 -04:00
Novacat
d120748a38 Update equipment_vendor.dm 2019-07-13 22:59:47 -04:00
Atermonera
22c5967269 The great rock update. 2019-07-13 18:21:45 -04:00
Atermonera
9325f590ca Mining Expansion, the Diggening. 2019-07-13 03:48:38 -04:00
Heroman
c8d9bce55d Allows to compress coal into carbon sheets 2019-07-07 08:01:31 +10:00
Heroman
d0b9ab620a Adds mining GPS to mining vendor 2019-07-02 12:08:05 +10:00
Novacat
9ac9317657 Merge pull request #5320 from Ketrai/fishingrod 
Adds a durasteel fishing rod.
 2019-06-18 17:50:55 -04:00
Neerti
4512cd7b18 Merge pull request #6200 from Heroman3003/xenoarch-fixes 
Fixes some xenoarch bugs
 2019-06-09 11:47:07 -04:00
Ketrai
cea411049a Adds a durasteel fishing rod. 2019-06-07 16:48:35 +02: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
31d7663bf1 Conflict Resolution 2019-05-06 14:32:18 -04:00
Novacat
b4b5ca1eaf Update equipment_vendor.dm 2019-05-06 14:24:40 -04:00
Atermonera
90ee680dd5 Fishing! 2019-05-06 14:16:27 -04:00
Heroman
9d234f39ad Adds a bunch new PoIs to Underdark 2019-04-30 08:20:42 +10:00
Heroman
1b87b38c4a More PoIs 2019-04-30 05:39:42 +10:00
Novacat
cd022ca990 Merge pull request #5113 from Heroman3003/ka-holsters 
Adds KA holster to mining vendor
 2019-04-24 01:27:58 -04:00
Atermonera
eff39e3366 Merge pull request #6123 from Mechoid/OneDayIllBeAGoodDev 
Marble ore [Exists] again.
 2019-04-22 14:30:03 -04:00
Neerti
2ffe390346 Merge pull request #6116 from Mechoid/WhyAmIStupid 
God damnit past me.
 2019-04-22 00:27:50 -04:00