cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,310 Commits 8 Branches 0 Tags
c85bf8104cde3e6578045e49d15c36b3533f540a
Commit Graph

675 Commits

Author SHA1 Message Date
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
Novacat
8e79488e0c Update loadout_head.dm 2020-07-31 16:47:36 -04:00
Schnayy
f9c3cf616e Clothes, clothes, clothes! 2020-07-31 04:02:49 -04:00
Braiden
0183e4f6f3 Merge branch 'master' of https://github.com/KBraid/YWPolarisVore 2020-07-25 13:18:09 -05:00
Braiden
26b1e3ebf4 fix attempt 
failed
 2020-07-25 13:18:02 -05:00
Braiden
2762dd413e removed code confusion 
chief engineer's cloak still broken, unsure as to why.
 2020-07-25 12:56:17 -05:00
Izac Joof Forsgren
ec7c3e5ff7 Merge branch 'master' into master 2020-07-25 16:20:23 +02:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
Braiden
9215bb900b coding completed 
belted version of all department cloaks, including three new claoks (Cheif of Sec, Warden, Janitor)
 2020-07-24 16:31:05 -05:00
Schnayy
4cf5f95991 Clothes! (And rats) 2020-07-22 06:13:29 -04:00
izac112
7a32077f7b Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into izac 2020-07-14 00:21:38 +02:00
izac112
1456af50f7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-14 00:21:02 +02:00
Izac Joof Forsgren
08b7d87378 Update code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm 2020-07-13 15:12:02 +02:00
SplinterGP
b516ac7cb2 K'braid aviation goggles 2020-07-12 22:25:09 -03:00
lukevale
8bebad0ead Jean's chocolate box 
Time for her to money shot with dat girl scout chocolates
 2020-07-05 09:22:21 -05:00
Killian
68e0f2fd23 BALL! 2020-07-04 17:51:39 +01:00
Repede
13b7aeb4a5 https://github.com/CHOMPStation2/CHOMPStation2/pull/207 2020-07-03 16:56:42 -04:00
izac112
22880f526d Voreupdate 2020-07-02 15:39:00 +02:00
H0lySquirr3l
077fe4a1e9 Update loadout_fluffitems_vr.dm 2020-06-19 22:03:05 -05:00
izac112
4864ad384d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-17 04:30:06 +02:00
Atermonera
e3a8e9c7a5 Merge pull request #7287 from lbnesquik/Kot-Loadout-tweak 
Make gloves half as expensive.
 2020-06-16 03:33:24 -04:00
Killian
24ef73ca38 Update loadout_suit_vr.dm 2020-06-15 21:41:07 +01:00
Killian
37a2a052d9 Update loadout_suit_vr.dm 2020-06-15 21:28:54 +01:00
knoxon1
2f15905e6e aaa 2020-06-14 22:55:02 -05:00
izac112
0d1fe7d706 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-30 16:01:43 +02:00
Unknown
a313950f62 Fixes compile 2020-05-28 14:22:46 -04:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
Aronai Sieyes
06a733e680 Merge pull request #8014 from VOREStation/upstream-merge-7184 
[MIRROR] adds some coats for teshari + fancy clothes
 2020-05-21 16:07:42 -04:00
Aronai Sieyes
1bd327ce1e Merge upstream PR 2020-05-21 15:48:02 -04:00
Atermonera
20e8eb5b05 Merge pull request #7184 from Greenjoe12345/teshycoats 
adds some coats for teshari + fancy clothes
 2020-05-21 14:42:32 -04:00
Novacat
872bc17937 Updates Solgov/Sifguard uniforms 2020-05-21 14:21:19 -04:00
izac112
a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02:00
Aronai Sieyes
a23605c9fd Move cyberpunk detective gear to be suits, add long version 2020-05-15 14:17:34 -04:00
izac112
bba0a05f5f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-13 10:21:49 +02:00
radar651
3a245943d3 MedHUD Patch 
Medical hud patch. Arrr.
 2020-05-12 10:29:29 -04:00
Atermonera
d6e369178b Merge pull request #7128 from KillianKirilenko/kk-fashion2 
[PORT] Military Jackets
 2020-05-11 20:01:59 -04:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Unknown
a74d890331 Repurposes Explorer Corp Uniforms 
Repurposes the SEV Torch Explorer Corp uniforms into uniforms for the Nanotrasen Defense Force.
 2020-05-10 14:44:15 -04:00
Novacat
1d9879c7a0 Merge pull request #7734 from KillianKirilenko/kk-misc 
[LOADOUT] Dept. AR Glasses
 2020-05-10 12:42:35 -04:00
Killian
f18191da1e Update loadout_eyes_vr.dm 2020-05-09 17:33:38 +01:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Killian
8240a97400 Merge branch 'master' into kk-miscstuff 2020-05-04 14:20:02 +01:00
Steven Storesund
868d412d19 Aurora's floof, I mean fluff item 2020-05-03 19:44:13 -05:00
SplinterGP
d014595b73 Merge remote-tracking branch 'Yawn-wider/master' into holdelta 2020-04-30 21:49:16 -03:00
SplinterGP
a100713305 Puts some extra on name so sec officers can know it is job-related 2020-04-30 21:27:16 -03:00
serenekerosene
b693f8e06c Scylla Fluff Item 
I hope I did this right!!!!!!!! TY to Amaya for the guide

Fluff application was approved here: https://forum.vore-station.net/viewtopic.php?f=26&t=1744
 2020-04-30 20:24:25 -04:00
SplinterGP
0b5c897eb8 adds YW edit 2020-04-30 20:24:42 -03:00
Novacat
81900f5080 Merge pull request #7505 from AmayaWah/pleasestop 
Adds Damon's bomber security jacket.
 2020-04-29 18:45:51 -04:00
TheFurryFeline
3afe4adaed Remove Duplicate Code 
Title, response to mirror.
 2020-04-29 15:17:05 -04:00
Greenjoe12345
ff628daae1 Adds heterochromia for humanoid species and Teshari (#7016) 
adds the ability to color the Teshari undercoat, cloak, smock, as well as the footwraps
 2020-04-29 15:11:41 -04:00