cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-07 06:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,433 Commits 8 Branches 26 Tags
957fc2f17f9045535c8d3bc40ed92940fea1869c
Commit Graph

22823 Commits

Author SHA1 Message Date
Novacat
8f00834eb8 Merge pull request #5526 from VOREStation/upstream-merge-6324 
[MIRROR] Adds Laser Tag Turrets Plus Changes
 2019-07-27 16:26:30 -04:00
Novacat
83a2cb7490 Merge pull request #5525 from VOREStation/upstream-merge-6331 
[MIRROR] Makes Husking Require More Burn
 2019-07-27 16:24:49 -04:00
Novacat
fad621705a Merge pull request #5524 from VOREStation/upstream-merge-6334 
[MIRROR] New Clothing & Sweaters
 2019-07-27 16:24:32 -04:00
Novacat
9b0c54b513 Merge pull request #5520 from VOREStation/upstream-merge-6325 
[MIRROR] Fixes Repairing Bots
 2019-07-27 16:23:08 -04:00
Novacat
79eb2e57a5 Merge pull request #5519 from VOREStation/upstream-merge-6347 
[MIRROR] Cyborgs Can See and Repair Holes in Ceiling
 2019-07-27 16:22:49 -04:00
Andrew
69ed422019 Adds Laser Tag Turrets Plus Changes (#6324) 
* Adds Laser Tag Turrets

* Adds changelog

* Reverts Lethal Turrets Shooting to Kill

* Small No Longer Means Misc Life

* Revert "Merge branch 'master' into Turret"

This reverts commit 0300e6723b1aec0c47f8f82f7db770aa29af2483, reversing
changes made to 219348783d49b3205c3ed64bdd604f61791e6e72.

* Revert "Revert "Merge branch 'master' into Turret""

This reverts commit ca3d13b3372f2c5587d8d2cc449a6da8503494e4.

* Github why

* Change laser.dm to master?

* Revert "Change laser.dm to master?"

This reverts commit da562f6bc1ec43fe0cf5fe6ec5af61ada3474dd9.
 2019-07-27 15:45:58 -04:00
Atermonera
d464d5560d Merge pull request #6331 from Nalarac/patch-4 
Makes Husking Require More Burn
 2019-07-27 15:10:26 -04:00
Atermonera
de27063ae1 Merge pull request #6334 from Schnayy/clothingpack1 
New Clothing & Sweaters
 2019-07-27 15:09:11 -04:00
Andrew
9d4f42ca29 Fixes Repairing Bots (#6325) 
* Fixes Repairing Bots

You can now repair beepsky, slime securitrons, and other bots if they get damaged

* Can Fix Emag

* Updates changelog

* fix rcsadd to rscadd
 2019-07-27 13:08:06 -04:00
Andrew
e6f54d671a Cyborgs Can See and Repair Holes in Ceiling (#6347) 
* Cyborgs Can See and Repair Holes in Ceiling

* Adds changelog because I keep forgetting
 2019-07-27 13:06:52 -04:00
Anewbe
07811148c3 Merge pull request #6343 from Nalarac/Circuits 
Fixes Integrated Circuit Printer Taking Fractions of a Sheet
 2019-07-27 13:06:42 -04:00
Novacat
2f5957ee9f Merge pull request #5513 from chaoko99/custom-Aikacoat 
adds chaoko99's custom item
 2019-07-26 14:47:24 -04:00
chaoko99
ca099753a4 adds chaoko99's custom item 2019-07-25 20:59:44 -07:00
Novacat
3fcc7e1465 Merge pull request #5500 from VOREStation/upstream-merge-6285 
[MIRROR] Adds the SLED.
 2019-07-24 06:24:34 -04:00
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
Atermonera
a6d7c4ee81 Merge pull request #6285 from Mechoid/SLED 
Adds the SLED.
 2019-07-23 16:21:42 -04:00
Heroman
3e9afe908c Adds admin logging for usage of Eat Trash 2019-07-23 09:16:07 +10: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
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
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
Atermonera
983715d896 Merge pull request #6306 from Mechoid/FixRazorDronesandScanners 
Fixes Razor Drones and Sentry Drones.
 2019-07-19 00:53:43 -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
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