cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,591 Commits 8 Branches 0 Tags
454cfda0b64056064afccf8a029a0c3b55785d19
Commit Graph

682 Commits

Author SHA1 Message Date
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
Hawk_v3
9e88f55480 Merge remote-tracking branch 'upstream/release' 2019-09-16 14:57:39 +01:00
Unknown
45d493c0b0 Adds bar shelter capsule to vendors 2019-09-15 21:03:58 -04:00
Hawk_v3
a333c03a3c Merge remote-tracking branch 'upstream/release' 2019-09-14 17:10:36 +01: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
Hawk_v3
6d4ec50e08 Merge remote-tracking branch 'upstream/master' 2019-09-01 19:02:01 +01: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
Hawk_v3
0f3c802427 Merge remote-tracking branch 'upstream/master' 2019-08-22 21:32:01 +01: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
Hawk_v3
0c85b3a4dd Merge remote-tracking branch 'upstream/master' 2019-08-09 21:35:04 +01: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
Hawk_v3
2a73ca4304 Merge remote-tracking branch 'upstream/master' 2019-07-23 22:51:24 +01:00
Atermonera
1abe267189 Merge pull request #6314 from Nalarac/patch-1 
Corrects Mining Vendor Entries
 2019-07-22 00:42:53 -04:00
Hawk_v3
8654b6bdf4 Merge remote-tracking branch 'upstream/master' 2019-07-19 22:05:31 +01: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
Hawk_v3
daf005399d Merge remote-tracking branch 'server/master' 2019-07-07 19:37:13 +01:00
MASMC
31543fc0d3 Oops, only did smacking with a rock, not satchels too 2019-07-07 13:50:21 -04:00
Hawk_v3
124afe1cbc Merge remote-tracking branch 'upstream/master' 2019-07-07 18:41:28 +01:00
MASMC
d682ecacfa Fixes ore boxes picking up strange rocks 
Simple name check fix. Nothing should fill up, as the rock "bounces" out
of the crate. Enjoy.
 2019-07-06 18:40:42 -04:00
Heroman
c8d9bce55d Allows to compress coal into carbon sheets 2019-07-07 08:01:31 +10:00
Hawk_v3
bc7ea8379a Merge remote-tracking branch 'upstream/master' 2019-07-02 17:54:29 +01: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
Hawk_v3
c7b05c05fb Merge remote-tracking branch 'upstream/master' 2019-06-11 02:34:25 +01: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
Hawk_v3
7bb9c92c9a Merge remote-tracking branch 'upstream/master' 2019-06-03 12:31:48 +01:00
Atermonera
4cde759fac Merge pull request #6175 from Heroman3003/braceself 
Fixed mining drill brace deconstruction issue
 2019-05-28 13:11:27 -04:00
Hawk_v3
470c86fb45 Merge remote-tracking branch 'upstream/master' 2019-05-08 19:59:55 +01: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
Hawk_v3
27e73883fc Merge remote-tracking branch 'upstream/release' 2019-05-04 21:03:48 +01: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