cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-28 11:03:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
67,911 Commits 7 Branches 0 Tags
33403c6445b0a28d6e3ccf88897fedfe7934b56e
Commit Graph

124 Commits

Author SHA1 Message Date
Casey
cd80228460 Merge pull request #11944 from Heroman3003/nifnerf 
Makes NIFs not get automatically lost (hopefully)
 2022-01-09 01:50:59 +00:00
Casey
b2348a672b Merge pull request #11875 from Heroman3003/synthtrait 
Fixes bugs related to organic/synthetic exclusive traits disappearing
 2021-12-08 22:49:09 +00:00
Casey
fe8c4753eb Offmap Tweaks 2021-12-03 07:14:17 +00:00
Aronai Sieyes
891650aeea Merge pull request #11712 from KillianKirilenko/kk-misc2 
Customverb tweak
 2021-10-27 18:17:48 +00:00
Verkister
d8eb8f4efa Fixes tiny oversight on the language fix 
Fixes the removal of linguist trait slapping that returnable number 0 that likes to override the species value in prefs numlanguage()
 2021-08-27 15:46:42 +03:00
Aronai Sieyes
ec8cc6e795 Merge pull request #11136 from VOREStation/Arokha/synthtemp 
Prevent synths from taking temp traits
 2021-07-19 21:17:22 +00:00
Chompstation Bot
f32c5af649 Adds tgui-style input modals for text, message, and num 2021-07-04 04:24:41 +00:00
Nadyr
e5f3ca6219 powder that makes you say yes 2021-07-01 19:39:04 -04:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Nadyr
4cd3b97bc9 Update 07_traits.dm 2021-04-11 06:13:12 -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
2a5c21c8f5 [MIRROR] Kaleidoscope 2: The Retabbening 2021-03-21 01:24:14 -04: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
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
Novacat
d9a0ad4732 Merge pull request #9848 from Sharkmare/patch-5 
Fixing traits left display
 2021-03-04 18:52:08 +00:00
Novacat
de16303003 Merge pull request #9710 from KillianKirilenko/kk-misc4 
Go [Verb] Yourself!
 2021-03-03 16:09:37 +00:00
Darlantan
6975d3a5bd Manual mirror 2021-02-28 05:35:22 -05: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
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
Chompstation Bot
f097111c56 Improved Trait Exclusion Logic v2 2021-02-27 00:21:13 +00:00
Chompstation Bot
6ec5b84175 TGUI Character Directory (baked bundle) 2021-02-14 07:55:01 -05: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
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
Chompstation Bot
da85f80845 Ports Cool Stuff from Bastion of Hestia/Vesta, Adds Eye Layer-Switching 2020-11-24 00:54:34 +00:00
cadyn
0ce5d797be Update 07_traits.dm 2020-11-21 14:06:36 -08:00
Cadyn
947fe850ff Yummy bugfixes 2020-10-27 19:58:49 -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
ShadowLarkens
7aaa40b62c Beginnings of a global volume control system 2020-08-21 04:42:47 -04:00
lbnesquik
c7c9764319 Add a check to custom virgo traits to limit synths from taking certain ones. 2020-07-05 23:09:40 +02:00
Atermonera
9a6b5a71f3 Streamline (Facial) Hair & Marking Character Customization, Port color_square to Clean Prefcode 2020-05-30 14:10:54 -04:00
Leshana
fb532ac920 Refactor Character Setup to use MAP 
- Instead of using expensive getFlatIcon() calls, character previews are now shown using screen objects in a second map window.
- Edited skin to add a named window for preferences setup that contains a browser plus a new map window to show the previews.
- Mannequins are still generated the same way, but now a MA is applied to four screen objects which are shown in the second map window.
- The screen objects are deleted on close of the preferences window.  So we do make sure to close it when spawning.
 2020-05-21 19:04:56 -04:00
Aronai Sieyes
301b5eb467 Allow wings with a secondary color 
Adds code to support wings with extra_overlay having a secondary color, like tails do. Currently extra_overlay is just ignored on wings.
 2020-03-31 22:40:48 -04:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Meghan-Rossi
604fd1b74f Resolve conflicts, fix compile errors 2019-12-19 17:49:21 +00:00
Heroman3003
ab603cffa4 Finishes up the main shadekin features 2019-11-15 11:13:31 +10:00
Verkister
febabf8899 Actually fixes icon scaling on later byond versions 
-Fixes the missing KEEP_TOGETHER flag required for overlay scaling in the newer versions.
-Fixes it for all atoms, not just mobs that have gone through vore setup. Literally nothing needs mismatched overlay scaling.
-Fixes the toggle scaling mode verb having been made to toggle the inheritance flag as well for no fucking reason what the hell.
-Actually tested working before pushing.
 2019-08-30 15:53:16 +03:00