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
73,178 Commits 5 Branches 0 Tags
cc135c3d330e6d61879fd13fd726bc0c1c109f4b
Commit Graph

1003 Commits

Author SHA1 Message Date
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
Nadyr
f71dfd8be7 Merge pull request #5665 from CHOMPStation2/upstream-merge-14443 
[MIRROR] Fixes "Colored Feminine Jumpsuit"
 2023-02-07 13:39:48 -05: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
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
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
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
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
764e792895 Remove the Exploration Department 2022-12-23 16:21:39 +00: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
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
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
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
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
Casey
f2716e95ae Adds more altevian content 2022-09-18 09:39:22 +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
Nadyr
3469c509cc Merge pull request #4774 from CHOMPStation2/upstream-merge-13560 
[MIRROR] adds a custom item for coolcrow420
 2022-08-28 19:15:26 -04:00
Nadyr
4d0f889ae7 Merge pull request #4744 from CHOMPStation2/upstream-merge-13533 
[MIRROR] Allows altevian department outfits to be selected freely
 2022-08-28 18:29:20 -04:00
Casey
604ff7c816 Merge pull request #13560 from faaaay/m41l-item 
adds a custom item for coolcrow420
 2022-08-25 22:55:29 +00:00
Casey
abb483abc2 Merge pull request #13533 from Heroman3003/altevian-selection 
Allows altevian department outfits to be selected freely
 2022-08-21 19:36:25 +00:00
Novacat
e0865a6a33 Merge pull request #13537 from Heroman3003/tesh-cap-fix 
Fixes teshari Site Manager cloak being for nonexistant job of Facility Director
 2022-08-20 12:03:03 +00:00