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
51,946 Commits 8 Branches 0 Tags
fab4ecff1d56bc34b6a71ba767fa943ebbc8f8ab
Commit Graph

5617 Commits

Author SHA1 Message Date
Rykka
9118c62ad2 Suit Cyclers Apply Proper Suit Stats 
Resolves #143
Port of https://github.com/CHOMPstation/CHOMPstation/pull/695
 2020-01-21 04:39:52 -07:00
Rykka
4a78b14451 Port over Roundstats System 2020-01-15 16:42:41 -07:00
Razgriz
de24521619 First merge from upstream 2020-01-13 17:23:01 -07:00
Hawk-v3
4623c3c1d1 Merge branch 'master' into master 2020-01-13 20:31:39 +00:00
Hawk_v3
20596d9787 Merge remote-tracking branch 'upstream/master' 2020-01-13 00:01:47 +00:00
Repede
2d453d354b Merge branch 'master' into Holdelta-RPD-Addition 2020-01-12 14:36:25 -05:00
RadiantFlash7
847edc50cc misc map fixes. vending 
Adds the changes to YW vendor, and fixes to maps.
 2020-01-12 02:56:42 -05:00
RadiantFlash7
0be2f5c98e Revert "Vending machine changes+Warehouse fix" 
This reverts commit 8779e1b1d4.
 2020-01-12 02:46:18 -05:00
RadiantFlash7
8779e1b1d4 Vending machine changes+Warehouse fix 
Fixes cargo warehouse,
Applies new vending machine changes.
 2020-01-12 02:38:32 -05:00
Holdelta
0584609047 Add files via upload 2020-01-11 23:28:37 -08:00
RadiantFlash7
8bbb074c08 I give up. 
Resets this file to default, because fuck everything apparently.
 2020-01-12 02:15:59 -05:00
RadiantFlash7
3338068d32 2.28 
Travis, My tears are full of salt.
Please accept them as an offering.
 2020-01-12 01:35:51 -05:00
RadiantFlash7
82937c85f4 2.whatever 
The only other thing I touched was this.
Surely that means it's this thats breaking it?
 2020-01-12 01:29:31 -05:00
RadiantFlash7
f749ac9d4c Revert "Revert "2.24"" 
This reverts commit 9e88c4f613.
 2020-01-12 01:20:47 -05:00
RadiantFlash7
239aff92fa Revert "Revert "fixing indentation error"" 
This reverts commit 0efe43dc44.
 2020-01-12 01:20:43 -05:00
RadiantFlash7
8b12d15cf3 Revert "Revert "2.22"" 
This reverts commit 484e80f9c8.
 2020-01-12 01:20:41 -05:00
RadiantFlash7
faf6e95ce3 Revert "Revert "Major map change+misc changes"" 
This reverts commit f0d4f38bf1.
 2020-01-12 01:19:47 -05:00
RadiantFlash7
f0d4f38bf1 Revert "Major map change+misc changes" 
This reverts commit fd22b5ca87.
 2020-01-12 01:16:31 -05:00
RadiantFlash7
484e80f9c8 Revert "2.22" 
This reverts commit e74d277ce5.
 2020-01-12 01:15:56 -05:00
RadiantFlash7
0efe43dc44 Revert "fixing indentation error" 
This reverts commit 3b021863b5.
 2020-01-12 01:15:53 -05:00
RadiantFlash7
9e88c4f613 Revert "2.24" 
This reverts commit 77217e2baa.
 2020-01-12 01:15:51 -05:00
RadiantFlash7
77217e2baa 2.24 
Please stop bitching at me travis ;-;
 2020-01-12 01:09:00 -05:00
RadiantFlash7
3b021863b5 fixing indentation error 
Iiis this the problem?
 2020-01-12 00:56:16 -05:00
RadiantFlash7
e74d277ce5 2.22 
I swear if this is the issue, i'ma cry.
 2020-01-12 00:39:20 -05:00
RadiantFlash7
fd22b5ca87 Major map change+misc changes 
Moves holodeck next to AI core,
expands botany and kitchen, adds fishfarm
Adds photocopiers and pappershredders about.
Fixes some bad cameras,
adds detective pistol back in, Why wasn't it there prior?
Adds ballestics back in.
 2020-01-11 18:41:51 -05:00
Novacat
4f6a7972d6 Merge pull request #6404 from Ketrai/iwantdie 
adds food cubes.
 2020-01-09 22:51:32 -05:00
Razgriz
3fbf13edd7 New Door Sounds 2020-01-09 02:42:11 -07:00
Razgriz
fcdd5e0635 New Door Sounds 2020-01-09 02:41:15 -07:00
Razgriz
c3344a47ed New Door Sounds 2020-01-09 02:06:19 -07:00
Razgriz
665b883062 New Door Sounds 2020-01-09 01:21:04 -07:00
Mechoid
ec5e851399 Xenoflora expansion take2 2020-01-08 13:46:25 -05:00
Ketrai
c8531c827f Fixed conflicts. Adds water bottle to the machine coz logic. 2020-01-07 23:07:50 +01:00
Ketrai
9112a9a2b6 Food cubes 
woop


removes a line of unneeded code
 2020-01-07 22:51:12 +01:00
RadiantFlash7
373ad52953 Merge pull request #1 from Yawn-Wider/master 
Updating repo
 2020-01-06 18:14:36 -05:00
RadiantFlash7
99fa945df9 January patch #2.1 
Adds ballestics to vendor as per previous discussion on ballestics for security.
Adds missing photocopiers tomap,
and some icepicks at escape eva area.
 2020-01-06 18:13:27 -05:00
Hawk_v3
8a0b78c322 Merge remote-tracking branch 'upstream/master' 2020-01-01 15:16:53 +00:00
Hawk_v3
a48b6f7cb2 Merge remote-tracking branch 'upstream/master' 2019-12-29 19:01:58 +00:00
lbnesquik
eace084579 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes 2019-12-26 07:25:05 +01:00
lbnesquik
ae398259ea Introduce more taur clothes. 
- Add medieval style barding for centaurs.
- Add full body options for wolf taurs. (Fat sprites slightly break this)
- Cloak for Drakes
- Botany Apron should work for the majority of taurs and not weirdly cut at the middle.
- WIP lance
 2019-12-25 20:40:21 +01:00
Razgriz
93348f6c7e Add files via upload 2019-12-25 04:17:46 -07:00
Repede
ecb31d04e0 Merge branch 'master' into master 2019-12-22 11:51:38 -05:00
Atermonera
2ec24a29e3 Merge pull request #6580 from Shadow-Quill/APC-AirAlarm-Alt-Click 
APCs/Air Alarms can be (un)locked via altclick
 2019-12-22 01:58:19 -05:00
Repede
b41698c720 Merge branch 'master' into master 2019-12-21 21:35:09 -05:00
Repede
e32dc05ba3 Merge branch 'master' into Air-APC-QOL 2019-12-21 21:34:54 -05:00
Repede
a24dad8b7e Merge branch 'master' into map 2019-12-21 21:00:24 -05:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
RadiantFlash7
a60ef71680 exploration cameras 
Mass camera fixes and holopad fixes!
Also fixes dorm 9.
 2019-12-21 16:23:46 -05:00
Repede
a8eae103ac Merge branch 'master' into Air-APC-QOL 2019-12-21 10:44:49 -05:00
Shadow
058288adb3 The Altening 2019-12-20 21:38:24 -06:00
izac112
2971133b38 twenty 
Signed-off-by: izac112 <izac10@live.com>
 2019-12-20 22:43:46 +01:00