cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,149 Commits 5 Branches 0 Tags
f7e9f8d12bddd3183ee87a4e02ff9c5935b51a5c
Commit Graph

1129 Commits

Author SHA1 Message Date
Nadyr
7915a9c9a8 Update loadout_xeno.dm 2021-03-30 01:03:25 -04:00
Nadyr
a777f6993d Merge branch 'master' into upstream-merge-10025 2021-03-30 00:58:05 -04:00
Chompstation Bot
149f222644 MORE ALT ID STUFF 2021-03-28 23:59:28 +00:00
Chompstation Bot
1ad694dcf0 [MIRROR] Repathed/renamed seromi to teshari. 2021-03-28 21:33:04 +00:00
Nadyr
5222f4f1b1 Update loadout_fluffitems_vr.dm 2021-03-27 23:22:55 -04:00
Nadyr
f6049a256a Merge branch 'master' into upstream-merge-10007 2021-03-27 23:13:57 -04:00
Sharkmare
ada352389d Changing job requirement for combatpilot suit. 
Makes the combat pilot suit selectable in loadout by pilots
 2021-03-27 07:38:31 +01:00
Chompstation Bot
f825d5ca9f Fixes Fluff and ITG ID cards, refactors event/fluff IDs a lil', also fixes for digested id icons 2021-03-24 18:51:25 +00:00
Chompstation Bot
2a5c21c8f5 [MIRROR] Kaleidoscope 2: The Retabbening 2021-03-21 01:24:14 -04:00
Novacat
d8fedcac1f Merge pull request #9943 from TheFurryFeline/patch-29 
Restore VS edit of tracking implant
 2021-03-14 01:59:28 +00:00
Nadyr
6537dfb636 Merge pull request #1581 from CHOMPStationBot/upstream-merge-9915 
[MIRROR] Oversized t-shirt + chiton fix
 2021-03-12 02:27:26 -05:00
Nadyr
30d79105c2 Merge pull request #1561 from CHOMPStationBot/upstream-merge-9899 
[MIRROR] [MIRROR] Yet another clothing PR
 2021-03-12 00:36:12 -05:00
Novacat
d89049299e Merge pull request #9915 from dwinters99/oversize 
Oversized t-shirt + chiton fix
 2021-03-11 20:00:22 +00:00
Novacat
4631c4faca Merge pull request #9897 from VOREStation/upstream-merge-7963 
[MIRROR] Tweaked implant loadout, refactored implant detection.
 2021-03-10 19:40:33 +00:00
Chompstation Bot
fad5c08958 [MIRROR] Yet another clothing PR 2021-03-10 19:40:27 +00:00
Chompstation Bot
a459be5696 [MIRROR] Adds some new wheelchair types 2021-03-09 16:29:51 +00:00
Nadyr
61d14c5ace Merge pull request #1522 from CHOMPStationBot/upstream-merge-9876 
[MIRROR] [MIRROR] Fixed/generalized loadout implants.
 2021-03-08 23:32:43 -05:00
Novacat
955be2e5fe Merge pull request #9876 from VOREStation/upstream-merge-7953 
[MIRROR] Fixed/generalized loadout implants.
 2021-03-08 16:53:20 +00:00
Novacat
ebf0391948 Merge pull request #9865 from Heroman3003/sizespace-suit 
Adds HYPER suit
 2021-03-08 16:06:23 +00:00
Razgriz
b04455dac1 Merge pull request #1315 from CHOMPStationBot/upstream-merge-9540 
[MIRROR] [MIRROR] Excised Errant Bay Military Lore
 2021-02-18 04:20:25 -07:00
Chompstation Bot
bef209f13c [MIRROR] Excised Errant Bay Military Lore 2021-02-13 05:51:00 +00:00
Novacat
bed22ac830 Merge pull request #9693 from VOREStation/upstream-merge-7871 
[MIRROR] Medical Soft/Field Cap
 2021-02-12 20:15:33 +00:00
Novacat
3954bedb9d Merge pull request #9606 from VOREStation/upstream-merge-7834 
[MIRROR] fixes some sprites, adds a thin blindfold
 2021-01-25 03:09:35 +00:00
Ketrai
12ce67b2fa Adds a bunch of animal furs 
Whooeee
 2021-01-09 22:04:09 +01:00
Novacat
fb2db44754 Merge pull request #9528 from Tenryumi/fluff-skirt-outfit-blacklisting 
Adds fluff skirt outfits to loadout blacklist
 2020-12-28 18:24:26 +00:00
Darlantan
7dd48c64ad Changes KHI suits to GE 2020-12-13 07:05:29 -05:00
Nadyr
a087cb2c92 Update loadout_xeno.dm 2020-12-08 03:19:23 -05:00
Razgriz
cfb73d6862 Update loadout_xeno.dm 2020-12-07 21:37:06 -07:00
Chompstation Bot
7b30714172 [MIRROR] Adds & Upgrades a Bunch of Teshari Clothing 2020-12-04 20:07:48 +00:00
Novacat
e3f5bcae0e Merge pull request #9399 from KillianKirilenko/kk-misc 
KHI Cargo/Civ Uniforms
 2020-12-02 15:24:50 +00:00
Razgriz
02d4f0e3db Merge pull request #951 from CHOMPStationBot/upstream-merge-9333 
[MIRROR] Adds Nikki's Fluff Outfit For Nikki, + Rigsuit-Mounted Size Guns For Research
 2020-11-30 23:55:06 -07:00
Novacat
a9f77823d7 Merge pull request #9333 from Tenryumi/nikki-fluff 
Adds Nikki's Fluff Outfit For Nikki, + Rigsuit-Mounted Size Guns For Research
 2020-11-30 23:46:15 +00:00
Novacat
351b49203e Merge pull request #9378 from dwinters99/ridge-wallet 
Greek Chiton
 2020-11-29 15:35:58 +00:00
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