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
48,217 Commits 5 Branches 0 Tags
fcaf8906b2f266b4156c8c7a881eafd08d9a752c
Commit Graph

532 Commits

Author SHA1 Message Date
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
Heroman
fef914b3bd Adds KA holster to mining vendor 2019-04-22 06:47:55 +10:00
Neerti
3b2c4c5271 Merge pull request #6083 from Heroman3003/runtime-lead-sand-whatever 
Fixes runtiming with mineral turfs
 2019-04-14 19:56:33 -04:00
Neerti
6441d365df Merge pull request #6080 from Mechoid/FixAccidentalAlchemy 
Fixes My Idiocy
 2019-04-14 02:48:40 -04:00
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
Heroman3003
b240e8d60d Fixes flags anchoring themselves wrong way 2019-04-08 10:34:21 +10:00
Heroman
09b5ae0ac4 AND REMOVES THEM FROM NORMAL ONES 2019-04-08 07:38:22 +10:00
Heroman
f955d69bd9 Moves destroy_artefact vars to _vr file 2019-04-08 07:37:48 +10:00
Heroman
7d828a7777 Makes Sonic Jackhammer a 'safe' mining tool 2019-04-08 07:27:02 +10:00
Heroman
44780295c9 Fixes tiny fans blocking people and not blocking atmos 2019-04-07 11:14:31 +10:00
Novacat
1519496d9f Merge pull request #4849 from VOREStation/upstream-merge-5978 
[MIRROR] Unpicks some mining spaghetti
 2019-03-28 22:01:36 -04:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Neerti
fe0b7373b3 Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it 2019-03-27 14:49:30 -04:00
Neerti
b9adc37685 Standardizes rotation verbs 2019-03-27 03:17:07 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00