cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,443 Commits 8 Branches 0 Tags
c3578b965869aa55b29fa8d10b7e35315b56375f
Commit Graph

63 Commits

Author SHA1 Message Date
CHOMPStation2
2f4c193f47 [MIRROR] TGUI Say (#8771) 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-08-22 13:50:21 +02:00
Selis
e1a987c25c Configuration Controller (#7857) 2024-04-05 07:44:20 +02:00
Selis
dafd4cc107 Updates dreaming code (#7837) 2024-03-02 10:31:40 +01:00
Cadyn
b90f7ec922 The 515 MegaPR early downport (#7783) 
Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: SatinIsle <thesatinisle@gmail.com>
Co-authored-by: Heroman <alesha3000@list.ru>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-27 20:17:32 +01:00
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
Selis
e9effb63f5 Implementing RoundIDs (#7740) 2024-02-13 21:07:35 -05:00
CHOMPStation2
c55baec811 [MIRROR] Cleaning up some defines (#7726) 
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Selis <selis@xynolabs.com>
 2024-02-12 15:55:15 +01:00
CHOMPStation2
b8994db55a [MIRROR] Url regex slightly adjusted (#7469) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-12-23 22:04:54 +01:00
CHOMPStation2
b011e089d0 [MIRROR] fixes and filters (#7452) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Selis <selis@xynolabs.com>
 2023-12-21 00:50:10 +01:00
CHOMPStation2
eb65b5721c [MIRROR] tgchat part 1 (#7273) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Selis <selis@xynolabs.com>
 2023-11-25 13:36:55 +01:00
Selis
ee8dc5f568 Merge remote-tracking branch 'CHOMPStation2/upstream-merge-14964' into big-new-tgui-pr 2023-06-19 18:21:24 +02:00
Raeschen
bf6c710049 fix merge conflicts 2023-06-19 12:16:08 +02:00
Heroman3003
00c822d64f Update Pref Options 2023-06-18 18:48:36 +00:00
Heroman3003
8cf37fc7f1 TGUI Interface Hotfix 2023-06-04 19:13:12 +00:00
Rykka
dbb639fc59 Removes BDSM and Furry/Human Preference Toggles 2023-01-23 12:56:13 -08:00
Rykka
5ed802978f Adds CHOMPStation Comments 
Just-in-case.
 2023-01-23 12:56:00 -08:00
Rykka
87482853ea Character Directory Update - Adds Four Additional Tags 
This will be ported upstream to VOREStation momentarily, hence the lack of // CHOMPStation comments.
If upstream makes any changes or rejects the PR, I will add comments on as needed.

Adds four new preferences + tags, shown here!
![](https://cdn.discordapp.com/attachments/404660884531707906/1041243283373948978/azcYOMj.png)

Gender, Sexuality, BDSM Role, and Furry/Human Preference.

The latter two may be unnecessary, particularly the BDSM role, but I figured it was an easy addition, and just as easy to remove on request!

The intent for these additions is to make perusing for scenes ever-so-slightly easier, and lay out important keynotes such as gender more clearly.
 2023-01-23 12:56:00 -08:00
Casey
892960d661 Blueprint Revamp. 2022-10-02 17:59:49 +00:00
Casey
529616b1aa Adds mentors 2022-08-14 19:10:14 +00:00
Casey
f958518ea9 Merge pull request #13035 from lm40/nogods 
localizes religion and adds custom chaplain titles
 2022-06-04 16:38:53 +00:00
BlackMajor
119b70776f Progress 2022-04-20 22:49:11 +12:00
Rykka
d4302755d3 Adds Pred-Pref and Prey-Pref to Vore Tags, standardizes with CHOMP Roles 2021-10-02 22:07:41 -07:00
Aronai Sieyes
5d6d45904d Merge pull request #11259 from VOREStation/Arokha/dropfix 
AAAAAA
 2021-07-26 21:24:07 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Novacat
55fffc549a Merge pull request #10669 from VOREStation/vplk-some-vv-bitfields 
Configure some VV bitfields and fix editor
 2021-06-18 04:17:48 +00:00
Chompstation Bot
a94e471add Material Container Component & Autolathe QoL 2021-06-13 03:18:30 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Chompstation Bot
d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -04:00
Nadyr
abbff397c1 remove second global list 2021-05-01 22:41:10 -04:00
Razgriz
401784f3e8 Merge branch 'master' into upstream-merge-9445 2021-03-10 17:59:32 -07:00
Razgriz
9d6e37946a Delete roundstats.dm 
This file has been depreciated by code/datums/roundstats/roundstats.dm
 2021-03-08 20:07:19 -07:00
Darlantan
6975d3a5bd Manual mirror 2021-02-28 05:35:22 -05:00
Sym
f718e0915e Fix xenomorph egg notification & remove glob var I added 
Removes a global var that wasn't used that I added in a fit to stupidity, and fixes the snowflake ghost_pod code for xenomorph eggs.
 2021-02-18 06:04:09 -05:00
Chompstation Bot
6ec5b84175 TGUI Character Directory (baked bundle) 2021-02-14 07:55:01 -05:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
ShadowLarkens
c32f05e1f7 TGUI Civilian 
UI's Converted:
 - Aurora Cooking
 - Chaplain Book Selection
 - ColorMate
 - Cryo Storage
 - Holodeck
 - Jukebox
 - Looking Glass
 - Microwave
 - Newscasters
 - Timeclock
 - Vending Machine Improvements
 2020-09-02 13:32:42 -07:00
Sym
0dec16535d Adding CHOMPedit to edited lines and files, with brief descriptions. 
Can't believe I didn't think of doing this already.
 2020-08-29 02:28:30 -04:00
Sym
20bcadbec6 Fixing Xenomorph lifecycle + changes 
Time to get swifty.
 2020-08-28 12:29:06 -04:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
ShadowLarkens
6f9545ea63 TGUI Destination Tagger 2020-08-16 22:27:08 -07:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
SplinterGP
9b4843da61 i think this is all the changes ? 2020-07-27 20:59:20 -03:00
BlackMajor
717a5fa049 aughe 2020-07-23 13:57:39 +12:00
ShadowLarkens
3ea0e50432 Port TGUI Wire datums (ParadiseSS13/Paradise#13769) 2020-07-22 00:23:58 -07:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Leshana
f022647037 Adds point defense batteries to defend against meteors 
- Creates a global meteors list to make it easier to find them.
- Adds point defense mainframe, batteries, projectiles, circuitboards, and R&D designs.
- Adds sound effects and icons for the new machines.
- Original code and sprites ported from Baystation.  Adtapted to our code, added icon states and QoL elements.
 2020-04-01 21:30:30 -04:00
TheFurryFeline
5ba933aec3 Typo Fixy 
Changelog Notes:

- Fixes the miners line to output a number with "rock" in the line rather than "a whole 2702 into piles".
 2020-03-20 23:57:05 -04:00
Atermonera
e3a67b3050 Makes language keys case sensitive, adds unit tests for language conflicts, fixes some language conflicts 2020-03-17 00:22:05 -04:00
Rykka
4a78b14451 Port over Roundstats System 2020-01-15 16:42:41 -07:00