cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,340 Commits 10 Branches 0 Tags
72b37df79e068fef87d294436d82d2997c003c42
Commit Graph

34225 Commits

Author SHA1 Message Date
Neerti
72b37df79e Merge pull request #6091 from Heroman3003/yes-ye-yess 
Fixes *yes
 2019-04-16 19:32:41 -04:00
Heroman3003
d4d08be880 Fixes harpoon targeting obstructed tiles 2019-04-17 09:11:59 +10:00
Layla Crosse/Occula Drenn
9dcb5cbadb Add files via upload 2019-04-16 13:52:21 -04:00
Novacat
40a71fd240 Merge pull request #5068 from Heroman3003/cool-the-snek 
Fixes snakes being aggressive
 2019-04-16 02:48:30 -04:00
Heroman
3565edde80 Fixes snakess being aggressive 2019-04-16 16:26:03 +10:00
Novacat
a6d512e502 Merge pull request #5067 from Heroman3003/mothing-around 
Fixes moth antennae+wing combo not being colorable
 2019-04-16 01:57:07 -04:00
Heroman3003
fd263013ed Fixes moth antennae+wing combo not being colorable 2019-04-16 12:42:29 +10:00
Novacat
160e2ca8cb Merge pull request #5065 from VOREStation/upstream-merge-6088 
[MIRROR] Fixes money duping bug
 2019-04-15 18:55:54 -04:00
Novacat
beadac0ee3 Merge pull request #5062 from VOREStation/upstream-merge-6089 
[MIRROR] Fixes some signaler bugs
 2019-04-15 18:47:40 -04:00
Neerti
b628f6e3d2 Merge pull request #6088 from Heroman3003/infinite-cash-no 
Fixes money duping bug
 2019-04-15 18:47:33 -04: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
Novacat
db882f5cfa Conflict Resolution 2019-04-15 18:37:41 -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
01fdfe00e6 Fixes some signaler bugs 2019-04-15 18:30:15 -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
9ad8597a2f Merge pull request #5058 from Heroman3003/defunct-pto 
Removes Command PTO from appearing for players who had it
 2019-04-15 12:21:59 -04:00
Heroman
bc74ea53c9 Removes Command from appearing for players who had it removed 2019-04-15 18:14:04 +10:00
Novacat
880fd9f263 Merge pull request #5054 from Heroman3003/mob-pathfix 
Fixes mob pathing for wilderness and V2
 2019-04-15 02:38:20 -04:00
Novacat
47b47d001a Merge pull request #5056 from VOREStation/upstream-merge-6083 
[MIRROR] Fixes runtiming with mineral turfs
 2019-04-14 20:30:30 -04:00
Neerti
3b2c4c5271 Merge pull request #6083 from Heroman3003/runtime-lead-sand-whatever 
Fixes runtiming with mineral turfs
 2019-04-14 19:56:33 -04:00
Neerti
0c2703b705 Merge pull request #6082 from Heroman3003/sleeper-a-roo 
Fixes several issues with sleepers
 2019-04-14 19:55:20 -04:00
Heroman
c238820f95 Fixes mob pathing for wilderness and V2 2019-04-15 07:56:52 +10:00
Heroman
f6586554b1 Fixes moving items downstairs, virgo edition 2019-04-15 04:19:09 +10:00
Novacat
629748faec Merge pull request #5048 from VOREStation/upstream-merge-6065 
[MIRROR] Allows restriction of z-levels from spawning xenoarch finds
 2019-04-14 03:08:41 -04:00
Novacat
84398845db Merge pull request #5052 from VOREStation/upstream-merge-6080 
[MIRROR] Fixes My Idiocy
 2019-04-14 03:07:15 -04:00
Novacat
c96e04bb24 Merge pull request #5051 from VOREStation/upstream-merge-6066 
[MIRROR] Allows the request console ID to actually be changed
 2019-04-14 03:02:29 -04:00
Novacat
f9bfe5681f Merge pull request #5049 from VOREStation/upstream-merge-6078 
[MIRROR] Fixes resisting out of vehicles causing problems
 2019-04-14 02:58:08 -04:00
Unknown
85f1c6339c tired lynx mrowl 2019-04-14 02:57:40 -04:00
Novacat
3e20ab3f5c Merge pull request #5047 from VOREStation/upstream-merge-6037 
[MIRROR] Fixes export reports not mentioning crates' cost
 2019-04-14 02:53:37 -04:00
Novacat
47a473574e Merge pull request #5046 from VOREStation/upstream-merge-6077 
[MIRROR] Fixes glasses with overlays runtiming on clientless mobs
 2019-04-14 02:52:13 -04:00
Novacat
36e7814477 Update xenoarch.dm 2019-04-14 02:51:07 -04:00
Neerti
6441d365df Merge pull request #6080 from Mechoid/FixAccidentalAlchemy 
Fixes My Idiocy
 2019-04-14 02:48:40 -04:00
Novacat
2a94def6a3 Merge pull request #5043 from VOREStation/upstream-merge-6073 
[MIRROR] Fixes newly constructed conveyors not working
 2019-04-14 02:46:20 -04:00
Novacat
c21f5fc830 Merge pull request #5041 from VOREStation/upstream-merge-6076 
[MIRROR] Fixed the vendor machines zapping twice
 2019-04-14 02:45:55 -04:00
Neerti
28c7e4c0c4 Merge pull request #6066 from Heroman3003/request-relabeling 
Allows the request console ID to actually be changed
 2019-04-14 02:30:54 -04:00
Neerti
69855383ac Merge pull request #6078 from Heroman3003/unbluespacing-vehicles 
Fixes resisting out of vehicles causing problems
 2019-04-14 02:30:32 -04:00
Novacat
f391ddad02 Merge pull request #5038 from VOREStation/upstream-merge-6028 
[MIRROR] Precursotech Tools
 2019-04-14 02:29:25 -04:00
Neerti
49628739b2 Allows restriction of z-levels from spawning xenoarch finds 2019-04-14 02:29:17 -04:00
Neerti
2203f368e8 Merge pull request #6037 from Heroman3003/report-the-crate-cost-lazy-central-interns 
Fixes export reports not mentioning crates' cost
 2019-04-14 02:28:02 -04:00
Neerti
6c3e327687 Merge pull request #6077 from Heroman3003/meson-runtime-fix 
Fixes glasses with overlays runtiming on clientless mobs
 2019-04-14 02:26:49 -04:00
Neerti
93e6bbc031 Merge pull request #6073 from Heroman3003/conveyor-boogalo 
Fixes newly constructed conveyors not working
 2019-04-14 02:25:14 -04:00
Neerti
068ac72e10 Merge pull request #6076 from Heroman3003/double-shock-fix 
Fixed the vendor machines zapping twice
 2019-04-14 02:24:50 -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
Novacat
6d123c8d73 Update materials.dm 2019-04-13 22:55:08 -04:00
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00