cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,816 Commits 8 Branches 0 Tags
c97fc22813d9efc20d6677ade482b7f23faafca1
Commit Graph

1187 Commits

Author SHA1 Message Date
Chompstation Bot
2e15527ef0 Ports a Boatload of Teshari Customization from CitRP, Chomp & YW, Small Update to Protogen Markings 2020-11-20 15:44:21 +00:00
cadyn
e22d99d936 Merge pull request #847 from CHOMPStationBot/upstream-merge-9298 
[MIRROR] Adds Crescent-Moon Hair by Piperboobear
 2020-11-15 02:09:07 -08:00
cadyn
a67c751841 Merge branch 'master' into upstream-merge-9307 2020-11-15 00:48:22 -08:00
Verkister
f5c125eaff Merge pull request #9298 from Tenryumi/piper-hair 
Adds Crescent-Moon Hair by Piperboobear
 2020-11-15 08:46:24 +00:00
Chompstation Bot
f932e65178 Ports CitRP Protogen Head + Markings, Some Vox Markings, Teshari Markings, Ears + Tailss 2020-11-15 08:44:14 +00:00
Verkister
8bac06a913 Merge pull request #9284 from Verkister/bean 
Adds a new marking.
 2020-11-07 14:31:12 +00:00
Verkister
17e89fa241 Merge pull request #9148 from KillianKirilenko/kk-misc2 
'Closed eyes' markings
 2020-10-19 10:41:16 +00:00
Razgriz
6ca7b15786 Merge pull request #580 from KasparoVy/i-wear-my-heart-on-my-sleeve 
Hearts on BOTH SLEEVES
 2020-10-12 23:33:22 -07:00
KasparoVy
a872b0dd8e I Wear my Heart on My Sleeve(s) 
Both of them.
 2020-10-10 23:17:47 -04:00
KasparoVy
12dac5c191 Fixes Only One Accessory Equipped at Spawn & in Character Preview 
Ported from Aurora PR#10205, credit to fernerr
EARLYPORT OF POLARIS & VIRGO PRS

Now you can see all the accessories (within standard equipping logic) you've selected in the character preview.

Addditionally, these accessories will now all be equipped when you spawn instead of filling your backpack unless it's actually necessary.
 2020-10-08 18:38:37 -04:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Verkister
959cfbe591 Merge pull request #9074 from KasparoVy/darker_new_tesh_hair 
Makes Darker icon_add Versions of ArkStation Tesh Hair
 2020-09-24 11:18:00 +03:00
KasparoVy
923b48d6c4 Makes Darker icon_add Versions of ArkStation Tesh Hair 
AAttempted to replicate VerySoft's method:

In Paint.Net -> Adjustments -> Brightness/Contrast
Brightness: -68
Contrast: -40

I screwed with the Teshari Mane sprite until I got it to match up with the icon_add version with the above values.
 2020-09-20 19:24:19 -04:00
Verkister
728fea84d8 Adds bee stripes marking by radiantaurora 2020-09-20 12:22:06 +03:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Matica
c04771f0fe Dogborg Uprising 
Brings in dogborg markings for character creation! Made by skits.
 2020-09-07 17:00:38 -04:00
Novacat
692afaef75 Merge pull request #8794 from KasparoVy/mane-gain 
Lets Taj Hairstyles be Selected by More Species
 2020-08-28 16:11:57 -04:00
Heroman
ffdd8de3ce Site Management lookover for _vr stuff 2020-08-29 05:22:52 +10:00
Atermonera
63f7dd9417 Merge pull request #7480 from listerla/dionamarkings 
Ports Aurora Diona markings
 2020-08-27 19:26:18 -04:00
ShadowLarkens
264793b36a Fading titlescreen from /tg/ 2020-08-25 16:50:23 -07:00
KasparoVy
007b75dd7f Opens Taj Hairstyles to Same Species as Vulp Hairstyles 
Bit more flexibility. Vulp, Sergal, Fennec & Zorren species can now use cool Tajaran hairstyles.
 2020-08-21 14:01:08 -04:00
