cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-26 01:04:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,997 Commits 8 Branches 0 Tags
bfefaeb669c214dfa0d51c3d21906a71d3e1c19a
Commit Graph

2919 Commits

Author SHA1 Message Date
Novacat
c8b277096e Merge pull request #6261 from VOREStation/upstream-merge-6547 
[MIRROR] Lamps, Lights, Lackluster!
 2019-11-29 20:27:36 -05:00
Novacat
84f2c214e7 Merge pull request #6258 from VOREStation/upstream-merge-6535 
[MIRROR] Fix Strange Rock Size
 2019-11-29 20:15:22 -05:00
Novacat
d5fa9f6e85 Merge pull request #6257 from VOREStation/upstream-merge-6554 
[MIRROR] Protolathe Power Cells Tweak
 2019-11-29 20:10:13 -05:00
Novacat
dd78e39916 Merge pull request #6256 from VOREStation/upstream-merge-6553 
[MIRROR] Fixes Naming ED-209 and ED-CLN
 2019-11-29 20:09:55 -05:00
Anewbe
068e132603 Merge pull request #6547 from TheFurryFeline/TFF-Lamps_Lights_Lackluster 
Lamps, Lights, Lackluster!
 2019-11-29 19:51:34 -05:00
TheFurryFeline
cc54005602 Fix Strange Rock Size (#6535) 
* Fix Strange Rock Size

Title

* Create TheFurryFeline - Strange Rock Fixy.yml.txt

* Proper Changelog Filetype
 2019-11-29 19:51:02 -05:00
Anewbe
249a05e888 Merge pull request #6554 from Nalarac/Cellicon 
Protolathe Power Cells Tweak
 2019-11-29 19:49:48 -05:00
Anewbe
ced3499065 Merge pull request #6553 from Nalarac/ED209 
Fixes Naming ED-209 and ED-CLN
 2019-11-29 19:49:37 -05:00
Anewbe
cbe8493dbf November Map Tweaks 2019-11-29 19:47:49 -05:00
Anewbe
e7c7da7db1 Merge pull request #6536 from Nalarac/Capset 
Captain and HoP Headsets Fully Enabled by Default
 2019-11-28 14:15:11 -05:00
Anewbe
e1996cbf9f Merge pull request #6481 from Atermonera/maint_drone_spawn 
Reduces maintenance drone spawn time to 5 minutes
 2019-11-24 17:29:12 -05:00
Atermonera
ec3167e4ce Merge pull request #6525 from TheFurryFeline/TFF-Let_The_Plushies_Live! 
Mouse Plushie Sprite Change
 2019-11-19 14:28:32 -05:00
Atermonera
fff8e402c9 Merge pull request #6487 from Novacat/nova-accessory 
Adds Teshari Plush
 2019-10-23 19:20:47 -04:00
Woodratt
a4c2786bcc Oct Map Fixes 2019-10-23 02:00:52 -04:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Poojawa
eb0234b1af Adds 'Devourable" and 'feeding' prefs 2019-10-15 02:01:51 -05:00
Poojawa
f718201974 Adds Sound Code and toggles 2019-10-13 02:05:16 -05:00
Atermonera
5a3398daec Merge pull request #6473 from Woodratt/09272019_weightbodytype 
Port weight/body types to traits
 2019-10-06 03:34:05 -04:00
Atermonera
4eb1e378f6 Merge pull request #6447 from TheFurryFeline/TFF-Orange_Is_The_New_Orange_Part_2 
Orange Is The New Orange Part 2
 2019-09-25 17:09:00 -04:00
Atermonera
e26f16e73b Bar and Kitchen Merge 2019-09-18 16:40:18 -04:00
Unknown
e0e45c13a2 Resets changelog folder to Polaris 2019-09-15 17:46:57 -04:00
Atermonera
0ff8e84fcd changelog (#6448) 2019-09-15 17:10:44 -04:00
Atermonera
cb6427d93f Adding Vendors 2019-09-07 23:17:29 -04:00
Novacat
cfa355d170 Ports MREs from Baystation (#6424) 
* Ports MREs from Baystation

- Ports MREs from Baystation
- Adds an 'Emergency ration' that contains liquidfood rations
- Two new ration packs that have the new rations.

* Placates travis

* Lynxlog

* Adds liquidprotein rations

* Sacrifice for travis

* Changes desc

* Fixing missing filling in crayon paste

* Fixes missing side for random rations

* Renames Paste Supplypack

* aaaaa minor error

* Slight organization

* Fixes some errors

* Why am I like this
 2019-08-31 18:01:50 -04:00
Novacat
ffb66290db Merge pull request #5726 from VOREStation/upstream-merge-6418 
[MIRROR] Shards Do Damage to Holder
 2019-08-28 01:54:38 -04:00
Novacat
4eea2dad56 Merge pull request #5725 from VOREStation/upstream-merge-6423 
[MIRROR] Ports Bay's stomach pump.
 2019-08-28 01:54:26 -04:00
Atermonera
2162dbfa0b Merge pull request #6418 from MisterLayne/glass_shard_self_harm 
Shards Do Damage to Holder
 2019-08-28 01:25:47 -04:00
Atermonera
4bb0599153 Merge pull request #6423 from chaoko99/stomach_pump 
Ports Bay's stomach pump.
 2019-08-28 01:25:37 -04:00
Atermonera
bf558eacfd Merge pull request #6417 from MisterLayne/conductivity_fix 
Non-conductive Things Do Not Conduct
 2019-08-28 01:24:24 -04:00
Anewbe
abe27da940 Merge pull request #6412 from Atermonera/changelog 
eggolaunch
 2019-08-27 16:10:54 -04:00
Atermonera
2c8197bd9a Merge pull request #6415 from Heroman3003/bellfixes 
Adjusts some desk bell mechanics
 2019-08-23 21:43:38 -04:00
Novacat
775d175b11 Merge pull request #5682 from VOREStation/upstream-merge-6358 
[MIRROR] Exploration Expansion 1: Or, How I Learned To Love The Tree
 2019-08-21 18:02:59 -04:00
Novacat
666d7836fc Merge pull request #5687 from VOREStation/upstream-merge-6410 
[MIRROR] Promethean Organ Tweakening
 2019-08-21 17:54:37 -04:00
Novacat
9b764d2753 Merge pull request #5685 from VOREStation/upstream-merge-6407 
[MIRROR] Adds Setting for Turrets to Shoot Downed People
 2019-08-21 17:53:55 -04:00
Novacat
a39a1a5c7c Merge pull request #5683 from VOREStation/upstream-merge-6402 
[MIRROR] Uniform Adjustments Phase 1
 2019-08-21 17:53:41 -04:00
Atermonera
65b6dc762c Merge pull request #6410 from Mechoid/PrometheanOrgans1 
Promethean Organ Tweakening
 2019-08-21 17:40:45 -04:00
Atermonera
0bd3040886 Merge pull request #6407 from Nalarac/Turret 
Adds Setting for Turrets to Shoot Downed People
 2019-08-21 17:29:58 -04:00
Atermonera
551680a35e Merge pull request #6411 from Michiyamenotehifunana/Copypasta-2-electric-boogaloo 
Makes the Create Object menu not freeze the client for an eternity
 2019-08-21 17:27:41 -04:00
Atermonera
caa612e264 Uniform Adjustments Phase 1 2019-08-21 17:26:28 -04:00
Mechoid
ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
Anewbe
008913f415 Remaps atmospherics 2019-08-13 17:38:33 -04:00
Anewbe
f758d8fb38 Merge pull request #6381 from Nalarac/CableLayer2 
Fixes Mech Cable Layer
 2019-08-12 16:33:41 -04:00
Atermonera
c9e9932182 Merge pull request #6386 from TheFurryFeline/TFF-Orange_Is_The_New_Orange 
Freebie Orange Jumpsuit
 2019-08-12 14:40:23 -04:00
Novacat
fd7272352c Merge pull request #5574 from VOREStation/upstream-merge-6399 
[MIRROR] jenga log
 2019-08-08 20:02:35 -04:00
Anewbe
abe7337fd4 jenga log 2019-08-08 19:07:54 -04:00
Andrew
9d93bea992 Allows Construction of Serenity in Robotics 2019-08-08 16:28:07 -04:00
Atermonera
e0d157294e Lowers Bot Emag Chance from Ion Storm 2019-08-06 14:57:30 -04:00
Atermonera
e60f0daf47 Merge pull request #6295 from Mechoid/TTS_And_Sign 
Adds an advanced TTS circuit, and sign-camera.
 2019-08-05 18:52:48 -04:00
Novacat
25fbfb57d6 Merge pull request #5555 from VOREStation/upstream-merge-6366 
[MIRROR] Tweaks Security Bots
 2019-08-03 13:19:58 -04:00
Novacat
ac2f51ab2d Merge pull request #5554 from VOREStation/upstream-merge-6367 
[MIRROR] Fixes Medibots Targetting FBPs
 2019-08-03 13:19:17 -04:00