cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-12 02:13:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,677 Commits 7 Branches 0 Tags
f6049a256abc16fc5ad9528023a8772fc1663303
Commit Graph

5842 Commits

Author SHA1 Message Date
Nadyr
f6049a256a Merge branch 'master' into upstream-merge-10007 2021-03-27 23:13:57 -04:00
Nadyr
ace9beb3d1 Delete id_stacks_deptname.dm 2021-03-27 22:59:17 -04:00
Nadyr
04f4302dfa Delete id_stacks_cit.dm 2021-03-27 22:58:50 -04:00
Nadyr
a8e03b8061 Merge branch 'master' into upstream-merge-10008 2021-03-27 22:31:57 -04:00
Nadyr
2133df1507 Merge branch 'master' into upstream-merge-10002 2021-03-27 22:03:57 -04:00
Nadyr
8c01fbb78d Merge pull request #1655 from CHOMPStationBot/upstream-merge-9989 
[MIRROR] [MIRROR] New ID Card Design
 2021-03-27 21:52:28 -04:00
Nadyr
e98859942f Merge branch 'master' into upstream-merge-9974 2021-03-26 03:57:31 -04:00
Nadyr
4ce40dad53 Merge pull request #1625 from CHOMPStationBot/upstream-merge-9955 
[MIRROR] [MIRROR] Added think-tanks.
 2021-03-26 03:50:02 -04:00
Chompstation Bot
f825d5ca9f Fixes Fluff and ITG ID cards, refactors event/fluff IDs a lil', also fixes for digested id icons 2021-03-24 18:51:25 +00:00
Chompstation Bot
f249133c88 [MIRROR] Patches new ID card code 2021-03-24 18:17:46 +00:00
Chompstation Bot
320209f31e Fixes gold IDs somehow having forgotten the sprites 2021-03-23 21:13:23 +00:00
Chompstation Bot
abc800056c [MIRROR] New ID Card Design 2021-03-23 16:15:59 +00:00
Novacat
9c209652a9 Merge pull request #9988 from VOREStation/upstream-merge-7973 
[MIRROR] News Update  + Communicator Lag Fix
 2021-03-21 21:25:45 +00:00
Chompstation Bot
2a5c21c8f5 [MIRROR] Kaleidoscope 2: The Retabbening 2021-03-21 01:24:14 -04:00
Razgriz
202651b317 Merge pull request #1629 from CHOMPStationBot/upstream-merge-9973 
[MIRROR] [MIRROR] Makes custom cigarettes even more custom-ier
 2021-03-19 22:44:13 -07:00
Chompstation Bot
2915e36ee8 [MIRROR] Tachikoma tweaks. 2021-03-19 09:44:42 +00:00
Novacat
a4bf657c59 Merge pull request #9973 from VOREStation/upstream-merge-7925 
[MIRROR] Makes custom cigarettes even more custom-ier
 2021-03-19 07:48:42 +00:00
Chompstation Bot
b7b8682e7c [MIRROR] Added think-tanks. 2021-03-18 14:57:26 +00:00
Novacat
46506f23de Merge pull request #9968 from VOREStation/upstream-merge-7980 
[MIRROR] GPS presentation/update tweaks/fixes.
 2021-03-18 14:40:23 +00:00
Razgriz
5c285eda7d Merge pull request #1595 from ZVB334/Weldpackfix 
Fixes Teshari Welderbackpack Sprite
 2021-03-17 03:33:50 -07:00
Razgriz
6e171d3182 Merge pull request #1536 from CHOMPStationBot/upstream-merge-9396 
[MIRROR] [MIRROR] Matter Matters
 2021-03-16 22:22:28 -07:00
ZVB334
4baf7186fd Fixes Teshari Welderbackpack Sprite 2021-03-12 11:20:26 -06:00
Nadyr
9be6ad7774 Merge pull request #1562 from CHOMPStationBot/upstream-merge-9897 
[MIRROR] [MIRROR] Tweaked implant loadout, refactored implant detection.
 2021-03-11 00:52:13 -05:00
Novacat
4631c4faca Merge pull request #9897 from VOREStation/upstream-merge-7963 
[MIRROR] Tweaked implant loadout, refactored implant detection.
 2021-03-10 19:40:33 +00:00
Novacat
9098ecbda9 Merge pull request #9889 from VOREStation/upstream-merge-7949 
[MIRROR] E-cigarette improvements
 2021-03-10 19:07:18 +00:00
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
9270659dbb [MIRROR] Matter Matters 2021-03-09 20:42:39 +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