cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,362 Commits 7 Branches 0 Tags
a46d40a841e34f5bd5e37c251a76d7067777947e
Commit Graph

34744 Commits

Author SHA1 Message Date
Atermonera
a46d40a841 Merge pull request #6315 from Nalarac/Promethean 
Replaces Promethean Mouse with Food
 2019-07-22 00:42:44 -04:00
Heroman
897d47573f Fixes open spaces appearing on z-4 after explosions 2019-07-22 06:30:51 +10:00
Novacat
596928d1fa Merge pull request #5481 from VOREStation/upstream-merge-6311 
[MIRROR] Melee Mobs Can Attack with Pointblank
 2019-07-19 19:16:59 -04:00
Novacat
f78eeb0408 Merge pull request #5480 from VOREStation/upstream-merge-6284 
[MIRROR] fixes communicator weather app's air reading
 2019-07-19 19:16:49 -04:00
Anewbe
65f8ca05ad Merge pull request #6311 from Nalarac/Hivebot 
Melee Mobs Can Attack with Pointblank
 2019-07-19 16:19:46 -04:00
Anewbe
03ff9fa0fe Merge pull request #6284 from Atermonera/weather_app_atmos_reading 
fixes communicator weather app's air reading
 2019-07-19 16:19:36 -04:00
