cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,539 Commits 6 Branches 0 Tags
3974d7e87fd62beba0ab4aa84279aee4e365fba8
Commit Graph

1535 Commits

Author SHA1 Message Date
Novacat
90483ba481 Merge pull request #8362 from KillianKirilenko/kk-balls 
BALL!
 2020-07-09 20:08:21 -04:00
Leshana
c59cb0cda4 Fix indentation syntax error. (#7320) 
Bad extra indent causes compile failures on strict DM compilers.  Breaks linting.
 2020-07-07 02:42:31 -04:00
Killian
68e0f2fd23 BALL! 2020-07-04 17:51:39 +01:00
Layne
989ca48282 ice cream 2020-07-04 00:37:03 -04:00
Layne
7b7a1b853e ice cream 2020-07-01 18:56:09 -04:00
Atermonera
5fbc4f3189 Merge pull request #7304 from KillianKirilenko/kk-bio 
Offload Defibrillatability from NO_SCAN
 2020-06-25 15:44:49 -04: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
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
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
Atermonera
9a6b5a71f3 Streamline (Facial) Hair & Marking Character Customization, Port color_square to Clean Prefcode 2020-05-30 14:10:54 -04: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
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
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
Aronai Sieyes
ffe7b9496d Remove stat() sleeping 2020-05-19 16:25:56 -04:00
Aronai Sieyes
ea02fe8c75 Change name of Whisubtle vis verb 2020-05-18 14:23:33 -04: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
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
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
Aronai Sieyes
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
Atermonera
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
Aronai Sieyes
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
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
Aronai Sieyes
ea8a068025 Add department playtime requirement config, code 2020-05-08 17:57:56 -04:00