cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,406 Commits 8 Branches 0 Tags
a8e3b1e27036e4df2b0547d50b2adcdde4632f00
Commit Graph

34771 Commits

Author SHA1 Message Date
Heroman
a8e3b1e270 Replaces Terminated with Dismissed as default rank removal 2019-08-03 21:59:56 +10:00
Heroman
fea0c9954d Adds missing //Vorestation Edit 2019-07-30 05:38:29 +10:00
Heroman
0bc5d5b3ba Replaces Termination with Demotions as default rank removal 2019-07-28 06:46:05 +10: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
4c71587410 Merge pull request #5499 from Heroman3003/accesseningfr 
Fixes hardsuit crates not using one_access
 2019-07-24 06:25:02 -04: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
e33c50c506 Merge pull request #5504 from VOREStation/upstream-merge-6323 
[MIRROR] Makes roundstart dirt work more properly
 2019-07-24 06:18:08 -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
8fa3d28529 Merge pull request #6323 from Heroman3003/dirtining 
Makes roundstart dirt work more properly
 2019-07-24 00:38:46 -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
e4aae2a5a3 Fixes hardsuit crates not using one_access 2019-07-24 04:58:59 +10:00
Novacat
8a370584c5 Merge pull request #5497 from Heroman3003/maybeafix 
A stray attempt at fixing the lacking manifest entries
 2019-07-22 22:40:11 -04:00
Heroman
bf352acb09 A stray attempt at fixing the lacking manifest entries 2019-07-23 11:16:30 +10: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
6ff5405b0a Merge pull request #5493 from VOREStation/upstream-merge-6320 
[MIRROR] Allows Multiple Light Printing in Autolathe
 2019-07-22 13:03:08 -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
54966826af Merge pull request #6320 from Nalarac/Autolathe 
Allows Multiple Light Printing in Autolathe
 2019-07-22 00:44:30 -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
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