Andrew
b168c77071 Emitters Hit Blob Again (#6310) 
* Emitters Hit Blob Again

* Update overmind.dm

* Deletes line
 2019-07-19 16:13:10 -04:00
Atermonera
983715d896 Merge pull request #6306 from Mechoid/FixRazorDronesandScanners 
Fixes Razor Drones and Sentry Drones.
 2019-07-19 00:53:43 -04:00
Novacat
56861d16cd Merge pull request #5463 from Novacat/nova-pathfinder 
Buffs Air Vents to Baystation Standard
 2019-07-17 17:36:25 -04:00
Novacat
ea05ba7d02 Merge pull request #5454 from TheFurryFeline/TFF-Nomming_Collars 
Edible Collars
 2019-07-17 17:36:11 -04:00
Novacat
b039eacdd7 Merge pull request #5429 from Novacat/nova-basicfixes 
Ease of Eating Changes
 2019-07-17 17:35:58 -04:00
Novacat
d5f0f35519 Merge pull request #5357 from Wickedtemp/master 
Allows New Serenity Mech To Be Constructed
 2019-07-17 17:35:41 -04:00
Atermonera
d987e1e7fd Merge pull request #6301 from Cerebulon/saltoid 
Salt is Salt
 2019-07-16 00:49:52 -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
d8c3d23e60 Merge pull request #5465 from VOREStation/upstream-merge-6272 
[MIRROR] Mining Expansion, the Diggening.
 2019-07-14 01:36:27 -04:00
Novacat
84e8703ee1 Update glasses.dm 2019-07-13 23:35:50 -04:00
Novacat
7781093bf4 Update vision.dm 2019-07-13 23:03:40 -04:00
Novacat
444abae6e0 Merge pull request #5468 from VOREStation/upstream-merge-6297 
[MIRROR] Nalarac's Farmbot Tweak
 2019-07-13 23:00:24 -04:00
Novacat
a788f4200a Merge pull request #5467 from VOREStation/upstream-merge-6298 
[MIRROR] Fixes Plant Produced Stacks
 2019-07-13 23:00:12 -04:00
Novacat
d120748a38 Update equipment_vendor.dm 2019-07-13 22:59:47 -04:00
Novacat
dd1a3a775c Merge pull request #5461 from VOREStation/upstream-merge-6294 
[MIRROR] Makes airtight plastic flaps less of a free pass
 2019-07-13 18:33:36 -04:00
Atermonera
22c5967269 The great rock update. 2019-07-13 18:21:45 -04:00
TheFurryFeline
8c01080dba Nalarac's Farmbot Tweak (#6297) 
* Nalarac's Farmbot Tweak

Adding access_xenobiology to the permission levels for Farmbots so xenobotanists can make use of the bugger. Doing this on behalf of Nalarac, using work from  https://github.com/PolarisSS13/Polaris/pull/6288

* Revert "Nalarac's Farmbot Tweak"

This reverts commit bba618a39687574fd7b7fed463aa8f03ba4c5b4e.

* Test Comment Addition

* Back on Track

Restores reverted line and re-adds CL. This compiles FINE in everything BUT here. Think it's just Travis being buggy or something.
 2019-07-13 15:58:28 -04:00
Anewbe
3c21b379f6 Merge pull request #6298 from Nalarac/patch-12 
Fixes Plant Produced Stacks
 2019-07-13 15:58:19 -04:00
Atermonera
9325f590ca Mining Expansion, the Diggening. 2019-07-13 03:48:38 -04:00
Unknown
472cfd98c4 Buffs Air Vents to Baystation Standard 
...this should probably be ported to Polaris but too lazy right now.
 2019-07-12 09:47:41 -04:00
Novacat
2f4e96c1ad Merge pull request #5459 from VOREStation/upstream-merge-6293 
[MIRROR] Xenoarcheaology Tweaks
 2019-07-12 03:12:55 -04:00
Novacat
d871fc12be Merge pull request #5460 from VOREStation/upstream-merge-6287 
[MIRROR] Allows Set Transfer Amounts of 250 and 500 for Reagent Cartridges
 2019-07-12 03:12:37 -04:00
Atermonera
9c8a3803ff Merge pull request #6294 from Heroman3003/plastic-unflap 
Makes airtight plastic flaps less of a free pass
 2019-07-12 02:52:51 -04:00
Atermonera
257e3dd9fc Merge pull request #6287 from Wickedtemp/master 
Allows Set Transfer Amounts of 250 and 500 for Reagent Cartridges
 2019-07-12 02:51:39 -04:00
Atermonera
21e5e3e111 Xenoarcheaology Tweaks 2019-07-12 02:51:29 -04:00
Atermonera
7aeab71140 Merge pull request #6286 from Mechoid/Glitterpatch 
Patches Glitterflies
 2019-07-12 02:50:16 -04:00
Novacat
969c6032f5 Merge pull request #5456 from VOREStation/upstream-merge-6282 
[MIRROR] Try to fix slimes and Prometheans.
 2019-07-12 02:43:37 -04:00
Atermonera
b1b8562f66 Merge pull request #6282 from Mechoid/TryToFixSlimes 
Try to fix slimes and Prometheans.
 2019-07-11 23:57:56 -04:00
Atermonera
634b56b1d1 Merge pull request #6280 from Nalarac/patch-8 
Fixes Nurse Spider Feeding
 2019-07-11 23:56:43 -04:00
TheFurryFeline
ca01048bab Edible Collars 
Allows those with Trash Can trait to nom on someone's collar. Also adds in a custom flavour message.
 2019-07-10 13:43:29 -04:00
Heroman3003
886bee62ff Fixes endcaps on the specialized pipes (#6283) 2019-07-10 04:53:24 -04:00
Heroman
37ee44bb55 Updates Tether camera networks 2019-07-10 05:28:48 +10:00
Novacat
f55c630690 Merge pull request #5451 from VOREStation/upstream-merge-6269 
[MIRROR] MC camera and access fixes and adjustments
 2019-07-09 15:11:18 -04:00
Heroman3003
ca13a8872c MC camera and access fixes and adjustments (#6269) 
* Adjusts MC camera program, fixes ID program

* Fixes oversight with network access
 2019-07-09 14:01:53 -04:00
Anewbe
19fd2bbab1 Merge pull request #6277 from Mechoid/ActuallyAddTheSeeds 
Actually adds the new seeds to the vendors.
 2019-07-09 14:00:39 -04:00
Heroman3003
864704565c Returns logs from plants (#6274) 
* Returns logs from plants

* Returns production of planks from fruit with wood pulp
 2019-07-08 17:33:01 -04:00
Heroman3003
6b55b63b0b Fixes ghost riders (#6252) 
* Fixes ghost riders

* Wider usage permissions for bikes
 2019-07-07 19:41:22 -04:00
Novacat
4baefef134 Merge pull request #5444 from VOREStation/upstream-merge-6262 
[MIRROR] Civilian Expansion 1: The Plantening
 2019-07-07 19:35:03 -04:00
Novacat
c792c05f2e Merge pull request #5445 from VOREStation/upstream-merge-6271 
[MIRROR] Un-Nerfs Odysseus Tools
 2019-07-07 19:22:15 -04:00
Anewbe
73bd57c28e Merge pull request #6271 from Nalarac/patch-7 
Un-Nerfs Odysseus Tools
 2019-07-07 17:45:20 -04:00
Atermonera
1472642b88 Merge pull request #6262 from Mechoid/CivilianExpansion1 
Civilian Expansion 1: The Plantening
 2019-07-07 17:29:32 -04:00
Anewbe
337315c6de Merge pull request #6242 from Nalarac/patch-4 
Adds Arcane Tech to Cult Items
 2019-07-07 17:17:53 -04:00
Novacat
55a8036df0 Merge pull request #5442 from VOREStation/upstream-merge-6267 
[MIRROR] Fixes carpeted tables refunding wrong carpet type if nonstandard one was used
 2019-07-06 22:29:20 -04:00
Novacat
1064899b8b Merge pull request #5441 from VOREStation/upstream-merge-6270 
[MIRROR] Fixes invisible ventcrawlers
 2019-07-06 22:29:06 -04:00