cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-10 09:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,330 Commits 7 Branches 0 Tags
2b2bcbede54b81afdece66439c8aa6ebc5edb1bf
Commit Graph

5816 Commits

Author SHA1 Message Date
Nadyr
d6cab496ed Merge pull request #1546 from CHOMPStationBot/upstream-merge-9867 
[MIRROR] [MIRROR] Added a GPS compass.
 2021-03-10 01:41:28 -05:00
Nadyr
604b71d59b Merge pull request #1539 from CHOMPStationBot/upstream-merge-9620 
[MIRROR] [MIRROR] Industrial Expansion
 2021-03-10 01:05:16 -05:00
Nadyr
0131f176f1 Update frame.dm 2021-03-10 00:29:09 -05:00
Novacat
1d0ca9dd1e Merge pull request #9867 from VOREStation/upstream-merge-7928 
[MIRROR] Added a GPS compass.
 2021-03-09 22:59:48 +00:00
Chompstation Bot
b85e9fc4d9 [MIRROR] Industrial Expansion 2021-03-09 21:53:03 +00:00
Chompstation Bot
598a7814e8 [MIRROR] Adds a modular armour version of the explorer suit and adds sprites to specialist armour 2021-03-09 20:17:06 +00:00
Nadyr
61d14c5ace Merge pull request #1522 from CHOMPStationBot/upstream-merge-9876 
[MIRROR] [MIRROR] Fixed/generalized loadout implants.
 2021-03-08 23:32:43 -05:00
Novacat
955be2e5fe Merge pull request #9876 from VOREStation/upstream-merge-7953 
[MIRROR] Fixed/generalized loadout implants.
 2021-03-08 16:53:20 +00:00
Chompstation Bot
cacb1f019d Gateway for Heads, Pilot to Civ 2021-03-08 16:05:16 +00:00
Nadyr
81c2f9dac9 Merge pull request #1510 from Holdelta/MiningAdditions 
Mining additions
 2021-03-07 22:09:06 -05:00
Test Turtle
5ff44857e0 satchel of holding added 2021-03-06 17:34:10 -08:00
Test Turtle
875c71f157 Adding and re-adding quality-of-life items to mining 
Given that we are to be more action-oriented, I believe that mining could do with a few small updates from more action-oriented servers.

- Adds larger ore satchels
- Adds(re-adds?) cooldown upgrades for kinetic accelerator
- Re-adds the diamond pickaxe
 2021-03-06 16:40:13 -08:00
Novacat
5e1080b5eb Merge pull request #9863 from Heroman3003/macronerf 
Removes advantage macrotaurs have with saddlebag slowdown.
 2021-03-06 23:20:33 +00:00
Nadyr
3a71ba3adb Merge pull request #1500 from kcin2001/new-toys! 
adds sif and station toy (reduces item size of action figs too)
 2021-03-06 05:26:32 -05:00
Nadyr
3bd7e2b888 Merge pull request #1320 from CHOMPStationBot/upstream-merge-9704 
[MIRROR] [MIRROR] Telecrystals are only stored on the mind
 2021-03-06 01:31:07 -05:00
Nadyr
324621325b Merge branch 'master' into upstream-merge-9747 2021-03-06 00:17:54 -05:00
kcin2001
7251099263 adds sif and station toy (reduces size of action figs too) 
adds a sif toy and station toy, added to relevant sources and reduces size of action figures because they did not need to be so big
 2021-03-05 01:15:58 -08:00
Novacat
7f7c5873d6 Merge pull request #9814 from VOREStation/upstream-merge-7820 
[MIRROR] Adds the Restraining Bolt.
 2021-02-28 23:16:43 +00:00
Nadyr
1acad29320 Merge pull request #1400 from CHOMPStationBot/upstream-merge-9791 
[MIRROR] Updates bar book to fix styling error, updates placement and removes outdated bar book.
 2021-02-28 07:32:06 -05:00
Nadyr
c23e464602 Merge pull request #1379 from CHOMPStationBot/upstream-merge-9766 
[MIRROR] Emag Changes
 2021-02-28 07:22:36 -05:00
Nadyr
fdf9850149 Update manuals_vr.dm 2021-02-28 06:16:16 -05:00
cadyn
14c7647f5f Update tile_types.dm 2021-02-27 14:53:42 -08:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Novacat
5c4a2729f7 Merge pull request #9797 from TheFurryFeline/patch-28 
Moar Typo Fixy
 2021-02-26 00:48:24 +00:00
