cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 13:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,551 Commits 6 Branches 0 Tags
82d4ea26b45bb74c54f9e4535575e1594e7f8c86
Commit Graph

1062 Commits

Author SHA1 Message Date
Digi Purpur
33394d6d07 Supermatter Lighters balanced, and added fully. <3 
ALL experimental features for /selfattack added. (Procs on opening the lighter).
It'll be turned into a WMD eventually <3
 2023-07-03 07:32:01 -07:00
Heroman3003
f4ec2e5922 ports some clothing from citadel rp + 2 hairs & 2 gradients from skyrat 2023-07-01 20:25:47 +00:00
Raeschen
5e8b9b744e no armor in loadout 2023-06-28 13:36:51 +02:00
Raeschen
d66c728f05 add tacticool turt to loadout, give sensors 2023-06-28 13:22:45 +02:00
Heroman3003
5e67353570 Merge pull request #15066 from Heroman3003/loadoutfix 
Fixes missing fur coat in loadout
 2023-06-23 18:44:46 +00:00
Sharkmare
706fe49eb2 Lower cost of TTS in Loadout 
TTS is pure flavor since we all speak common, theres no reason for it to be more expensive
 2023-06-21 12:19:09 +02:00
Raeschen
2dfa96125a Remove KHI 2023-06-19 15:17:12 +02:00
Raeschen
9ae31e501e Merge pull request #6411 from CHOMPStation2/upstream-merge-15043 
[MIRROR] Spell Fixes
 2023-06-19 12:42:37 +02:00
Raeschen
de6a048679 fix merge conflicts 2023-06-19 11:48:24 +02:00
Heroman3003
db38ed93c0 Spell Fixes 2023-06-19 04:40:45 +00:00
Heroman3003
617e2e55b9 Loadout Overhaul 2023-06-18 18:47:29 +00:00
Raeschen
2c3eefe326 Merge branch 'master' into upstream-merge-14976 2023-06-17 14:47:37 +02:00
Nadyr
234de98640 powder that makes you say yes 2023-06-09 21:41:10 -04:00
Heroman3003
2281afdf24 More 515 Compatibility 2023-06-05 21:21:35 +00:00
Heroman3003
bf4c7eeffe Zera's Purple Cloak 2023-06-03 09:20:53 +00:00
Nadyr
67208f1769 powder that makes you say yes 2023-05-31 18:35:21 -04:00
Heroman3003
8d4fe86bdf Adds new shoe: "Elegant Sandals". Adds it to loadout 2023-05-30 20:23:12 +00:00
Nadyr
883f2430ce Merge branch 'master' into upstream-merge-14893 2023-05-29 19:09:57 -04:00
Nadyr
2ba64a5b79 Merge pull request #6243 from CHOMPStation2/upstream-merge-14872 
[MIRROR] Uniform Selectors
 2023-05-29 19:06:25 -04:00
Nadyr
a828d32b39 powder that makes you say yes 2023-05-29 18:50:08 -04:00
Nadyr
b30356ebd4 Merge pull request #6245 from CHOMPStation2/upstream-merge-14894 
[MIRROR] Adds Aria's medal
 2023-05-29 18:41:55 -04:00
Nadyr
182873418f Merge branch 'master' into upstream-merge-14893 2023-05-29 18:41:05 -04:00
Heroman3003
c83f29cf13 Merge pull request #14894 from Heroman3003/aria-medal 
Adds Aria's medal
 2023-05-25 02:51:12 +00:00
Heroman3003
338d5f605b TG Clothing Pack Polish 2023-05-25 02:27:29 +00:00
Heroman3003
deae0d7291 Uniform Selectors 2023-05-25 02:14:01 +00:00
Heroman3003
feebcbac94 Merge pull request #14886 from KillianKirilenko/kk-fashion 
New Poncho Style
 2023-05-25 02:11:24 +00:00
Casey
c0093930a5 Merge pull request #14857 from BonniePandora/CustomItem-NameChange 
Small custom-item changes
 2023-05-15 00:18:21 +00:00
Nadyr
7200a5e85a Merge pull request #6164 from CHOMPStation2/upstream-merge-14823 
[MIRROR] Added striped dungarees and tiny tophat
 2023-04-30 22:49:59 -04:00
Heroman3003
d1460c5713 Added striped dungarees and tiny tophat 2023-05-01 00:58:13 +00:00
BlackMajor
65a5644b02 Ugh 2023-04-30 21:39:18 +12:00
Fluff
669570d26c Added the synthsizer 
Added the synthsizer
 2023-04-18 20:50:59 -04:00
Fluff
ca6f42e694 Added instruments to load out. 
Added the following instruments to the loudout
 2023-04-18 19:48:11 -04:00
Nadyr
3439bbe48e Merge pull request #6065 from CHOMPStation2/upstream-merge-14772 
[MIRROR] Adds Mira's health services medal
 2023-04-11 01:09:46 -04:00
Nadyr
6c0584ab5b Merge pull request #6050 from Sharkmare/patch-27 
More efficient ShoesDel()
 2023-04-11 00:51:52 -04:00
Casey
790e2cbd81 Merge pull request #14772 from Runa-Dacino/mirafluff 
Adds Mira's health services medal
 2023-04-10 00:55:12 +00:00
Sharkmare
b78302161c More efficient ShoesDel() 
hints at deletion on init instead of manually calling deletion
 2023-04-07 16:56:54 +02:00
TheGreatKitsune
99d9295bc3 Merge master into loadout-crystals 2023-04-01 08:56:27 -05:00
Heroman3003
bde7b77bab Crop Jackets 2023-03-31 01:23:22 +00:00
Nadyr
e3e765c599 Merge pull request #5957 from Sharkmare/patch-18 
No shoes shoe option
 2023-03-17 04:01:26 -04:00
Sharkmare
79619dddcb Update loadout_shoes_vr.dm 2023-03-16 14:41:12 +01:00
Sharkmare
0f3870d9b9 oh right dreamchecker doesnt like this 2023-03-16 14:37:11 +01:00
Sharkmare
b100c26c11 unrelative the path 2023-03-16 14:34:29 +01:00
Sharkmare
ef4a4c2006 null paths dont work, big sad 2023-03-16 10:56:17 +01:00
Sharkmare
6a87c1df2c I mean, maybe it works 2023-03-16 10:34:28 +01:00
TheGreatKitsune
97701e8b3f Adds loadout capture crystals! 2023-03-13 16:58:03 -05:00
Heroman3003
d60ea6ffd2 Merge pull request #14675 from Heroman3003/boot-no-kill 
Removes warcrimes from boots
 2023-03-13 05:26:05 +00:00
Seris02
7e95080868 missed that 2023-03-04 15:17:28 +08:00
Seris02
af1152c21a runtime fixes for tf spawn 2023-03-04 15:15:45 +08:00
TheGreatKitsune
1d36a4215d Item TF spawnpoints 2023-02-26 15:43:47 -06:00
Heroman3003
d13fc550dc adds more drake plushies, and changes scidrake lights to match sci colors 2023-02-26 09:46:20 +00:00