cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 05:02:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,816 Commits 6 Branches 0 Tags
c97fc22813d9efc20d6677ade482b7f23faafca1
Commit Graph

746 Commits

Author SHA1 Message Date
Chompstation Bot
2e15527ef0 Ports a Boatload of Teshari Customization from CitRP, Chomp & YW, Small Update to Protogen Markings 2020-11-20 15:44:21 +00:00
r4d6
18673505f6 Another move. 2020-11-10 00:06:36 -05:00
r4d6
60215f5b7e Merge branch 'cigar' of https://github.com/r4d6/CHOMPStation2 into cigar 2020-11-10 00:05:47 -05:00
r4d6
d628ce8ff4 Move the cigar cases to a new _ch file 2020-11-10 00:04:17 -05:00
r4d6
8b91ad3a37 Add chomp edits 2020-11-09 23:48:19 -05:00
r4d6
d0cbf7f856 Add cigar cases to the loadout. 2020-11-09 19:23:00 -05:00
Verkister
270aa28416 Merge pull request #9290 from VOREStation/upstream-merge-7751 
[MIRROR] Ports some clothing from uristcode
 2020-11-08 06:58:52 +00:00
Verkister
fb1b3d210e Merge pull request #9241 from VOREStation/upstream-merge-7733 
[MIRROR] 5 new clothes & 1 headdress
 2020-10-19 10:36:41 +00:00
LunarFleet
163dc56069 Only eggs can sustain me 2020-10-15 20:34:13 -04:00
Cadyn
1d0e69633f Fix silly stuff 2020-10-05 19:46:50 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Heroman
7d1828f2b4 Fixes = typo 2020-10-04 19:50:30 +10:00
Heroman
bd8e240211 Standartizes gear_tweaks on _vr only items 2020-10-04 19:47:42 +10:00
Riley
ec42a286d0 Clara's Vacuum Flask 
Accepted Fluff Request: https://forum.vore-station.net/viewtopic.php?f=26&t=1831

Load out cost is one, the same as a standard vacuum flask, no freebies here!
Big thanks to everyone who put up with my confused screaming, especially Heroman :)
 2020-09-29 18:01:07 -04:00
Heroman
c9a019ee01 Adds Charles' Tophat 2020-09-28 04:54:23 +10:00
Novacat
65c677ba30 Merge pull request #9088 from ShadowLarkens/shadow_fluff 
Add Shadow Larkens laptop fluff item
 2020-09-26 21:16:21 -04:00
Atermonera
123a0fd115 Merge pull request #7685 from Greenjoe12345/teshstuff-and-eyepatch 
Teshari sprites and white eyepatch
 2020-09-26 16:58:44 -04:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
ShadowLarkens
bf73137818 Add Shadow Larkens laptop fluff item 2020-09-20 03:35:28 -07:00
Izac Joof Forsgren
4e7b4df749 Merge branch 'master' into izac 2020-09-14 14:11:02 +02:00
izac112
5fbb0b16b9 Voreupdate 2020-09-13 15:06:19 +02:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Braiden
0ca81bcdc2 another letter 2020-09-10 03:29:12 -05:00
Braiden
5e1b471925 A gift for Jeanne and an upgrade for Strix 2020-09-09 19:43:50 -05:00
Atermonera
f612958f0c Merge pull request #7603 from Greenjoe12345/customloadout 
adds the ability to give loadout items a custom name/description
 2020-09-04 22:31:18 -04:00
Atermonera
2a3a5483b0 Merge pull request #7589 from listerla/toelessjackboots 
Adds toe-less jackboots to xenowear
 2020-08-31 23:37:18 -04:00
Braiden
9415302551 again 2020-08-30 00:09:37 -05:00
Braiden
789f9afeed case sensetive and path fix 2020-08-30 00:09:06 -05:00
MrSign
f490bec8e2 adds toeless jackboots to loadout 2020-08-30 09:15:16 +10:00
MrSign
e0486dc479 Update loadout_shoes.dm 2020-08-30 09:00:50 +10:00
Braiden
eb40f1d483 adjustments and loadout addition 2020-08-29 16:31:04 -05:00
Novacat
81967dff01 Merge pull request #8887 from Heroman3003/xenobotany-remember 
Allows xenobotanist to actually take research's loadout items.
 2020-08-28 16:08:02 -04:00
Heroman
0a496c40ad Allows xenobotanist to actually take research's loadout items. 2020-08-29 05:31:01 +10:00
Heroman
ffdd8de3ce Site Management lookover for _vr stuff 2020-08-29 05:22:52 +10:00
Novacat
28c19ee066 Merge pull request #8868 from VOREStation/upstream-merge-7571 
[MIRROR] Colony Director -> Site Manager
 2020-08-28 13:17:58 -04:00
Atermonera
21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00
Atermonera
ac824e6bfc The great Aurora shoe heist 2020-08-25 19:17:10 -04:00
Novacat
8301f7832d Merge pull request #8363 from KillianKirilenko/kk-misc 
AR Glasses Tweaks
 2020-08-23 13:14:37 -04:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Novacat
6dd814c4d6 Merge pull request #8725 from dwinters99/flintlock_jacket 
Flintlock's jacket
 2020-08-21 17:12:31 -04:00
SplinterGP
cf491a56b7 Gives FBP's a proc to change their monitor display without using a mask item. 2020-08-20 21:25:20 -04:00
Novacat
b52cf2b991 Merge branch 'master' into kk-misc 2020-08-18 09:27:06 -04:00
David Winters
d97dd42464 Flintlock's jacket 2020-08-17 06:11:58 -04:00
izac112
5c02633707 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-13 20:01:22 +02:00
Greenjoe12345
ba3505fbd2 ports a whole lot of Teshari stuff from Arkstation (#7431) 2020-08-12 14:17:08 -04:00
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
Repede
74ee6f30f2 new white gearharness and redid yw xion sprites, added new gear harness to loadout for public use 2020-08-07 19:25:27 -04:00
Unknown
3aae040622 Removes Reagent Implants 
As per a decision by staff, all whitelists for Reagent Implants (both milk and egg) have been rescinded, these are to be replaced by a generic 'Feeder' neutral trait that is now available as per this PR.

If you have any questions, concerns, or comments about this PR, it would be far better (for both yourself and my sanity) to direct those to the Head Staff.
 2020-08-06 14:52:49 -04:00
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00