izac112
5c02633707 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-13 20:01:22 +02:00
Greenjoe12345
ba3505fbd2 ports a whole lot of Teshari stuff from Arkstation (#7431) 2020-08-12 14:17:08 -04:00
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
ShadowLarkens
951f37d2e3 TGUI Engineering: Squashed Edition (Commits Below) 
TGUI APCs

 TGUI vending machines

 Fix AI default_tgui_interaction

 TGUI Airlocks

 Station & Atmospheric Alert TGUI + Misc NTOS-TGUI Fixes

 TGUI Air Alarms & Central Atmospheric Control

 Airlock TGUI

 TG... got rid of UI for fire alarm. í´·

 TGUI Gas Heating/Cooling System

 TGUI Gas Pump & Passive Gate + Fixes

 TGUI Omni Atmospherics

 TGUI Pipe Dispensers & RPD

 TGUI IntelliCore & Vending Fix

 TGUI Handheld Tanks

 TGUI Portable Pump & Scrubber

 TGUI Tank Dispenser & Canisters

 TGUI Radios

 TGUI SMES & Air Alarm adjustment

 Tweak vending machine interfaces a tad

 TGUI Algae Farm

 TGUI general_air_control

 - Distro & Waste Console
 - Riot Control Console
 - Atmos Intake Console
 - Engine Cooling Console

 TGUI Heavy Scrubber Control (and body scanner fix)

 TGUI trinary devices & shutoff monitor

 TGUI Telecomms Log Browser

 TGUI Telecomms Machine Browser

 TGUI Spaceheater Internal Panel

 TGUI Gravity Generator

 TGUI Id Cards & Fix ID Card Images

 TGUI Id Card Redesign

 TGUI Turbolift

 TGUI Suit Cycler & Suit Storage Unit & Vending Fixes

 TGUI Power Monitor

 TGUI Signalers

 TGUI Employment Records

 TGUI Drone Console

 TGUI RIGSuits

 TGUI PA & PACMAN, and Margin Fix

 TGUI Solar Panels & Fix Power Monitor

 Adjust TGUI modules & their interaction with NTOS

 TGUI RCON

 TGUI Message Monitor

 Bump TGUI line limit to 120 (ParadiseSS13/Paradise#14002)

 TGUI Exonet & NTNet Relay

 TGUI Telecomms Multitool Menu

 TGUI Shield Capacitor & Shield Generator

 TGUI Supermatter-everything & Refactors
 2020-08-09 04:46:31 -07:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
Atermonera
3dd79b6729 Merge pull request #7409 from listerla/headtailnames 
Adjusts Skrellian hair names to fit descriptions on wiki
 2020-08-06 14:46:21 -04:00
izac112
1456af50f7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-14 00:21:02 +02:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
Atermonera
a697e83ebd Merge pull request #7326 from Neerti/arrival_announcement_fix 
Arrivals Shuttle Message Fix
 2020-07-09 18:29:38 -04:00
SplinterGP
a056658ef6 Tesh fluffies 2020-07-06 16:58:15 -03:00
SplinterGP
28b5e2b143 tesh markings 2020-07-04 02:19:25 -03: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
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
Aronai Sieyes
49b9896f73 Redo respawning 2020-05-23 17:32:02 -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
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Razgriz
41b6fdc00e Fix orca head 
Removed an icon pointer from orca head. Should be properly pulling from markings_ch.dmi now
 2020-05-17 14:51:38 -07:00
izac112
a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02:00
KasparoVy
67ce8f383c Adds Equine Facial Markings & Ears 
I was poring over the markings list as usual, inspired this time to draft a donkey but was woefully struck by a lack of equine markings. Neigh, this cannot be! So I took to resolving the issue post-haste.

The muzzle is flexible goes quite well with draconic designs too. Recommended to use with the Sergal bodytype for best results.
 2020-05-16 02:35:06 -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 Sieyes
84afeed8af Fix OOC notes requirement 2020-05-11 14:14:50 -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 Sieyes
ba46116ce7 Merge pull request #7762 from VOREStation/upstream-merge-7107 
[MIRROR] Prevent holopad chat from going to lobby
 2020-05-10 22:10:54 -04:00
Atermonera
fc8f1951f1 Merge pull request #7107 from VOREStation/pol-holohear 
Prevent holopad chat from going to lobby
 2020-05-10 18:41:00 -04:00
Aronai Sieyes
ea8a068025 Add department playtime requirement config, code 2020-05-08 17:57:56 -04:00
Aronai Sieyes
92c3cf7345 Merge pull request #7706 from VOREStation/aro-holohear 
Prevent holopad chat from going to lobby
 2020-05-08 14:43:22 -04:00
Aronai Sieyes
dd3d4f4cfe Refactor spawn_checks_vr and when it is called 2020-05-08 13:34:31 -04:00