cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,680 Commits 8 Branches 0 Tags
27565f4da99fed5a814593f647fb59b4375c7f93
Commit Graph

34412 Commits

Author SHA1 Message Date
Atermonera
7f97c8e7cc Makes transfer always occur if nobody is playing. 2019-04-18 13:45:57 -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
0795bb7e3e Merge pull request #5094 from VOREStation/upstream-merge-6090 
[MIRROR] Hopefully fixes ghost presence checks.
 2019-04-18 13:45:16 -04:00
Novacat
69cc49c009 Conflict Resolution 2019-04-18 13:44:38 -04:00
Novacat
aa463a12e1 Merge pull request #5093 from VOREStation/upstream-merge-6097 
[MIRROR] Fixes promethean mice lunchboxes
 2019-04-18 13:35:55 -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
Novacat
69ddf63a4d Merge pull request #5092 from VOREStation/upstream-merge-6106 
[MIRROR] ore bags will now automatically pick up ore and dump them into a box if one is being pulled.
 2019-04-18 13:33:58 -04:00
Novacat
f3a8a78321 Merge pull request #5089 from VOREStation/upstream-merge-6081 
[MIRROR] Starts work on Organs affecting Reagent Processing
 2019-04-18 13:30:18 -04:00
Atermonera
10d196de89 Merge pull request #6099 from Heroman3003/fcookie-runtime-fix 
Fixes fortune cookie recipe runtime
 2019-04-18 13:28:13 -04:00
Atermonera
f986f56ec2 Changes way syringes interact with containers 2019-04-18 13:26:55 -04:00
Novacat
f878127d21 Merge pull request #5090 from VOREStation/upstream-merge-6103 
[MIRROR] Allows voidsuits to be modified in hands
 2019-04-18 13:25:18 -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
1fa82e6900 Merge pull request #6090 from Mechoid/Hopefully_Fixes_Ghost_Checks 
Hopefully fixes ghost presence checks.
 2019-04-18 13:23:24 -04:00
Atermonera
daf498ccbb Merge pull request #6097 from Heroman3003/mice-for-goo 
Fixes promethean mice lunchboxes
 2019-04-18 13:22:07 -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
Novacat
cf0896f904 Update modifiers_misc.dm 2019-04-18 13:11:11 -04:00
Atermonera
d98a0726d2 Merge pull request #6103 from Heroman3003/convinienct-suiting 
Allows voidsuits to be modified in hands
 2019-04-18 13:11:06 -04:00
Atermonera
30726b47d6 Starts work on Organs affecting Reagent Processing 2019-04-18 13:09:48 -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
Novacat
93487db857 Merge pull request #5087 from Heroman3003/fix-the-wheelchairs-for-real 
Fixes wheelchairs. For real.
 2019-04-18 02:04:25 -04:00
Novacat
ab7a0305f7 Conflict Resolution 2019-04-18 02:00:59 -04:00
Heroman
4e99bbe732 Fixes wheelchairs. For real. 2019-04-18 15:53:23 +10: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
Layla Crosse/Occula Drenn
dde5133e03 Research QoL changes (#6042) 
* Research QoL changes

* Reverts changes relating to blanket print times and Protolathe storage

* Actually changes the design print time.

Why do you hate me github.

* Fixes an enter key error caused by the editor.

* Actually does all of the things I needed to do like a smart person

Which apparently I am not.

* Fixes a newline

Because goddamn it the online editor hates me too.
 2019-04-17 04:51:29 -04:00
Sebbe
82e9cf4a29 Did the doo as requested 2019-04-17 09:29:31 +02:00
Neerti
f15c5bf29b Merge pull request #6095 from Heroman3003/unduping-synths 
Fixes synthesisers inserting more materials than they had
 2019-04-17 02:36:46 -04: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
Novacat
01a7f1083b Merge pull request #5080 from VOREStation/upstream-merge-6092 
[MIRROR] Fixes fireaxe cabinets
 2019-04-16 22:48:01 -04:00
Novacat
484cc3da23 Merge pull request #5079 from VOREStation/upstream-merge-6093 
[MIRROR] Fixes newly constructed vertical pipes being invisible
 2019-04-16 22:24:36 -04:00
Neerti
3f7d2a0450 Fixes fireaxe cabinets 2019-04-16 22:00:42 -04:00
Neerti
fee131b612 Merge pull request #6093 from Heroman3003/zpipe-fix 
Fixes newly constructed vertical pipes being invisible
 2019-04-16 22:00:31 -04:00
Heroman3003
fed6680ddf Fixes cryopod not allowing people to change their mind 2019-04-17 11:25:56 +10:00
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
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
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