cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,587 Commits 10 Branches 0 Tags
af32042b151440222843fc6e46fd0563b1895c45
Commit Graph

44572 Commits

Author SHA1 Message Date
lm40
af32042b15 fixes #10700 (#10763) 
* Update human.dm

* Update robot.dm

* Update simple_hud.dm
 2021-06-27 16:10:18 +00:00
Razgriz
3111c1beee Merge pull request #2294 from kcin2001/shadekin-ears 
unlock shadekin ears
 2021-06-26 13:24:56 -07:00
Razgriz
f692192d2c Merge pull request #2276 from CHOMPStationBot/upstream-merge-10727 
[MIRROR] Medicine Tweaks
 2021-06-26 13:24:46 -07:00
Razgriz
52d29d42bb Merge pull request #1955 from CHOMPStationBot/upstream-merge-9969 
[MIRROR] Adds in Booze hounds.
 2021-06-26 13:23:49 -07:00
kcin2001
d5258e7851 unlock shadekin ears 
allow all species to use shadekin ears again, there too adorable to be hogged by 1 species (they're nice as just 4 fluffy ears)
 2021-06-26 01:50:46 -07:00
Nadyr
e1fef06cab Merge pull request #2282 from CHOMPStationBot/upstream-merge-10740 
[MIRROR] Rewrite RCON UI
 2021-06-25 22:14:00 -04:00
Nadyr
384f936937 Merge pull request #2292 from CHOMPStationBot/upstream-merge-10754 
[MIRROR] 2 Overmap Fixes
 2021-06-25 22:07:02 -04:00
Nadyr
5c54b764c0 Merge pull request #2290 from Verkister/patch-23 
Fixes shower overlays
 2021-06-25 22:00:59 -04:00
Razgriz
24f67188ab powder that makes you say yes 2021-06-25 21:53:58 -04:00
Chompstation Bot
ad122fdd96 Rewrite RCON UI 2021-06-25 21:53:58 -04:00
Nadyr
154a665dbf Merge branch 'CHOMPStation2:master' into upstream-merge-10737 2021-06-25 20:59:55 -04:00
Novacat
9dcda80a06 Merge pull request #10754 from VOREStation/Arokha/shiplight 
2 Overmap Fixes
 2021-06-25 18:26:05 +00:00
Verkister
8d0899b925 Fixes shower overlays 
Mirrorbot whoopsied again.
 2021-06-25 13:56:13 +03:00
Razgriz
bdb955feff stop pUTTING CHOMP ICONS IN VR FILES 2021-06-25 01:29:32 -07:00
Razgriz
f5c36c9d60 why did you save that to a VR file bro 2021-06-25 01:28:29 -07:00
Razgriz
7773ef495f Merge pull request #2277 from CHOMPStationBot/upstream-merge-10270 
[MIRROR] Add phoron and nitrogen breather traits, and water breather trait
 2021-06-25 01:15:29 -07:00
Razgriz
ad1a518c54 Update station_vr.dm 2021-06-25 01:13:29 -07:00
Razgriz
08bad65230 Update dog_sleeper_vr.dm 2021-06-25 01:12:45 -07:00
Razgriz
e576626b35 Update dog_modules_vr.dm 2021-06-25 01:09:50 -07:00
Razgriz
679cfd0e5a Update dog_sleeper_vr.dm 2021-06-25 00:54:35 -07:00
Razgriz
dc2c4c9d27 Update global_vr.dm 2021-06-25 00:50:23 -07:00
Razgriz
c92e55ac5c clean up weird blank lines 2021-06-25 00:47:34 -07:00
Razgriz
21e967898d Merge pull request #2275 from CHOMPStationBot/upstream-merge-10729 
[MIRROR] Netgun Upgrade
 2021-06-25 00:43:28 -07:00
Razgriz
a1c2000750 Merge pull request #2284 from CHOMPStationBot/upstream-merge-10746 
[MIRROR] Corrects rabbit typo
 2021-06-25 00:36:12 -07:00
Razgriz
4ce93fa001 Merge pull request #2281 from CHOMPStationBot/upstream-merge-10743 
[MIRROR] Adds Mug with Text to loadout
 2021-06-25 00:33:56 -07:00
Razgriz
534f505200 Merge pull request #2280 from Cyrelius/master 
Promethean Rebalance
 2021-06-25 00:33:38 -07:00
Razgriz
ae3ef479e8 powder that makes you say yes 2021-06-25 00:33:00 -07:00
Razgriz
422c5e958f Update medicine.dm 2021-06-25 00:28:41 -07:00
Razgriz
48bf05e801 powder that makes you say yes 2021-06-25 00:27:42 -07:00
Razgriz
93794b2148 Merge pull request #2270 from CHOMPStationBot/upstream-merge-10719 
[MIRROR] [MIRROR] Linter diagnostics + bans non-var relative pathing
 2021-06-25 00:17:19 -07:00
Razgriz
61a004f8a1 Update snow.dm 2021-06-24 19:24:59 -07:00
Razgriz
48893ce7f5 Undo YW snow stuff and cry about it 2021-06-24 19:17:45 -07:00
Razgriz
7e8b936402 powder that makes you say yes 2021-06-24 19:11:23 -07:00
Razgriz
fd52d83d7a Update world.dm 2021-06-24 19:03:06 -07:00
Razgriz
54da6711ca powder that makes you say yes 2021-06-24 18:58:57 -07:00
Razgriz
de77c73d11 powder that makes you say yes 2021-06-24 18:52:34 -07:00
Razgriz
315e4dd96a powder that makes you want to strangle whoever did all this bad coding 2021-06-24 18:49:49 -07:00
Razgriz
4b12522947 powder that makes you say yes 2021-06-24 18:47:01 -07:00
Razgriz
45c9f96537 POWDER THAT MAKES YOU SAY YW 2021-06-24 18:46:26 -07:00
Razgriz
22891517fd POWDER THAT MAKES YOU SAY YES 2021-06-24 18:40:45 -07:00
Razgriz
d6546318c5 Update mecha_construction_paths_vr.dm 2021-06-24 18:36:59 -07:00
Razgriz
2f01507274 powder that makes you say yes 2021-06-24 18:30:30 -07:00
Razgriz
ca56e2a5e4 powder that makes you say yes 2021-06-24 18:25:13 -07:00
Razgriz
01d95123da powder that makes you say yes 2021-06-24 18:19:12 -07:00
Razgriz
76b3cf9215 powder that makes you say CI WHY 2021-06-24 18:05:03 -07:00
Razgriz
0729e59233 powder that makes you say yes 2021-06-24 17:44:58 -07:00
Razgriz
878ff0b936 powder that makes you say yes 2021-06-24 17:44:08 -07:00
Razgriz
618ca03c09 powder that makes you say yes 2021-06-24 17:40:51 -07:00
Novacat
0199e8befa Merge pull request #10746 from foopwo/learnyourcontractions 
Corrects rabbit typo
 2021-06-24 20:46:02 +00:00
Verkister
2c56b8b898 Belly overlay fix attempt 2 
I can't even reproduce the bug on local anymore but suspecting this part here was what made me try the previous fix in the first place since everything else pre-defined on this list is just singular vars while this part is a proccall for a generated list. Perhaps the old line was still getting to haunt the new sensitive tgui enough to have it randomly override the fixed part but only rngesus knows. Anyway, tested to work fine without the old line here and since I couldn't reproduce the bug anymore, there's a 50% chance it might actually work on live too.
 2021-06-24 16:14:17 +03:00