cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,996 Commits 5 Branches 0 Tags
3995338290d8b69edb786c331e335d6d33838905
Commit Graph

1832 Commits

Author SHA1 Message Date
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
Nadyr
d77e4f84cb Merge pull request #3877 from TheGreatKitsune/non-crew-role 
Non crew role added
 2022-10-29 19:08:16 -04:00
Heroman3003
802b6734bd Adds Perrin's fluff stuff 2022-10-29 06:20:16 +00:00
Novacat
9bfeba47bb Merge pull request #13973 from TheDavestDave/knight-fluff-fix 
fluff item spawns now
 2022-10-25 23:23:10 +00:00
Nadyr
3febdc6bf5 Merge pull request #5169 from CHOMPStation2/upstream-merge-13943 
[MIRROR] Adds the tactical AR visor.
 2022-10-24 17:01:47 -04:00
Nadyr
2501f36ee0 Merge pull request #5163 from CHOMPStation2/upstream-merge-13937 
[MIRROR] Adds altevian badges
 2022-10-24 16:58:09 -04:00
Nadyr
b433f36ff3 Merge pull request #5153 from CHOMPStation2/upstream-merge-13920 
[MIRROR] Adds Freyr's Mask fluff item
 2022-10-24 16:53:34 -04:00
Casey
a452b89e36 Merge pull request #13943 from FunnyCatEnjoyer/FunnyCat2 
Adds the tactical AR visor.
 2022-10-23 18:53:11 +00:00
Casey
2ece8642cb Merge pull request #13937 from Heroman3003/ratbadges 
Adds altevian badges
 2022-10-23 18:49:35 +00:00
Casey
28ddf3e099 Adds Freyr's Mask fluff item 2022-10-16 21:10:06 +00:00
Casey
973ce30d54 Merge pull request #13918 from FunnyCatEnjoyer/FunnyCat 
Adds the Security Hudpatch MKII to the game
 2022-10-16 21:08:46 +00:00
Razgriz
07378cb72d Merge pull request #5131 from Verkister/unmaul-ya-face 
Finally some symmetry for sharp scaling
 2022-10-14 22:58:05 -07:00
Verkister
baaec13a56 Finally some symmetry for sharp scaling 
Whoa boye we finally did it after so many years.
Figured out how spaceman scales without wacky disfigured symmetry.
-Adds symmetry.
-Adds buttons to toggle it.
-Adds it to prefs too.
-Only affects sharp scaling. (fuzzy did not like symmetry at all)
-Adds mob and species var for offset, 0.5 for odd center (spacemen etc) and 0 for even center (teshari etc)
While the symmetry itself is working flawlessly (at least front/back), it may look wack at near-100% sizes (nose instantly double-widened or vanished), but it can be overridden both, in prefs and while ingame.
 2022-10-14 20:57:59 +03:00
Nadyr
4fe88b4670 Merge pull request #5123 from CHOMPStation2/upstream-merge-13886 
[MIRROR] Aku Zoles Briefcase fluff item
 2022-10-11 21:20:06 -04:00
Nadyr
41d1145dbe powder that makes you say yes 2022-10-11 20:46:43 -04:00
Casey
774bd35904 Aku Zoles Briefcase fluff item 2022-10-10 03:20:18 +00:00
Casey
224d985529 Suit&Uniform Supplement. 2022-10-10 03:08:44 +00:00
C.L
8e6652e1b0 Merge pull request #13290 from VOREStation/upstream-merge-8660 
[MIRROR] Adds some core behavior code, uses it to fix a small bug (ABLE TO BE MERGED)
 2022-09-25 01:22:31 +00:00
Razgriz
6bbcda4901 [Manual MIRROR] Adds a ton more altevian stuff 
Ports https://github.com/VOREStation/VOREStation/pull/13774 instead of the auto mirror because github was crying over conflicts with a .dmi file
 2022-09-22 21:32:28 -07:00
VirgoBot
8157b3a7ab [MIRROR] Skips traits that aren't implemented yet. (ABLE TO BE MERGED) (#13165) 
* Merge pull request #8655 from MistakeNot4892/traitfix

Skips traits that aren't implemented yet.

* Skips traits that aren't implemented yet.

Co-authored-by: Atermonera <atermonera@gmail.com>
 2022-09-23 01:03:44 +00:00
TheGreatKitsune
2f4c829afa Merge branch 'master' of https://github.com/CHOMPStation2/CHOMPStation2 into non-crew-role 2022-09-21 13:42:13 -05:00
Nadyr
8e50c6cfd9 Merge pull request #4960 from CHOMPStation2/upstream-merge-13750 
[MIRROR] Adds more altevian content
 2022-09-18 21:13:27 -04:00
Nadyr
39fd54bae7 Merge pull request #4950 from CHOMPStation2/upstream-merge-13726 
[MIRROR] Fixes runtime with loading bad-saved langaugaes
 2022-09-18 20:53:46 -04:00
Casey
f2716e95ae Adds more altevian content 2022-09-18 09:39:22 +00:00
Casey
5e3d6d8202 Merge pull request #13726 from Heroman3003/langslot-runtime 
Fixes runtime with loading bad-saved langaugaes
 2022-09-18 09:34:28 +00:00
Novacat
22e1a26d4e Merge pull request #13737 from Heroman3003/admin-toggles 
Some staff-specific pref staff
 2022-09-15 13:52:38 +00:00
Nadyr
684c4467fd Merge branch 'master' into upstream-merge-13710 2022-09-10 22:11:06 -04:00
Nadyr
3c6b93eb1f Merge pull request #4903 from CHOMPStation2/upstream-merge-13706 
[MIRROR] Adds Taur Skirts
 2022-09-10 22:04:02 -04:00
Casey
61ddc608f1 Fixes Taur Skirt 2022-09-10 21:24:57 +00:00
Casey
b0b6a5b138 Merge pull request #13706 from Novacat/nova-basicfixes 
Adds Taur Skirts
 2022-09-10 20:47:13 +00:00
Casey
b4dfdbd16c Merge pull request #13700 from Heroman3003/dragor-hat 
Adds colorable magic hat to loadout
 2022-09-10 20:41:46 +00:00
TheGreatKitsune
4efab2d969 Merge master into non-crew-role and fix a map 2022-09-06 10:09:32 -05:00