cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-31 01:00:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
56,137 Commits 13 Branches 0 Tags
79abbcbc2f57b7ae7facd109a9d2437dc0099395
Commit Graph
1754 Commits
Author SHA1 Message Date
izac112 79abbcbc2f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-03 18:30:13 +02:00
AtermoneraandAronai Sieyes 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 SieyesandGitHub 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
AtermoneraandVirgoBot 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 SieyesandGitHub 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 SieyesandGitHub 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
AtermoneraandVirgoBot 20e8eb5b05 Merge pull request #7184 from Greenjoe12345/teshycoats 
adds some coats for teshari + fancy clothes
 2020-05-21 14:42:32 -04:00
NovacatandVirgoBot 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
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 SieyesandGitHub 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 SieyesandGitHub f0930ca045 Merge pull request #7874 from VOREStation/aro-ocuround 
Round hours shown on occupations page
 2020-05-15 20:52:01 -04:00
Aronai Sieyes a23605c9fd Move cyberpunk detective gear to be suits, add long version 2020-05-15 14:17:34 -04:00
Aronai Sieyes e33c305a9e Add inventory item tooltips 2020-05-14 19:16:40 -04:00
izac112 bba0a05f5f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-13 10:21:49 +02:00
Aronai SieyesandGitHub d93b580723 Merge pull request #7804 from radar651/MedHUDpatch 
MedHUD Patch
 2020-05-12 11:47:49 -04:00
Aronai Sieyes d4cfdcfb3a Switch to using GLOB.admins instead of admins 2020-05-12 11:16:54 -04:00
radar651 3a245943d3 MedHUD Patch 
Medical hud patch. Arrr.
 2020-05-12 10:29:29 -04:00
AtermoneraandVirgoBot d6e369178b Merge pull request #7128 from KillianKirilenko/kk-fashion2 
[PORT] Military Jackets
 2020-05-11 20:01:59 -04:00
Aronai Sieyes 3d30288a5e Round hours shown on occupations page 2020-05-11 17:56:04 -04:00
izac112 2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Aronai SieyesandGitHub b98f849c82 Merge pull request #7723 from VOREStation/aro-playtimedept 
Add department playtime requirement config, code
 2020-05-10 19:00:38 -04: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
NovacatandGitHub 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
Aronai Sieyes ea8a068025 Add department playtime requirement config, code 2020-05-08 17:57:56 -04:00
Aronai SieyesandGitHub 5f8ce48793 Merge pull request #7710 from VOREStation/upstream-merge-7064 
[MIRROR] Adds preference to control multilingual behaviour
 2020-05-08 14:55:46 -04:00
Aronai Sieyes de46f1a152 Don't copy NIF when you copy characters 2020-05-08 12:21:25 -04:00
AtermoneraandVirgoBot ee07d117f2 Adds preference to control multilingual behaviour 2020-05-08 00:43:57 -04:00
Aronai Sieyes 393366a825 Refactor job joins for noncarbons 2020-05-07 19:48:25 -04:00
Rykka baa3de91f0 Fix for Resetting Character Slot to Default 
Resets the character slot to default.
Fixes https://github.com/VOREStation/VOREStation/issues/7693

Credit goes to Shadow Larkens for helping me figure it out.
 2020-05-07 08:58:13 -04:00
Aronai Sieyes d172e2dd04 Cached version of icon_states() proc 2020-05-06 16:06:44 -04: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