cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,961 Commits 10 Branches 0 Tags
695fc3db7dd476dc943d68ee72debe30f8085d09
Commit Graph

1217 Commits

Author SHA1 Message Date
cadyn
695fc3db7d Merge pull request #1262 from CHOMPStationBot/upstream-merge-9659 
[MIRROR] Improved Trait Exclusion Logic
 2021-02-27 15:38:34 -08:00
cadyn
e9dbe2b585 Update 07_traits.dm 2021-02-27 15:00:16 -08:00
cadyn
6ccc54e3a1 Update 07_traits.dm 2021-02-27 14:58:55 -08:00
Chompstation Bot
dbc2902fc1 Steals and fixes a memory leak fix from the freeloaders 2021-02-27 15:06:52 +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
Razgriz
6ded190412 Merge pull request #1283 from CHOMPStationBot/upstream-merge-9539 
[MIRROR] [MIRROR] Adds proc to properly update human icon gender
 2021-02-17 15:02:54 -07:00
Chompstation Bot
6ec5b84175 TGUI Character Directory (baked bundle) 2021-02-14 07:55:01 -05:00
Razgriz
eb8bf0f143 Update 03_body.dm 2021-02-13 15:59:07 -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
Chompstation Bot
a5801d04b6 [MIRROR] Adds proc to properly update human icon gender 2021-02-10 19:14:53 +00:00
Chompstation Bot
9ecd032190 Improved Trait Exclusion Logic 2021-02-08 19:21:07 +00:00
Chompstation Bot
d3c7cc6040 New advanced Egg Release mechanics. 2021-02-01 19:35:41 +00:00
cadyn
cb74ad2b41 Merge branch 'master' into upstream-merge-9601 2021-01-25 16:04:40 -08:00
cadyn
e815dbe29f Merge pull request #1164 from CHOMPStationBot/upstream-merge-9582 
[MIRROR] Makes most neutral traits available to all species
 2021-01-25 16:02:59 -08: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
cadyn
b3a17b2678 Update 07_traits.dm 2021-01-24 16:16:55 -08:00
Chompstation Bot
ed3a6fdcb1 Should fix the broken species 2021-01-24 08:13:31 +00:00
Chompstation Bot
9c8634a84b Makes most neutral traits available to all species 2021-01-24 06:33:08 +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
Razgriz
cf83958de7 Merge pull request #944 from CHOMPStationBot/upstream-merge-9378 
[MIRROR] Greek Chiton
 2020-11-30 23:18:42 -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
da85f80845 Ports Cool Stuff from Bastion of Hestia/Vesta, Adds Eye Layer-Switching 2020-11-24 00:54:34 +00:00
cadyn
2d06259229 Merge pull request #880 from CHOMPStationBot/upstream-merge-9312 
[MIRROR] Ports a Boatload of Teshari Customization from CitRP, Chomp & YW, Small Update to Protogen Markings
 2020-11-21 19:58:29 -08:00
cadyn
0ce5d797be Update 07_traits.dm 2020-11-21 14:06:36 -08: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
Razgriz
6a8749d257 Hotkeys by default 
It's 2020, use your WASD keys by default. Flipped to True
 2020-11-19 21:48:52 -07: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
Razgriz
5cf20997f0 Merge pull request #816 from CHOMPStationBot/upstream-merge-9290 
[MIRROR] [MIRROR] Ports some clothing from uristcode
 2020-11-08 17:16:46 -07: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
Cadyn
947fe850ff Yummy bugfixes 2020-10-27 19:58:49 -07:00
Nadyr
30717d0f05 Merge pull request #749 from cadyn/linguist 
Cadyn's traits changes part 1
 2020-10-26 00:01:38 -04:00
Cadyn
bd2e76e4e8 Cadyn's traits changes part 1 2020-10-22 20:02:21 -07:00
r4d6
0b0f756bce Why it was commented out 2020-10-21 13:37:59 -04:00
r4d6
f27f770c30 Fix being able to select synth-blacklisted traits 2020-10-21 13:37:18 -04: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
Razgriz
00ae0b4746 Reversion and inversion 
lol
 2020-10-06 23:51:04 -07:00