cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-01 20:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,379 Commits 8 Branches 26 Tags
1a9cdecb32052b282beea074da49653429b2236f
Commit Graph

22429 Commits

Author SHA1 Message Date
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
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
fee131b612 Merge pull request #6093 from Heroman3003/zpipe-fix 
Fixes newly constructed vertical pipes being invisible
 2019-04-16 22:00:31 -04: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
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
Neerti
b628f6e3d2 Merge pull request #6088 from Heroman3003/infinite-cash-no 
Fixes money duping bug
 2019-04-15 18:47:33 -04:00
Novacat
db882f5cfa Conflict Resolution 2019-04-15 18:37:41 -04:00
Neerti
01fdfe00e6 Fixes some signaler bugs 2019-04-15 18:30:15 -04: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
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
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
84398845db Merge pull request #5052 from VOREStation/upstream-merge-6080 
[MIRROR] Fixes My Idiocy
 2019-04-14 03:07:15 -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
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
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
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
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
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
Jonathon Key
346725f28b Adds a colorable cloak in loadout (#6040) 2019-04-13 17:38:00 -04:00
Heroman
86766e26c0 Removes unnecesary var 2019-04-13 17:20:01 +10:00
Heroman
123cdfa395 Fixes notify transcore checking for presense of backup 2019-04-13 17:01:57 +10:00
Novacat
82978caaeb Merge pull request #5021 from Heroman3003/steppy-steppy-on-the-meow 
Fixes step code, again
 2019-04-13 00:08:40 -04:00
Heroman
31ebde962c Forgot vorestation edits 2019-04-13 13:58:12 +10:00
Unknown
7dcbc669a2 Fixes Evian's Egg Implant 
It was in a different part of the file so I missed it.
 2019-04-12 23:22:28 -04:00
Heroman
7604c8550d Allows help-intent step with buckled mobs 2019-04-13 12:30:47 +10:00
Heroman
b700a27063 Fixes step code, again 2019-04-13 10:56:05 +10:00
Novacat
7dd22d0b6a Merge pull request #5019 from Heroman3003/shaker-fix 
Fixes missing shaker sprite
 2019-04-12 19:48:08 -04:00
Heroman
e0d243d44f Fixes missing shaker sprite 2019-04-13 08:31:39 +10:00
Novacat
65298da62a Merge pull request #5017 from Novacat/nova-survival 
Fixes #5016
 2019-04-12 12:30:23 -04:00
Novacat
0728d084c6 Merge pull request #5015 from Heroman3003/overtime-overtime-overtime-over 
Fixes runtime in announcer AI
 2019-04-12 12:28:55 -04:00
Unknown
1f94602c85 Fixes #5016 
Polaris code changes ended up being not compatable with vorestation stuff, this should correct that.
 2019-04-12 12:20:27 -04:00
Spades
16ee6b9221 Merge pull request #4897 from Heroman3003/bone-zone 
Added a remains option for digesty vore
 2019-04-12 09:11:04 -04:00
Spades
c5b6f7964f Merge pull request #4957 from Heroman3003/lower-respawn-timer 
Lowers respawn timer back to 1 minute
 2019-04-12 09:09:25 -04:00
Heroman
9e3ece47d2 Fixes runtime in announcer AI 2019-04-12 19:40:21 +10:00
Heroman
4c1bb4a4c9 Changes shakers to use initialize 2019-04-12 17:30:38 +10:00