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

7887 Commits

Author SHA1 Message Date
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
Neerti
d2cb1f67a3 Merge pull request #6024 from Mechoid/Precursotech_Sleepers 
Precurso / Anomalotech Sleepers
 2019-04-14 01:16:46 -04:00
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
Zap-zapper
acc9897320 Size control implant fix 2019-04-13 18:42:53 +07:00
Novacat
ab5710a015 Merge pull request #4881 from Heroman3003/borg-resization 
Borgs are now in on fun of size-related features
 2019-04-11 12:35:21 -04:00
Novacat
c1d44a008a Merge pull request #4966 from Novacat/nova-survival 
Rosettes, radiopack sprites
 2019-04-10 19:46:09 -04:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Unknown
5e9ac3f00d Rosettes, radiopack sprites 
- Adds Rosettes and Colorable Rosettes
- Adds on mob sprite for the subspace radio
 2019-04-08 14:07:24 -04:00
Heroman
141f7e649a Fixes non-mob mobs being able to use portals 2019-04-08 20:42:59 +10:00
Novacat
f73a757152 Merge pull request #4924 from VOREStation/upstream-merge-6025 
[MIRROR] Replaces AI-controlled Maint Drones with AI-controlled Borg Shells
 2019-04-06 14:56:27 -04:00
Unknown
c4860391b6 Conflict Resolution 2019-04-06 14:47:21 -04:00
Novacat
2be62bd672 Merge pull request #4922 from Novacat/nova-survival 
Post-release Bugfixing
 2019-04-06 13:50:00 -04:00
Unknown
0482da8c52 Ports two polaris bugfix PRs early 2019-04-06 12:21:24 -04:00
Neerti
1d59d8683c Replaces AI-controlled Maint Drones with AI-controlled Borg Shells 2019-04-06 05:07:05 -04:00
Neerti
b9b14144b0 Merge pull request #6036 from PrismaticGynoid/butchershack 
Butcher shack PoI
 2019-04-06 05:00:42 -04:00
Novacat
d7c7c073a5 Merge pull request #4868 from Novacat/nova-weapons 
Adds liquidprotein rations
 2019-04-05 17:17:53 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Unknown
7ecddb11de Service Keys Too 2019-04-03 15:11:06 -04:00
Unknown
2a100c5cb1 Command key box 2019-04-03 15:11:06 -04:00
Heroman
9b56460487 Fixes a typo 2019-04-02 17:57:30 +10:00