Commit Graph

22874 Commits

Author SHA1 Message Date
Hawk_v3
41f0bd9f6d Merge remote-tracking branch 'upstream/master' 2019-04-14 19:44:13 +01:00
Hawk_v3
e290515df7 Fixes Language Break for Vedahq, the Zaddat Language
Changed Sergal from z to e
2019-04-14 18:53:38 +01: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
Heroman3003
4d47aa5030 Unruntimes chems 2019-04-12 09:25:14 +10: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
6012e37836 Merge pull request #4984 from Heroman3003/jello-equivalent-of-glass-bones
Undoes some VOREStation promethean nerfs
2019-04-11 12:33:49 -04:00
Unknown
40a0eaed13 SMESs no longer turn off when out of power
Ported from Baystation PR #11973, Mirrored to Polaris PR
2019-04-11 11:26:08 -04:00
Novacat
3ba9f5293c Merge pull request #4997 from Heroman3003/true-escape
Fixes OOC escape not unabsorbing victim
2019-04-10 21:06:44 -04:00
Heroman3003
ecee4b856d Fixes a compile error 2019-04-11 10:56:53 +10:00
Heroman3003
84a5fd4ef4 Makes OOC escape unabsorb 2019-04-11 10:50:10 +10:00
Novacat
c1d44a008a Merge pull request #4966 from Novacat/nova-survival
Rosettes, radiopack sprites
2019-04-10 19:46:09 -04:00
Novacat
b98cf08a0e Merge pull request #4995 from Novacat/nova-pathfinder
Whitelists Rapidvalj for Skrellian
2019-04-10 19:40:02 -04:00
Novacat
552cafdb47 Merge pull request #4970 from Novacat/nova-ert
Emergency Chemistry/NanoUI/Timer subsystem fixes
2019-04-10 19:39:51 -04:00
Unknown
bcbeb0cf0d Rosettes Part two 2019-04-10 19:38:07 -04:00
Unknown
4a0b4c32cb Whitelists Rapidvalj for Skrellian
- Also allows Custom species to verbally speak Terminus, Skrellian, and High Skrellian
2019-04-10 14:58:39 -04:00
Novacat
525ac8f4a9 Merge pull request #4992 from Heroman3003/tesla-bug-s1
Fixes tesla logic bug
2019-04-09 22:42:34 -04:00
Heroman3003
16fb2c1036 Fixes tesla logic bug 2019-04-10 12:00:24 +10:00
Heroman3003
66410d9943 Fixes unlocking cyborgs with wallets/micros 2019-04-10 08:08:25 +10:00
Heroman
9708c52d3f Fixes compile error, undoes a mechanic change 2019-04-10 04:20:14 +10:00