Chompstation Bot
86b52cc418 Updates bar book to fix styling error, updates placement and removes outdated bar book. 2021-02-24 00:31:31 +00:00
Chompstation Bot
3b9c4c1e60 Emag Changes 2021-02-20 19:43:42 +00:00
Chompstation Bot
a3d5b11fe3 fixes new cook guide recipe error 2021-02-19 15:02:05 +00:00
Sharkmare
e87bc13ef0 Adds ability ot changed folded pai access 
Allows PAI access to be changed in folded form.

This is literally just a copy paste job with the variable paths changed.

Origin code can be found in pai.dm
 2021-02-19 13:03:03 +01:00
Razgriz
e26a3349d0 Merge pull request #1358 from CHOMPStationBot/upstream-merge-9739 
[MIRROR] Adds in two new manuals for Bar keep and Kitchen.
 2021-02-18 04:32:58 -07:00
Razgriz
a1b49e2fc5 Merge pull request #1357 from CHOMPStationBot/upstream-merge-9738 
[MIRROR] Two fixes for messages I noticed in logs
 2021-02-18 04:32:14 -07:00
Razgriz
29ca7cf466 Merge pull request #1339 from CHOMPStationBot/upstream-merge-9726 
[MIRROR] Fixes malf airtank runtime spam
 2021-02-18 04:28:22 -07:00
Razgriz
0eb0fffc28 Merge pull request #1338 from LunarFleet/book 
Kassc's bedtime story
 2021-02-18 04:27:34 -07:00
Razgriz
c4af6698f2 Merge pull request #1296 from CHOMPStationBot/upstream-merge-9017 
[MIRROR] Add Rapid Pipe Dispenser to R&D
 2021-02-18 04:17:24 -07:00
Chompstation Bot
55abff0e3a Adds in two new manuals for Bar keep and Kitchen. 2021-02-17 19:54:04 +00:00
Novacat
9e5a5c4c46 Merge pull request #9738 from VOREStation/twologfix 
Two fixes for messages I noticed in logs
 2021-02-17 15:40:52 +00:00
Razgriz
728990b8d2 Merge pull request #1349 from CHOMPStationBot/upstream-merge-9734 
[MIRROR] Fixes init issues in _vr files.
 2021-02-16 21:50:46 -07:00
Verkister
90ef89bb75 Merge pull request #9736 from VOREStation/Verkister-patch-8 
Fixes explorer shield light runtime spam
 2021-02-16 20:01:19 +00:00
Novacat
6b62269885 Merge pull request #9734 from MarinaGryphon/init_fixes 
Fixes init issues in _vr files.
 2021-02-16 17:59:00 +00:00
Novacat
2e92857ff5 Merge pull request #9726 from VOREStation/Verkister-patch-8 
Fixes malf airtank runtime spam
 2021-02-15 23:38:19 +00:00
LunarFleet
24453ebf05 Kassc's bedtime story 2021-02-15 17:58:01 -05:00
Chompstation Bot
653d2b9179 Communicator UI Improvements + Camera Console Moving Camera Fixes (rebundled) 2021-02-14 08:51:59 -05:00
Nadyr
39292dfe36 Merge pull request #1291 from CHOMPStationBot/upstream-merge-9676 
[MIRROR] Adds in 1 new eggs end 3 joke eggs.
 2021-02-14 07:33:01 -05:00
Nadyr
83861014e7 Merge pull request #1308 from CHOMPStationBot/upstream-merge-9691 
[MIRROR] [MIRROR] Allows custom-selection of posters
 2021-02-14 07:09:52 -05:00
Chompstation Bot
24b712ec4d [MIRROR] Telecrystals are only stored on the mind 2021-02-13 21:26:38 +00:00
Novacat
3f3e7c536f Merge pull request #9691 from VOREStation/upstream-merge-7865 
[MIRROR] Allows custom-selection of posters
 2021-02-12 21:27:50 +00:00
Chompstation Bot
6f2b456c79 Add Rapid Pipe Dispenser to R&D 2021-02-11 13:28:31 +00:00
Verkister
113bf6356a Merge pull request #9676 from H0lySquirr3l/master 
Adds in 1 new eggs end 3 joke eggs.
 2021-02-11 10:59:20 +00:00
Verkister
ac8a77dd06 Merge pull request #9612 from VOREStation/upstream-merge-7839 
[MIRROR] Fixed global_announce autospeaker
 2021-02-10 10:11:30 +00:00
Chompstation Bot
d3c7cc6040 New advanced Egg Release mechanics. 2021-02-01 19:35:41 +00:00
Razgriz
b7d964f87a Merge pull request #1177 from CHOMPStationBot/upstream-merge-9604 
[MIRROR] [MIRROR] Mech Appearance Update
 2021-01-27 18:58:35 -07:00