cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-09 17:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,884 Commits 7 Branches 0 Tags
95edaac47c181e3515cdbdc2546a83fa553bc015
Commit Graph

7906 Commits

Author SHA1 Message Date
Ketrai
95edaac47c Adds monkfish 
ITS HOOG
 2019-05-31 17:17:29 +02:00
Neerti
f5f20628fd Merge pull request #6169 from GeneriedJenelle/patch-1 
Ports Radial Menus
 2019-05-28 14:25:49 -04:00
Atermonera
ef4c7b6601 Merge pull request #6172 from mistyLuminescence/contacts 
Makeover Kit
 2019-05-28 13:10:09 -04:00
mistyLuminescence
42cc20278e Big Bugfix Bonanza 2019-05-23 12:59:29 -04:00
Mechoid
7a35723d85 Sif Animal Expansion 1 2019-05-21 19:58:19 -04:00
Neerti
5ed3916de3 Merge pull request #6166 from Sebbe9123/fixholoprojectors 
Lets sec people carry holoprojectors in their belts
 2019-05-20 18:43:52 -04:00
Neerti
abd1b97d10 Merge pull request #6159 from Heroman3003/youcantcatchme 
Allows objects to be made uncatchable
 2019-05-09 16:40:23 -04:00
Unknown
07b866b2f8 Last Second Tweaks 
- Swaps trash pile money breifcase with something more balanced.
- Adds emergency softsuit box to luxury capsules.
 2019-05-03 16:32:21 -04:00
Unknown
043b15ed58 Removes mini translocator 2019-05-03 03:15:42 -04:00
Unknown
27565f4da9 Boxed emergency suits 2019-05-03 03:06:00 -04:00
Unknown
7644861742 ...Eh, this ended up being too strong 2019-05-03 02:34:08 -04:00
Unknown
42c5f0eaa7 Tweaks Trash Pile Loot 2019-05-03 01:10:49 -04:00
Unknown
68649aeb71 Recommended changes 2019-05-02 17:38:26 -04:00
Unknown
1b1489d8cc Adds medicíne pills/bottles for adminbus 2019-05-02 17:08:39 -04:00
Atermonera
8e724ad32c Merge pull request #6133 from Heroman3003/cart-tweek 
Minor PDA cartridge tweaks
 2019-05-01 14:08:33 -04:00
Novacat
9770d675c2 Update radio.dm 2019-04-29 00:10:51 -04:00
Neerti
0d76e09b7c Shortwave and Relay Tweaks 2019-04-29 00:02:13 -04:00
Unknown
32ae85e423 Fixes oversights with last PRs 2019-04-28 23:28:19 -04:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Novacat
b9a1fa29d6 Merge pull request #5111 from Heroman3003/people-cant-have-nice-things 
Removes glucose autoinjectors from vendomats, makes Zaddat spawn with a bunch
 2019-04-27 22:49:53 -04:00
Atermonera
9ea820fd7f Merge pull request #6058 from Neerti/permastuns_are_bad 
Removes umbrella permastuns. Adds wind mechanics.
 2019-04-26 19:32:29 -04:00
Heroman3003
e3e715454b Makes placeholder entries for lore writing 2019-04-23 11:13:42 +10:00
Neerti
cbb56b0546 Merge pull request #6124 from Heroman3003/window-message-fix 
Fixes message on window frame fastening
 2019-04-22 00:29:26 -04:00
Heroman
727ecd39a8 Removes glucose autoinjectors from vendomats 2019-04-21 16:06:49 +10:00
Atermonera
6dc9f9a946 Merge pull request #6102 from Heroman3003/taping-it-all-up 
Fixes taperolls not being usable on tiles with directional windows
 2019-04-20 20:28:00 -04:00
Neerti
90e2d35db0 Merge pull request #6112 from Heroman3003/unredundanting 
Removes redundant fix for a bug that never existed
 2019-04-20 13:55:08 -04:00
Novacat
17eadd4444 Merge pull request #5069 from Sebbe9123/mobpathfix 
Hopefully fixes all paths here and there
 2019-04-18 18:50:33 -04:00
