cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,876 Commits 5 Branches 0 Tags
fd46ebb51aeba66abfe44b0477ccd2ce751bce0f
Commit Graph

1921 Commits

Author SHA1 Message Date
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
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 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
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02: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
Razgriz
8476073790 Merge pull request #334 from CHOMPStation2/May2020UpstreamPull 
May2020 upstream pull
 2020-05-09 21:58:55 -07: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 Sieyes
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
Atermonera
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
ec4c8ebbd7 Fix for Resetting Character Slot 
Earlyport of https://github.com/PolarisSS13/Polaris/pull/7103 and https://github.com/VOREStation/VOREStation/pull/7694 and https://github.com/Yawn-Wider/YWPolarisVore/pull/747

Credit to @ShadowLarkens

Yes I like crediting things.
 2020-05-07 09:13:47 -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
Razgriz
81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07: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
SplinterGP
c25bd646df Commit to run travis again 2020-05-05 21:19:00 -03:00
SplinterGP
17df0f666f Merge branch 'master' into master 2020-05-05 21:02:46 -03:00
SplinterGP
6b1cb4e1ff Adds haemophilia too and reset button 2020-05-05 20:53:41 -03:00
SplinterGP
3ad4e4a535 Disabilities out of trait system 2020-05-05 15:46:30 -03:00
Aronai Sieyes
01a51e5acd Add prefs for Be Morph, Be Maintpred, Be Lost Drone 
Allows the 'never for this round' button to work, and for them to be disabled entirely if you don't want to be asked again.
 2020-05-04 20:04:43 -04:00
Aronai Sieyes
538e85283b Fix out-of-order role candidate options 
fixup pol commit
 2020-05-04 20:04:43 -04: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
Leshana
f029c555f2 Adds the Rapid Pipe Dispenser 
- Adds "paintable" flag to pipe recipes so we know if we can paint it.
- Ports the RPD from Yawn Wider.
  - Brings RPD sprites from /tg instead.
  - Slightly refactors recipes to keep type-specifc vars on subtypes.
  - Refactors RPD UI icons to use iconsheet assets: Instead of sending each individual icon to the client as needed, we declare an icon sheet asset and send the entire thing to client.  Then we just use the given CSS classes to display the icons!
- Adds icon sheet asset datum for pipe and diposals construction.
 2020-05-02 19:18:10 -04:00
SplinterGP
d014595b73 Merge remote-tracking branch 'Yawn-wider/master' into holdelta 2020-04-30 21:49:16 -03:00