cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,803 Commits 7 Branches 0 Tags
09dedeb6c9d64c55999a809a91f2fc41effd471f
Commit Graph

22593 Commits

Author SHA1 Message Date
Novacat
09dedeb6c9 Update alarm_monitor.dm 2019-05-13 22:57:31 -04:00
Neerti
74aa8184bf Restricts alarm monitor MC program access to engineering 2019-05-13 22:55:57 -04:00
Heroman3003
6f80f45eed Ports character setup subsystem 2019-05-14 11:48:34 +10:00
Anewbe
d1c953fb0e Merge pull request #6161 from Heroman3003/atmosaccessfix 
Fixes access restriction for MC atmos control
 2019-05-12 13:57:34 -04:00
Novacat
c1f9a97767 Merge pull request #5209 from Ketrai/master 
Overhauls Fennix Tail.
 2019-05-12 10:45:26 -04:00
Novacat
7322cbf7fb Merge pull request #4906 from Sebbe9123/Disbot 
Adds new robit, to discourage facetanking.
 2019-05-11 17:59:16 -04:00
Novacat
25585908b3 Switches to Expired Medicine 2019-05-11 17:49:24 -04:00
Atermonera
994e12e1d2 Merge pull request #6162 from Heroman3003/smashing 
Fixes smasher recipies being microwave ones
 2019-05-11 16:04:54 -04:00
Ketrai
83c3c60798 Adds the new tail to selection. 2019-05-10 10:50:35 +02:00
Neerti
abd1b97d10 Merge pull request #6159 from Heroman3003/youcantcatchme 
Allows objects to be made uncatchable
 2019-05-09 16:40:23 -04:00
Novacat
6cceb5a3fc Merge pull request #5203 from Heroman3003/astolfo 
Adds Astolfo hairstyle
 2019-05-09 16:00:19 -04:00
Novacat
8dd3039217 Update loadout_utility.dm 2019-05-09 13:43:15 -04:00
Novacat
0b8648a0b1 delet conflicts 2019-05-09 13:42:09 -04:00
Atermonera
445923d699 Fixes bug with custom laptops/tablets 2019-05-09 13:05:54 -04:00
Sebbe
1a9cfe3be6 fixes complaints after bored hiatus 2019-05-09 09:43:36 +02:00
Heroman
ad21685c86 Adds astolfo hairstyle 2019-05-09 07:47:32 +10:00
Unknown
31d7663bf1 Conflict Resolution 2019-05-06 14:32:18 -04:00
Novacat
b4b5ca1eaf Update equipment_vendor.dm 2019-05-06 14:24:40 -04:00
Novacat
b7761ee3ef Update Chemistry-Recipes.dm 2019-05-06 14:18:39 -04:00
Atermonera
90ee680dd5 Fishing! 2019-05-06 14:16:27 -04:00
Novacat
f71bfd4bf2 Merge pull request #5190 from Heroman3003/mc-opening-table 
Makes laptops require table to be opened
 2019-05-05 20:32:04 -04:00
Novacat
a8bfa80298 Merge pull request #5189 from Heroman3003/mc-camera-access 
Restricts access on camera program
 2019-05-05 20:31:34 -04:00
Heroman3003
e7d492852c Makes laptops require table to be opened 2019-05-06 09:59:49 +10:00
Heroman3003
c1263a31e8 Restricts access on camera program 2019-05-06 09:55:58 +10:00
Heroman3003
6c3b174b4a Restricts alarm program to engineering 2019-05-06 09:51:30 +10:00
Novacat
048760f2ea Update Chemistry-Holder.dm 2019-05-05 14:17:53 -04:00
Atermonera
1757c30075 Ports #6039 with Virgo Fixes 2019-05-05 14:14:37 -04:00
Atermonera
ea2860eeb3 Merge pull request #6148 from Verkister/patch-22 
Removes melee damage from snacks.
 2019-05-03 21:56:22 -04:00
Unknown
e191542337 EXPLORATION VENDOR SPRITE 2019-05-03 04:01:38 -04:00
Unknown
5dd8153c19 Ports Polaris PR 2019-05-02 21:01:07 -04:00
Unknown
eeb198d3a4 Metabolism effects 2019-05-02 19:41:17 -04:00
Unknown
fcb2830fe5 Changes adminordrazine pill 2019-05-02 19:34:35 -04:00
Unknown
68649aeb71 Recommended changes 2019-05-02 17:38:26 -04:00
Unknown
bd08ef98aa Buffs adminordrazine 2019-05-02 17:27:07 -04:00
Unknown
1b1489d8cc Adds medicíne pills/bottles for adminbus 2019-05-02 17:08:39 -04:00
Novacat
09b8cbba7c Merge pull request #5159 from Heroman3003/filling-up-the-underdark 
Adds a bunch of new points of interest to Underdark
 2019-05-02 08:51:27 -04:00
Novacat
faa007bddf Merge pull request #5136 from Heroman3003/solargrubs-return-bring-the-hate-in 
Solargrub hibernation season is over
 2019-05-02 08:51:04 -04:00
Heroman
3e1e4fba2a Merge branch 'master' into exploratory-rewards 2019-05-02 18:27:37 +10:00
Novacat
e14cbd5aa5 Merge pull request #5161 from Novacat/nova-heterochromia 
Miscellaneous Fixes
 2019-05-02 03:56:26 -04:00
Unknown
d22f668012 Fixes Part Two 2019-05-02 03:47:11 -04:00
Heroman
ff9e4f2e4a Makes Flavor Text properly required for joining 2019-05-02 14:40:13 +10:00
Unknown
c50b5f5596 Fixes Part One 2019-05-01 21:32:17 -04:00
Unknown
34457953cb Ports https://github.com/PolarisSS13/Polaris/pull/6147 2019-05-01 20:55:25 -04:00
Unknown
de5f932d6e Uncomments valid code 2019-05-01 20:51:53 -04:00
Unknown
808e64c3bb Ports https://github.com/PolarisSS13/Polaris/pull/6146 2019-05-01 20:50:31 -04:00
Unknown
36ec23b377 Ports https://github.com/PolarisSS13/Polaris/pull/6140 2019-05-01 20:47:03 -04:00
Unknown
8d5fd87b4b More Shadekin AI 2019-05-01 19:09:20 -04:00
Unknown
20a827cde8 Adds AI for all the other shadekin types 2019-05-01 19:06:45 -04:00
Atermonera
8e724ad32c Merge pull request #6133 from Heroman3003/cart-tweek 
Minor PDA cartridge tweaks
 2019-05-01 14:08:33 -04:00
Heroman
395bf2c868 Merge branch 'master' into filling-up-the-underdark 2019-05-01 17:59:11 +10:00