cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,477 Commits 10 Branches 0 Tags
c687ed18ef5220f01eea7bf8752e05cea61fcea7
Commit Graph

1321 Commits

Author SHA1 Message Date
Razgriz
c687ed18ef Update 01_basic.dm 2021-06-23 15:48:13 -07:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
b379b08551 Pandora029 fluff item 2021-06-20 17:40:00 +00:00
Nadyr
374e896bfc Merge pull request #2212 from CHOMPStationBot/upstream-merge-10660 
[MIRROR] ITV Merchandise (Talon Gear)
 2021-06-19 21:25:44 -04:00
Nadyr
b3ccdb22a9 powder that makes you say yes 2021-06-19 21:00:46 -04:00
Nadyr
bfd8b22c39 powder that makes you say yes 2021-06-19 20:50:43 -04:00
Nadyr
761d76a43c powder that makes you say yes 2021-06-19 20:48:36 -04:00
radiantAurora
2c5bcd7b47 Merge pull request #1 from CHOMPStation2/master 
update to master
 2021-06-18 16:09:23 +01:00
Chompstation Bot
52be7df6fc ITV Merchandise (Talon Gear) 2021-06-17 19:50:08 +00:00
Verkister
274d1fa1d2 Earlyports synth var fix 
Fixes synthetic var not getting cleared when loading character slots. Due to the char setup mannequin mob's nature of being a single same mob just getting its properties loaded from save slots, loading/making a synth character would permanently mess up the var for all non-synth chars on the roster and cause issues with synth-related settings because there was nothing in the code to clear the var.
 2021-06-17 12:16:46 +03:00
radiantAurora
11f39e9dc4 Update setting_datums.dm 2021-06-10 17:38:35 +01:00
radiantAurora
b0629849d7 Add files via upload 2021-06-09 19:22:39 +01:00
Novacat
4f546ba6f7 Merge pull request #10598 from klaasjared/explo-duffle-fix 
Exploration Duffle Fix
 2021-06-09 14:42:19 +00:00
Aronai Sieyes
394d5b148a Merge pull request #10562 from VOREStation/Arokha/fixprot 
Fix mistake made in 04625a5
 2021-06-06 05:24:33 +00:00
Aronai Sieyes
5c46d1bd45 Merge pull request #10537 from VOREStation/Fixes/10321 
Fixes #10321
 2021-06-02 16:02:54 +00:00
Chompstation Bot
4476e4104d Ports Runechat 2021-05-30 22:51:20 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Chompstation Bot
8911fe1de3 Manual port Polaris Fixes 2021-05-22 20:22:28 +00:00
Nadyr
610ca32831 Merge branch 'master' into upstream-merge-10327 2021-05-19 09:51:53 -04:00
Razgriz
2e9c95fe1d Update loadout_suit_vr.dm 2021-05-18 21:07:22 -07:00
Razgriz
cda655fffd Update loadout_accessories_vr.dm 2021-05-18 21:05:00 -07:00
Chompstation Bot
dc4adb84dc Adds more winter coats + moves existing winter coats to the same file 2021-05-17 23:22:24 +00:00
Chompstation Bot
3c3f14185d Minor Loadout Tweaks 2021-05-17 16:56:27 +00:00
Novacat
84661bfe35 Merge pull request #10330 from TheFurryFeline/TFF-AR_Visor_Port 
AR Visor
 2021-05-15 13:23:31 +00:00
Novacat
86ab1a8363 Merge pull request #10303 from VOREStation/Arokha/removeoldnifmenu 
Deprecate NIF statpanel in favor of TGUI
 2021-05-12 17:46:40 +00:00
Darlantan
86e7b94971 powder that makes you say yes 2021-05-12 03:11:54 -04:00
Novacat
d318defa59 Merge pull request #10302 from VOREStation/Arokha/joinfixes 
Fix two character spawn bugs
 2021-05-12 04:13:20 +00:00
Nadyr
7dd7118cb4 Merge branch 'master' into upstream-merge-10265 2021-05-11 23:06:30 -04:00
Razgriz
63867629e4 Port one line that wasn't ported 
Port one line that wasn't ported in CHOMPStation2#1888 from https://github.com/VOREStation/VOREStation/pull/10247/files

I'm scared.
 2021-05-11 01:42:24 -07:00
Verkister
1b2b54d58c Fixes Wing/Tail/Ear Sanitation 
manual port of https://github.com/VOREStation/VOREStation/pull/10279
 2021-05-10 17:49:13 +03:00
Nadyr
8654aff7b6 github you fuck 2021-05-10 01:32:23 -04:00
Nadyr
88b1b04bd8 Merge branch 'master' into upstream-merge-10247 2021-05-10 01:30:24 -04:00
Nadyr
1f33d5696f Merge pull request #1900 from CHOMPStationBot/upstream-merge-10236 
[MIRROR] Toys expansion
 2021-05-08 23:50:05 -04:00
Chompstation Bot
3217535913 [MIRROR] Fixes Virgo #10254. 2021-05-07 07:27:08 +00:00
Novacat
3245498530 Merge pull request #10236 from dwinters99/toys 
Toys expansion
 2021-05-06 14:42:49 +00:00
Chompstation Bot
f38a740237 [MIRROR] Body style selection and sanitizing refactor. 2021-05-05 18:46:14 +00:00
Nadyr
9dd025973b Merge pull request #1869 from Darlantanis/Fixes-#10237-2 
Emergency earlyport of "Fixes #10237"
 2021-04-30 02:46:36 -04:00
Nadyr
8d05156f42 earlyport fix 2021-04-30 02:33:07 -04:00
Nadyr
f67bd28e3a Merge branch 'master' into upstream-merge-10219 2021-04-30 02:05:30 -04:00
Nadyr
f75ba84710 Merge pull request #1865 from CHOMPStationBot/upstream-merge-10223 
[MIRROR] [MIRROR] Sanitizes languages, ears/wings/tail prefs on login
 2021-04-30 02:03:42 -04:00
Nadyr
9d401ead5f Merge pull request #1858 from CHOMPStationBot/upstream-merge-10213 
[MIRROR] Both fixes and comments out WL check
 2021-04-30 01:15:48 -04:00
Nadyr
0ac27ecbe3 Update 03_body.dm 2021-04-30 01:14:57 -04:00
Nadyr
1e0f3485ac Update 02_language.dm 2021-04-30 01:11:33 -04:00
Nadyr
fefd3b6641 Merge pull request #1862 from CHOMPStationBot/upstream-merge-10217 
[MIRROR] Add LUNA's Medals
 2021-04-30 01:05:34 -04:00
Nadyr
8cd695295c Merge pull request #1861 from CHOMPStationBot/upstream-merge-10216 
[MIRROR] Add Entchtut's medal
 2021-04-30 01:04:55 -04:00
Nadyr
a34fd9cec8 Merge branch 'master' into upstream-merge-10213 2021-04-30 01:03:17 -04:00
Chompstation Bot
606e2e757c [MIRROR] Adds config option to control loadout whitelist strictness 2021-04-28 16:46:12 +00:00
Chompstation Bot
dde4aa05bd [MIRROR] Sanitizes languages, ears/wings/tail prefs on login 2021-04-28 16:30:43 +00:00
Novacat
f6d79c391d Merge pull request #10217 from ResidentCody/Personal-Fork 
Add LUNA's Medals
 2021-04-27 04:19:22 +00:00
Novacat
3f10cf6eb5 Merge pull request #10216 from Little-119/medal-addition 
Add Entchtut's medal
 2021-04-27 03:02:02 +00:00