Novacat
bad8de00e6 Merge pull request #5095 from VOREStation/upstream-merge-6098 
[MIRROR] Fixes laser pointers targeting through walls
 2019-04-18 13:45:26 -04:00
Novacat
e2ae250af5 Merge pull request #5091 from VOREStation/upstream-merge-6101 
[MIRROR] Fixes mapping tool icons for fulltile windows
 2019-04-18 13:34:12 -04:00
Atermonera
8e9ba5911a Merge pull request #6098 from Heroman3003/laserpoint-fix 
Fixes laser pointers targeting through walls
 2019-04-18 13:24:40 -04:00
Atermonera
2869ad6f73 Merge pull request #6106 from chaoko99/Pullbox 
ore bags will now automatically pick up ore and dump them into a box if one is being pulled.
 2019-04-18 13:19:50 -04:00
Atermonera
412a870ede Merge pull request #6101 from Heroman3003/icon-window-fix 
Fixes mapping tool icons for fulltile windows
 2019-04-18 13:19:38 -04:00
Atermonera
836fe2be2b Merge pull request #6100 from Heroman3003/silicate-fix 
Fixes silicate making fulltile windows invisible
 2019-04-18 13:09:37 -04:00
Novacat
6a287c7e1f Merge pull request #5085 from VOREStation/upstream-merge-6026 
[MIRROR] Precursotech Janus
 2019-04-18 02:19:31 -04:00
Mechoid
fc43527ac7 Adds Robobags (#6059) 
* Adds Robobags

* Finishes robobags

* FixFix
 2019-04-18 01:40:39 -04:00
Atermonera
b7e9934206 Precursotech Janus 2019-04-18 00:33:20 -04:00
Sebbe
82e9cf4a29 Did the doo as requested 2019-04-17 09:29:31 +02:00
Neerti
860ff31f08 Merge pull request #6094 from Heroman3003/anti-magic-markers 
Fixes markers and crayons drawing from a distance
 2019-04-16 23:09:02 -04:00
Neerti
3f7d2a0450 Fixes fireaxe cabinets 2019-04-16 22:00:42 -04:00
Sebbe
1cf7fa2d69 Merge branch 'master' into mobpathfix 2019-04-16 11:39:01 +02:00
Sebbe
224ce6582b Hopefully fixes every path 
plz game, I didn't have fun ;w;
 2019-04-16 10:41:04 +02:00
Novacat
b597e89447 Merge pull request #5064 from VOREStation/upstream-merge-6087 
[MIRROR] Fixes some bugs related to buckling
 2019-04-15 18:44:24 -04:00
Novacat
2fa26d319c Merge pull request #5063 from VOREStation/upstream-merge-6086 
[MIRROR] Fixes self-refueling welders starting fires when off
 2019-04-15 18:41:31 -04:00
Neerti
88d095cf11 Merge pull request #6087 from Heroman3003/pipe-buckle-general 
Fixes some bugs related to buckling
 2019-04-15 18:32:51 -04:00
Neerti
197bedb2eb Merge pull request #6086 from Heroman3003/welder-fires 
Fixes self-refueling welders starting fires when off
 2019-04-15 18:31:37 -04:00
Neerti
99444fa0c8 Merge pull request #6085 from Heroman3003/apc-cost-fix 
Fixes apc frame giving more steel than needed
 2019-04-15 18:29:58 -04:00
Novacat
f391ddad02 Merge pull request #5038 from VOREStation/upstream-merge-6028 
[MIRROR] Precursotech Tools
 2019-04-14 02:29:25 -04:00
Novacat
47dac87f75 Merge pull request #5037 from VOREStation/upstream-merge-6027 
[MIRROR] Anomalotech Charge Sword
 2019-04-14 02:22:02 -04:00
Neerti
9c28b82c6c Merge pull request #6028 from Mechoid/Precursotech_Tools 
Precursotech Tools
 2019-04-14 02:20:07 -04:00
Neerti
94e6cc402b Merge pull request #6027 from Mechoid/Precursotech_Sword 
Anomalotech Charge Sword
 2019-04-14 01:21:05 -04:00