cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-25 01:22:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,468 Commits 7 Branches 0 Tags
7c492a3d17ec54cb5c0158979f9827a57cb15d53
Commit Graph

23691 Commits

Author SHA1 Message Date
Novacat
a713ce2ff5 Merge pull request #5503 from VOREStation/upstream-merge-6304 
[MIRROR] Adds Ripley Speedboost Equipment
 2019-07-24 06:17:54 -04:00
Atermonera
f0311ed4ff Merge pull request #6304 from Nalarac/Mecha2 
Adds Ripley Speedboost Equipment
 2019-07-24 00:02:48 -04:00
Atermonera
f519272525 Merge pull request #6290 from Mechoid/SubMunitions 
Adds Submunition projectiles, and a laser gun showcasing them.
 2019-07-23 23:35:05 -04:00
Hawk_v3
2a73ca4304 Merge remote-tracking branch 'upstream/master' 2019-07-23 22:51:24 +01:00
Atermonera
a6d7c4ee81 Merge pull request #6285 from Mechoid/SLED 
Adds the SLED.
 2019-07-23 16:21:42 -04:00
Mewchild
e50c9642e6 Adds maint door, replaces alien tables, adds air alarm and missing APCs 2019-07-22 20:15:30 -05:00
Heroman
3e9afe908c Adds admin logging for usage of Eat Trash 2019-07-23 09:16:07 +10:00
if there were two guys on the moon
163ac56503 sprites and map fix 2019-07-22 23:20:00 +01:00
Novacat
e90ba13352 Merge pull request #5494 from VOREStation/upstream-merge-6316 
[MIRROR] Makes rigpieces phoron immune
 2019-07-22 13:03:31 -04:00
Novacat
61cbac95ef Merge pull request #5492 from VOREStation/upstream-merge-6321 
[MIRROR] Allows Longer Visible Text on Beakers
 2019-07-22 13:02:50 -04:00
Novacat
1f0ab4e5f6 Merge pull request #5491 from VOREStation/upstream-merge-6308 
[MIRROR] Fixes some kitchen screwery
 2019-07-22 13:02:09 -04:00
Novacat
803b67d853 Merge pull request #5490 from VOREStation/upstream-merge-6314 
[MIRROR] Corrects Mining Vendor Entries
 2019-07-22 13:01:45 -04:00
Atermonera
aea9752eac Merge pull request #6316 from Heroman3003/phoronguard-again 
Makes rigpieces phoron immune
 2019-07-22 00:44:39 -04:00
Atermonera
6a12033368 Merge pull request #6321 from Nalarac/patch-2 
Allows Longer Visible Text on Beakers
 2019-07-22 00:44:19 -04:00
Atermonera
a78cdc85cc Merge pull request #6308 from Heroman3003/kitchenfixes 
Fixes some kitchen screwery
 2019-07-22 00:43:05 -04:00
Atermonera
1abe267189 Merge pull request #6314 from Nalarac/patch-1 
Corrects Mining Vendor Entries
 2019-07-22 00:42:53 -04:00
Atermonera
a46d40a841 Merge pull request #6315 from Nalarac/Promethean 
Replaces Promethean Mouse with Food
 2019-07-22 00:42:44 -04:00
Hawk_v3
ff20e10352 Merge remote-tracking branch 'upstream/master' 2019-07-20 22:51:13 +01:00
Hawk-v3
0385bab820 Vermitol change. 
No, Vermicetol is burn based. It uses burn base chemicals.
 2019-07-20 22:38:19 +01: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
Hawk_v3
8654b6bdf4 Merge remote-tracking branch 'upstream/master' 2019-07-19 22:05:31 +01:00
Anewbe
65f8ca05ad Merge pull request #6311 from Nalarac/Hivebot 
Melee Mobs Can Attack with Pointblank
 2019-07-19 16:19:46 -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
Wickedtemp
fc8f2946f9 Forgot 'VOREStation Removal' bit 
Also made it mlem related because I had to, I will not apologize for art.
 2019-07-19 03:25:16 -05:00
if there were two guys on the moon
d803b557fd ML3M 2019-07-19 08:32:24 +01:00
Wickedtemp
e99ef30d1c Update external_repair.dm 2019-07-19 02:29:48 -05:00
Atermonera
983715d896 Merge pull request #6306 from Mechoid/FixRazorDronesandScanners 
Fixes Razor Drones and Sentry Drones.
 2019-07-19 00:53:43 -04:00
Sebbe
b87cad8da0 Why are we still here 
Just to suffer
 2019-07-18 20:27:46 +02: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
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
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
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
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