cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,337 Commits 5 Branches 0 Tags
eb9cee552e7abd996984f85116dc75a93faa38b7
Commit Graph

1287 Commits

Author SHA1 Message Date
Nadyr
1f33d5696f Merge pull request #1900 from CHOMPStationBot/upstream-merge-10236 
[MIRROR] Toys expansion
 2021-05-08 23:50:05 -04:00
Novacat
3245498530 Merge pull request #10236 from dwinters99/toys 
Toys expansion
 2021-05-06 14:42:49 +00:00
Nadyr
9dd025973b Merge pull request #1869 from Darlantanis/Fixes-#10237-2 
Emergency earlyport of "Fixes #10237"
 2021-04-30 02:46:36 -04:00
Nadyr
8d05156f42 earlyport fix 2021-04-30 02:33:07 -04:00
Nadyr
f67bd28e3a Merge branch 'master' into upstream-merge-10219 2021-04-30 02:05:30 -04:00
Nadyr
f75ba84710 Merge pull request #1865 from CHOMPStationBot/upstream-merge-10223 
[MIRROR] [MIRROR] Sanitizes languages, ears/wings/tail prefs on login
 2021-04-30 02:03:42 -04:00
Nadyr
9d401ead5f Merge pull request #1858 from CHOMPStationBot/upstream-merge-10213 
[MIRROR] Both fixes and comments out WL check
 2021-04-30 01:15:48 -04:00
Nadyr
0ac27ecbe3 Update 03_body.dm 2021-04-30 01:14:57 -04:00
Nadyr
1e0f3485ac Update 02_language.dm 2021-04-30 01:11:33 -04:00
Nadyr
fefd3b6641 Merge pull request #1862 from CHOMPStationBot/upstream-merge-10217 
[MIRROR] Add LUNA's Medals
 2021-04-30 01:05:34 -04:00
Nadyr
8cd695295c Merge pull request #1861 from CHOMPStationBot/upstream-merge-10216 
[MIRROR] Add Entchtut's medal
 2021-04-30 01:04:55 -04:00
Nadyr
a34fd9cec8 Merge branch 'master' into upstream-merge-10213 2021-04-30 01:03:17 -04:00
Chompstation Bot
606e2e757c [MIRROR] Adds config option to control loadout whitelist strictness 2021-04-28 16:46:12 +00:00
Chompstation Bot
dde4aa05bd [MIRROR] Sanitizes languages, ears/wings/tail prefs on login 2021-04-28 16:30:43 +00:00
Novacat
f6d79c391d Merge pull request #10217 from ResidentCody/Personal-Fork 
Add LUNA's Medals
 2021-04-27 04:19:22 +00:00
Novacat
3f10cf6eb5 Merge pull request #10216 from Little-119/medal-addition 
Add Entchtut's medal
 2021-04-27 03:02:02 +00:00
Chompstation Bot
e8e635184c Both fixes and comments out WL check 2021-04-26 18:45:57 +00:00
Novacat
bf5262dd55 Merge pull request #10206 from VOREStation/upstream-merge-8047 
[MIRROR] Makes xenowear species WL check for species instead of ckey
 2021-04-25 23:00:19 +00:00
Nadyr
4cd3b97bc9 Update 07_traits.dm 2021-04-11 06:13:12 -04:00
Nadyr
e6a31f97b1 Update 02_language.dm 2021-04-11 06:12:20 -04:00
Nadyr
683d9c5f30 Merge pull request #1760 from CHOMPStationBot/upstream-merge-10092 
[MIRROR] Update resize pref and some resizing code
 2021-04-11 01:35:43 -04:00
CHOMPStationBot
d1de7d60b0 [MIRROR] Species cleanup (#1792) 
* Merge pull request #10127 from Nyksia/species-cleanup

Species cleanup

* Species cleanup

Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
 2021-04-10 22:17:26 -07:00
Nadyr
abb0cf342d Merge branch 'master' into upstream-merge-10092 2021-04-10 22:50:33 -04:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
Chompstation Bot
64990312af Update resize pref and some resizing code 2021-04-07 20:08:32 +00:00
Chompstation Bot
9029dfd48d [MIRROR] Prevented Teshari from selecting positronic brains. 2021-04-02 17:58:45 +00:00
Nadyr
83460960a5 Update loadout_xeno_yw.dm 2021-03-30 02:46:00 -04:00
Nadyr
304ff00156 Update loadout_fluffitems_yw.dm 2021-03-30 02:21:45 -04:00
Nadyr
e7b999247c Update loadout_xeno_yw.dm 2021-03-30 02:07:56 -04:00
Nadyr
8b3dd6414e Update loadout_xeno_ch.dm 2021-03-30 01:31:35 -04:00
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
Nadyr
8395359d92 Update 03_body.dm 2021-03-21 02:14:02 -04:00
Nadyr
d07f2da76a Update 03_body.dm 2021-03-21 02:11:44 -04: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
Nadyr
d6cab496ed Merge pull request #1546 from CHOMPStationBot/upstream-merge-9867 
[MIRROR] [MIRROR] Added a GPS compass.
 2021-03-10 01:41:28 -05:00
Nadyr
99ed4a1cc8 Merge pull request #1530 from CHOMPStationBot/upstream-merge-9882 
[MIRROR] [MIRROR] Adds some new wheelchair types
 2021-03-10 00:06:53 -05:00
Novacat
1d0ca9dd1e Merge pull request #9867 from VOREStation/upstream-merge-7928 
[MIRROR] Added a GPS compass.
 2021-03-09 22:59:48 +00:00