cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,499 Commits 10 Branches 0 Tags
ed79946ade0b901b30e7c57b0c429a0db86bf16f
Commit Graph

1913 Commits

Author SHA1 Message Date
Sharkmare
34dfd9b6f5 Reroute Teshwraps to just use Footwraps 
This mainly only matters for shapeshifters who thought tesh have to use this.

Yes, this is a self-callout.
 2023-02-11 06:37:28 +01:00
Fire Hazard
f0b0736bbd missing text 2023-02-09 07:42:18 -06:00
Rykka Stormheart
cc135c3d33 Fixes Custom Cold messages being uneditable/editing the wrong list 
As described. Prior to this, clicking this would bring up the custom_heat list, and fail to set messages correctly.

This corrects that.
 2023-02-08 08:01:31 -08:00
Heroman3003
c7827b37fb Merge pull request #14446 from Hatterhat/outfit-pass2 
skyrat outfit port continuation (adds to loadout)
 2023-02-08 03:13:42 +00:00
Fire Hazard
866a6692c5 mask and hat 
Adds cyborg mask and witch hat to loadout
 2023-02-07 16:59:58 -06:00
Nadyr
ccc3101516 powder that makes you say yes 2023-02-07 16:45:46 -05:00
Casey
ac099a732b proper sanitization of cold and heat messages 2023-02-07 19:19:18 +00:00
Nadyr
7755d3a593 Merge pull request #5678 from Rykka-Stormheart/shep-dev-discomfort-earlyport 
Earlyports #14459 from VORE, properly sanitizes heat/cold messages
 2023-02-07 13:43:58 -05:00
Nadyr
f71dfd8be7 Merge pull request #5665 from CHOMPStation2/upstream-merge-14443 
[MIRROR] Fixes "Colored Feminine Jumpsuit"
 2023-02-07 13:39:48 -05:00
Nadyr
97695a5aea Merge pull request #5645 from CHOMPStation2/upstream-merge-14416 
[MIRROR] Adds Lanterns to Loadout Selection
 2023-02-07 13:24:31 -05:00
Rykka Stormheart
e25aeb10d1 Indent oopsies in github copy 2023-02-07 09:27:21 -08:00
Rykka Stormheart
f8fe0768b0 Earlyports #14459 from VORE, properly sanitizes heat/cold messages 
Credit goes to Seris, not me, just earlyporting.
https://github.com/VOREStation/VOREStation/pull/14459
 2023-02-07 09:19:15 -08:00
Heroman3003
9e0a2711b3 Merge pull request #14455 from Seris02/nanoformfixwoops 
fixes nanoform limbs specifically from changing their child limbs
 2023-02-06 21:13:31 +00:00
Heroman3003
df19775b17 Merge pull request #14443 from Cyantime/patch-2 
Fixes "Colored Feminine Jumpsuit"
 2023-02-05 03:57:42 +00:00
Casey
4dc1ab7659 Merge pull request #14416 from liache/patch-2 
Adds Lanterns to Loadout Selection
 2023-02-04 05:36:40 +00:00
Nadyr
0e4960fc88 Merge pull request #5619 from CHOMPStation2/upstream-merge-14384 
[MIRROR] Adds ability to customize discomfort
 2023-02-02 20:45:58 -05:00
Nadyr
6945894ad7 Merge pull request #5633 from CHOMPStation2/upstream-merge-14386 
[MIRROR] sanitizes selection of custom bases in prefs
 2023-02-02 20:38:26 -05:00
Heroman3003
16008d3571 Merge pull request #14386 from Seris02/shapeshiftersanitization 
sanitizes selection of custom bases in prefs
 2023-02-01 21:42:39 +00:00
Heroman3003
515e92e594 Adds ability to customize discomfort 2023-01-28 22:12:59 +00:00
Heroman3003
de1e7c527c Merge pull request #14394 from Cyantime/patch-2 
Hitting cancel when setting character ad no longer blanks it in setup
 2023-01-28 19:53:00 +00:00
Nadyr
8ae9cf61e4 Merge pull request #5590 from CHOMPStation2/upstream-merge-14358 
[MIRROR] Adds loaded dice + a custom item
 2023-01-27 10:28:55 -05:00
