cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-24 08:15:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,027 Commits 9 Branches 0 Tags
79aa74ee8f3d29a943b4eb286b4ac2d2eee9dc8b
Commit Graph

1975 Commits

Author SHA1 Message Date
Darlantan
6975d3a5bd Manual mirror 2021-02-28 05:35:22 -05:00
cadyn
5e17d7737c Merge pull request #1428 from CHOMPStationBot/upstream-merge-9804 
[MIRROR] Improved Trait Exclusion Logic v2
 2021-02-27 15:48:34 -08:00
cadyn
20722857c8 Merge pull request #1434 from CHOMPStationBot/upstream-merge-9772 
[MIRROR] [MIRROR] Sideports a couple of init unit tests from Neb.
 2021-02-27 15:48:24 -08:00
cadyn
52695407cc Merge branch 'master' into upstream-merge-9804 2021-02-27 15:39:43 -08:00
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
e8852a363f Merge branch 'master' into upstream-merge-9772 2021-02-27 15:31:43 -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
cadyn
8739e5fb57 Update trait_defines.dm 2021-02-27 14:55:02 -08:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Chompstation Bot
dbc2902fc1 Steals and fixes a memory leak fix from the freeloaders 2021-02-27 15:06:52 +00:00
Chompstation Bot
f097111c56 Improved Trait Exclusion Logic v2 2021-02-27 00:21:13 +00:00
Razgriz
c95874c696 Merge branch 'master' into upstream-merge-9695 2021-02-18 04:36:11 -07: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
Nadyr
97fb94b10f Update preferences_vr.dm 2021-02-14 06:56:57 -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
Chompstation Bot
870b6afa45 No ERP -> Unset 2021-02-12 22:33:03 +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
Razgriz
5c7d335e2b Revert "Revert #1240" 2021-02-08 17:36:28 -07:00
Chompstation Bot
9ecd032190 Improved Trait Exclusion Logic 2021-02-08 19:21:07 +00:00
Razgriz
7313c4c3de Revert Size traits #1240 
#1240
 2021-02-07 16:50:01 -07:00
Chompstation Bot
d1e1c62d1d Adds body shape traits and proper preview scaling 2021-02-05 21:09:43 +00:00
Chompstation Bot
d3c7cc6040 New advanced Egg Release mechanics. 2021-02-01 19:35:41 +00:00
Cadyn
00bc513e6e Implementing TGSQL security 2021-01-27 10:51:12 -08:00
Cadyn
76ed115e37 Porting TG's SQL 2021-01-25 23:37:49 -08: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
cadyn
5b53679fbe Merge branch 'master' into upstream-merge-9582 2021-01-24 09:03:00 -08:00
Chompstation Bot
ed3a6fdcb1 Should fix the broken species 2021-01-24 08:13:31 +00:00
Novacat
d9c7aba53d Merge pull request #9544 from VOREStation/upstream-merge-7803 
[MIRROR] Fixes dark click catcher
 2021-01-24 06:57:14 +00:00
Chompstation Bot
9c8634a84b Makes most neutral traits available to all species 2021-01-24 06:33:08 +00:00
BlackMajor
50baa06fea fuck you travis CI 2021-01-19 21:06:28 +13:00
Razgriz
0303df5b07 Merge pull request #1110 from BlackMajor/gut 
Belly Filler 2: Electric Boogaloo, the Turniping
 2021-01-13 22:14:27 -07:00
BlackMajor
8673bcad39 Adjustments following feedback 2021-01-14 03:36:05 +13:00
BlackMajor
82f5c6019a this took way too long 2021-01-12 02:19:43 +13: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
Novacat
e481ed54e5 Merge pull request #9474 from lukevale/master 
Adds in Measuring cups, and nickname's to the character load selection.
 2020-12-18 19:32:12 +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