cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-06-06 14:53:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
62,677 Commits 6 Branches 0 Tags
f6049a256abc16fc5ad9528023a8772fc1663303
Commit Graph

2006 Commits

Author SHA1 Message Date
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 da9dc5e71d Merge pull request #1542 from CHOMPStationBot/upstream-merge-9773 
[MIRROR] [MIRROR] Lobby Improvements
 2021-03-10 01:44:24 -05: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
Chompstation Bot 5a70c39b08 [MIRROR] Lobby Improvements 2021-03-09 22:32:57 +00:00
Sharkmare 234bfbb791 Update hard override file and downports Vorestation changes of kin 
This updates our override file to no longer override the functions that are now just default handling
 2021-03-09 22:55:53 +01: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
Nadyr f38596b023 Merge pull request #1499 from Sharkmare/kin-rework 
Shadekin Content Update + Whitelists for traits
 2021-03-06 23:32:39 -05:00
Sharkmare 546b39a395 Putting whitie and black togehter apparently breaks 
So its a code block of its own
 2021-03-06 17:54:16 +01:00
Sharkmare 06d969a967 Species whitelist for traits 
Tunes up the trait system to have a whitelist AND a blacklist so you can choose whichever makes you have to write the lowest amount of code
 2021-03-06 17:23:41 +01:00
Nadyr b1a47140e1 Merge pull request #1501 from CHOMPStationBot/upstream-merge-9852 
[MIRROR] Crosses out mime/clown options if you aren't whitelisted for them
 2021-03-06 05:29:15 -05:00
Novacat 610adc740b Merge pull request #9852 from Heroman3003/whitelisted-job-limit 
Crosses out mime/clown options if you aren't whitelisted for them
 2021-03-05 14:49:52 +00:00
Novacat d9a0ad4732 Merge pull request #9848 from Sharkmare/patch-5 
Fixing traits left display
 2021-03-04 18:52:08 +00:00
Nadyr ddc8ef59db Merge pull request #1481 from CHOMPStationBot/upstream-merge-9710 
[MIRROR] Go [Verb] Yourself!
 2021-03-04 04:20:19 -05:00
Novacat de16303003 Merge pull request #9710 from KillianKirilenko/kk-misc4 
Go [Verb] Yourself!
 2021-03-03 16:09:37 +00:00
Chompstation Bot e83c299e8d [MIRROR] Removes ping subsystem that was breaking chat 2021-02-28 23:02:17 +00:00
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