Nadyr
3b259e189d Merge pull request #5589 from CHOMPStation2/upstream-merge-14355 
[MIRROR] few small fixes and improvements for proteans
 2023-01-27 10:21:37 -05:00
Nadyr
d563e53d9b powder that makes you say yes 2023-01-27 10:17:13 -05:00
Nadyr
41df4cf1c1 Merge pull request #5585 from CHOMPStation2/upstream-merge-14363 
[MIRROR] Minor spelling mistake
 2023-01-27 09:56:58 -05:00
Nadyr
017419426b Merge pull request #5547 from CHOMPStation2/upstream-merge-14341 
[MIRROR] Add the fennec crown to the fluff items list
 2023-01-27 09:15:59 -05:00
Razgriz
c7af3df096 o fuk go back 2023-01-24 18:31:48 -07:00
Razgriz
767d045372 oops 2023-01-24 18:30:40 -07:00
Razgriz
11915fcbc5 Update loadout_uniform_vr.dm 2023-01-24 18:27:20 -07: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
Razgriz
c3da1b51f6 Update loadout_utility_vr.dm 2023-01-21 22:32:49 -07:00
Razgriz
8aae4833cd Update loadout_fluffitems_vr.dm 2023-01-21 22:31:15 -07:00
Razgriz
1133073998 Update loadout_accessories_vr.dm 2023-01-21 22:30:14 -07:00
Razgriz
9197e1b95d Merge branch 'master' into upstream-merge-14220 2023-01-21 22:24:10 -07:00
Razgriz
418643dce3 unfucc exploration 
please do not the department
 2023-01-21 22:21:39 -07:00
Heroman3003
59819128b4 Adds loaded dice + a custom item 2023-01-22 01:36:16 +00:00
Heroman3003
cb32a65c87 few small fixes and improvements for proteans 2023-01-22 01:35:08 +00:00
Heroman3003
42b0676cf4 Merge pull request #14363 from BonniePandora/minor-spelling-mistake 
Minor spelling mistake
 2023-01-22 01:32:43 +00:00
Heroman3003
3076859eaa Merge pull request #14341 from JemliRoivas/patch-1 
Add the fennec crown to the fluff items list
 2023-01-16 06:55:17 +00:00
Heroman3003
95e2663e97 Merge pull request #14303 from faaaay/hoodie-fix 
fixes "hoodie with hood" loadout option
 2023-01-05 20:27:06 +00:00
Heroman3003
fb5208d1b3 Merge pull request #14285 from Detective-Google/halos 
adds halos to loadout
 2023-01-04 19:33:39 +00:00
Casey
2ad950341e Merge pull request #14221 from Seris02/tfmenuchanges 
creates a tab in the TF menu for changing markings
 2022-12-23 16:23:51 +00:00
Casey
764e792895 Remove the Exploration Department 2022-12-23 16:21:39 +00:00
Raeschen
98a9921c4f Various Fixes (#5399) 
* modularize digitigrade code

* Hide glasses + tail side layering fix

* pipe unwrench yeet

Co-authored-by: Razgriz <razgriz1032@gmail.com>
 2022-12-17 16:59:20 -07:00
Casey
f0dbb2b415 Merge pull request #14184 from DigitalSquirrel95/patch-7 
Removes job requirement from Bartender Skirt
 2022-12-09 23:43:24 +00:00
Nadyr
e7375c180c Merge pull request #5330 from CHOMPStation2/upstream-merge-14056 
[MIRROR] promethean fixes and QoLs
 2022-12-04 18:18:56 -05:00
Heroman3003
1ba39fee84 Merge pull request #14056 from Seris02/prometheanchanges 
promethean fixes and QoLs
 2022-11-28 21:51:35 +00:00
Casey
10e697c6fe Merge pull request #14136 from Heroman3003/altevian-thanksgiving 
Adds more altevian things
 2022-11-26 22:41:43 +00:00
Casey
009d6604d0 Merge pull request #14083 from BonniePandora/Forb-Time 
Pandora's Fox-orb custom plush
 2022-11-17 02:31:44 +00:00