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
73,820 Commits 8 Branches 0 Tags
84f57b8bccf228b749a374c8ca69d9572b30124f
Commit Graph

2581 Commits

Author SHA1 Message Date
Razgriz
6b79bc97a7 Merge pull request #5697 from CHOMPStation2/upstream-merge-14470 
[MIRROR] Cloaks, undies, the Antediluvian, and some other bits
 2023-02-12 18:59:42 -07:00
Razgriz
9229e66b90 powder that makes you say yes 2023-02-12 18:56:11 -07:00
Razgriz
f0627692c2 powder that makes you say yes 2023-02-12 18:27:30 -07:00
Razgriz
6d51b51abb Merge pull request #5695 from Sharkmare/patch-1 
Reroute Teshwraps to just use Footwraps
 2023-02-12 18:22:31 -07:00
Razgriz
8034cd0d24 Update character_directory.dm 2023-02-12 18:18:41 -07:00
Razgriz
4a52255262 Merge pull request #5689 from Rykka-Stormheart/shep-dev-temp-message-custom-fix 
Fixes Custom Cold messages being uneditable/editing the wrong list
 2023-02-12 18:16:05 -07:00
Razgriz
0b1059963b comments that make you say yes 2023-02-12 17:59:01 -07:00
Razgriz
71cc3901a1 Merge pull request #5684 from Echopsychotic/Clothing 
witch hat and cyborg mask added
 2023-02-12 17:55:42 -07:00
Razgriz
55c4ed096a Update character_directory.dm 2023-02-12 17:52:15 -07:00
Razgriz
6ba3c81072 Update character_directory.dm 2023-02-12 17:52:00 -07:00
Razgriz
ab10846f03 Merge branch 'master' into upstream-merge-14359 2023-02-12 17:49:31 -07:00
Razgriz
dc903a6715 powder that makes you say yes 2023-02-12 17:38:59 -07:00
Razgriz
5d90e19b33 god I hope I didn't break anything here 2023-02-12 17:34:15 -07:00
Casey
2891dc3ea7 Merge pull request #14476 from Heroman3003/runtime-17 
Runtime fixes
 2023-02-12 18:21:37 +00:00
Casey
c34feccac3 Merge pull request #14477 from Seris02/proteandefaultfix 
fix default proteans being technically organic shift start
 2023-02-12 18:21:32 +00:00
Casey
ffd8251f24 adds trait preferences and removes a bug 2023-02-12 18:20:26 +00:00
Casey
f841a10f4c Implements periodic tips for (new) players! 2023-02-12 18:19:13 +00:00
Heroman3003
358e8e9fa2 Cloaks, undies, the Antediluvian, and some other bits 2023-02-11 19:10:39 +00:00
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
708232d677 Merge pull request #5623 from CHOMPStation2/upstream-merge-14402 
[MIRROR] [MIRROR] Tiny grammar tweaks
 2023-02-02 20:50:59 -05: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
Nadyr
1c4f142953 Merge pull request #5618 from CHOMPStation2/upstream-merge-14394 
[MIRROR] Hitting cancel when setting character ad no longer blanks it in setup
 2023-02-02 20:27:17 -05:00
Nadyr
d829d8c8d7 Merge pull request #5611 from Seris02/simplemobchardir 
simple mob species for certain simple mobs in character directory
 2023-02-02 20:24:06 -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
077834dd5c [MIRROR] Tiny grammar tweaks 2023-01-30 08:51:26 +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
87cfe912bc Merge pull request #5609 from Verkister/patch-36 
Fixes pAI char directory flavor text
 2023-01-27 10:43:47 -05: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
Seris02
4194c2c3fe simple mob species for certain simple mobs in character directory 2023-01-26 20:45:08 +08:00
Verkister
ffefa20905 Fixes pAI char directory flavor text 
I am having some existential difficulties rn. (git blame says i messed it up but that is 400% not my brand of a fuckup lmao)
 2023-01-25 16:14:06 +02:00