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
57,591 Commits 8 Branches 0 Tags
454cfda0b64056064afccf8a029a0c3b55785d19
Commit Graph

1805 Commits

Author SHA1 Message Date
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
izac112
01a20369ee Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore into izac 2020-07-06 15:39:21 +02:00
izac112
d9af2a4cca updates client procs.dm 2020-07-06 15:38:55 +02: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
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
Novacat
f7cab660e8 Merge pull request #8321 from VOREStation/upstream-merge-7297 
[MIRROR] Wrist-bound PDAs!
 2020-06-22 09:39:41 -04:00
Atermonera
90a2053e57 Wrist-bound PDAs! 2020-06-21 16:42:05 -04: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
Aronai Sieyes
2bed004132 Merge pull request #8283 from knoxon1/zenasuit 
Adds Zena's Shroud Suit Fluff Item
 2020-06-15 11:29:54 -04:00
knoxon1
2f15905e6e aaa 2020-06-14 22:55:02 -05:00
Atermonera
bcd18e4997 Merge pull request #7278 from VOREStation/vplk-unused-image-assets 
Remove Unused Image Assets
 2020-06-14 21:32:34 -04:00
Arokha Sieyes
f1854f89b9 Add more safety around the hours query 2020-06-13 23:07:12 -04:00
izac112
7ad2832f14 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-08 21:49:14 +02:00
Darlantan
5e776cdc0b Adds Starcaster 
-Adds the starcaster, a device for reading the news.
-Adds starcaster as a free loadout item
-Comments out sleepy sergal articles, adds starfire articles
 2020-06-08 07:28:15 -04:00
Leshana
d6603a7302 Combine all nanoui templates into a single resource bundle. 
This reduces the number of assets needing to be sent on join by 150ish.
- Nanoui scripts modified to load templates in parallel instead of one at a time.
- Nanoui scripts modified to be willing to load from the resource bundle if available, falling back to ajax-loading the individual templates if absent.
 2020-06-06 14:59:54 -04:00
izac112
79abbcbc2f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-03 18:30:13 +02:00
Atermonera
9a6b5a71f3 Streamline (Facial) Hair & Marking Character Customization, Port color_square to Clean Prefcode 2020-05-30 14:10:54 -04:00
izac112
0d1fe7d706 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-30 16:01:43 +02:00
Aronai Sieyes
39c7542b66 Merge pull request #8097 from VOREStation/Arokha/solgov 
Fix solgov icons
 2020-05-28 16:57:54 -04:00
Unknown
a313950f62 Fixes compile 2020-05-28 14:22:46 -04:00
Aronai Sieyes
ad820c6bc5 Make being disconnected painfully obvious 2020-05-28 12:56:00 -04:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
Atermonera
f0bf4efcca Adds vchat export chatlog verb (#7214) 2020-05-24 17:24:24 -04:00
Leshana
8a21fc2e6c Add code to enable communication with VGS 
VGS provides a subset of TGS functionality, mostly just the discord bot.  It extends TGS datums and adds a little bit.
Right now its done in parallel to TGS's code to minimize impact of not having the rest of DMAPI v5 impemented.
 2020-05-24 02:11:16 -04:00
Aronai Sieyes
f535ee89f3 Warn VPN connectors better 2020-05-22 20:11:02 -04:00
Aronai Sieyes
67a5ead927 Click background in character preview to change it 2020-05-22 11:07:43 -04:00
Leshana
fb532ac920 Refactor Character Setup to use MAP 
- Instead of using expensive getFlatIcon() calls, character previews are now shown using screen objects in a second map window.
- Edited skin to add a named window for preferences setup that contains a browser plus a new map window to show the previews.
- Mannequins are still generated the same way, but now a MA is applied to four screen objects which are shown in the second map window.
- The screen objects are deleted on close of the preferences window.  So we do make sure to close it when spawning.
 2020-05-21 19:04:56 -04: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
22fe3bd4e4 Merge pull request #8002 from VOREStation/upstream-merge-7138 
[MIRROR] Updates Solgov/Sifguard uniforms
 2020-05-21 16:03:58 -04:00
Aronai Sieyes
1bd327ce1e Merge upstream PR 2020-05-21 15:48:02 -04:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02: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
Aronai Sieyes
1c816a9bdd Antagonist options for new events not saving with slot? 
Fixes #7743
 2020-05-21 11:09:28 -04:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Aronai Sieyes
ffe7b9496d Remove stat() sleeping 2020-05-19 16:25:56 -04:00
Repede
3f4f33bbd8 Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates 
# Conflicts:
#	code/modules/mob/living/carbon/human/emote_vr.dm
 2020-05-18 20:30:52 -04:00
Aronai Sieyes
ea02fe8c75 Change name of Whisubtle vis verb 2020-05-18 14:23:33 -04:00
izac112
c14d144d45 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-18 16:05:36 +02:00
Leshana
4b29c1118e Fixed a couple issues and added columns to schema file. 2020-05-17 22:16:00 -04:00
Aronai Sieyes
e585a6dc47 Semi-automate discord ID registration 2020-05-17 21:14:18 -04:00
izac112
a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02:00
izac112
bbb084a354 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 09:06:27 +02:00
Aronai Sieyes
9748b077ef Merge pull request #7876 from VOREStation/aro-detsuit 
Move cyberpunk detective gear to be suits, add long version
 2020-05-15 20:52:43 -04:00
Aronai Sieyes
f0930ca045 Merge pull request #7874 from VOREStation/aro-ocuround 
Round hours shown on occupations page
 2020-05-15 20:52:01 -04:00