cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,617 Commits 5 Branches 0 Tags
15fd9df4082f19b8d57da652e82a8953d2ac19f9
Commit Graph

44588 Commits

Author SHA1 Message Date
Chompstation Bot
15fd9df408 The One Where You Can Aim Lights 2021-06-30 19:29:41 +00:00
Verkister
cbeea3cd22 Properly unlocks shadekin ears 
An empty list here means nobody can use it
 2021-06-30 13:14:09 +03:00
Razgriz
d62333179d Stop log bloat 2021-06-30 02:30:32 -07:00
Nadyr
8aceda111e Merge pull request #2295 from CHOMPStation2/Razgriz1032-patch-5 
Change Osteodaxon total volume required from 5 to 1
 2021-06-29 19:46:18 -04:00
Razgriz
0efef8ef3c Merge pull request #2305 from CHOMPStationBot/upstream-merge-10784 
[MIRROR] fix stealthmins on staffwho
 2021-06-28 12:17:54 -07:00
Aronai Sieyes
df7385d8d3 Merge pull request #10784 from lm40/master 
fix stealthmins on staffwho
 2021-06-28 18:06:37 +00:00
Razgriz
fa9917de85 Merge pull request #2301 from kcin2001/xenohybrid-bump 
xeno hunter dome bump
 2021-06-28 03:58:16 -07:00
Novacat
2f6381ce13 Merge pull request #10776 from VOREStation/upstream-merge-8159 
[MIRROR] Typo Fixy
 2021-06-28 10:40:59 +00:00
kcin2001
ea1897be79 changed to _ch files 
i dont want to go upstream really, i really should just put these under ears anyway
 2021-06-27 16:23:19 -07:00
Nadyr
1af4c2927f Merge pull request #2296 from CHOMPStationBot/upstream-merge-10765 
[MIRROR] Map touchups
 2021-06-27 17:06:28 -04:00
Nadyr
5ee3ea3cad Merge pull request #2300 from CHOMPStationBot/upstream-merge-10759 
[MIRROR] Adds some VV helpers for admins for lights
 2021-06-27 17:06:19 -04:00
Nadyr
0723d37983 Merge pull request #2299 from CHOMPStationBot/upstream-merge-10758 
[MIRROR] Fixes #10757
 2021-06-27 17:05:56 -04:00
Aronai Sieyes
614649ca1c Merge pull request #10759 from VOREStation/Arokha/vvlight 
Adds some VV helpers for admins for lights
 2021-06-27 16:13:33 +00:00
Aronai Sieyes
974107d7eb Merge pull request #10758 from VOREStation/Fixes/10757 
Fixes #10757
 2021-06-27 16:13:27 +00:00
lm40
af32042b15 fixes #10700 (#10763) 
* Update human.dm

* Update robot.dm

* Update simple_hud.dm
 2021-06-27 16:10:18 +00:00
Chompstation Bot
e2ba243bde Map touchups 2021-06-27 12:30:36 +00:00
Razgriz
e675401f4a Change Osteodaxon total volume required from 5 to 1 
Change Osteodaxon total volume required to heal from 5 to 1
 2021-06-26 15:15:24 -07: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